From 2a5ad8b35594dd5c93deec6fa1c1b022232e0193 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Thu, 24 Oct 2019 09:01:28 +0800 Subject: [PATCH] rockchip: board: treat 'u-boot,dm-spl' as 'u-boot,dm-pre-reloc' It works when CONFIG_USING_KERNEL_DTB is enabled, because we can set either 'u-boot,dm-spl' or 'u-boot,dm-pre-reloc' for the node that we can to leave in the u-boot.dtb. Change-Id: I682e3900b9bf479f998304737031525004538724 Signed-off-by: Joseph Chen --- arch/arm/mach-rockchip/board.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 0a522cd891..523bcfc599 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -231,7 +231,8 @@ static int phandles_fixup(void *fdt) list_for_each_entry(dev, &uc->dev_head, uclass_node) { /* Only U-Boot node go further */ - if (!dev_read_bool(dev, "u-boot,dm-pre-reloc")) + if (!dev_read_bool(dev, "u-boot,dm-pre-reloc") || + !dev_read_bool(dev, "u-boot,dm-spl")) continue; for (i = 0; i < ARRAY_SIZE(props); i++) {