[U-Boot] [PATCH v3 52/62] rockchip: Don't use spl_boot_device() with of-platdata
Simon Glass
sjg at chromium.org
Mon Jul 4 19:58:32 CEST 2016
This function cannot look at the device tree when of-platdata is used.
Update the code to handle this.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v3: None
Changes in v2: None
arch/arm/mach-rockchip/rk3288-board-spl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c
index d8c9ca7..123f58b 100644
--- a/arch/arm/mach-rockchip/rk3288-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3288-board-spl.c
@@ -29,6 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
u32 spl_boot_device(void)
{
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
const void *blob = gd->fdt_blob;
struct udevice *dev;
const char *bootdev;
@@ -63,6 +64,7 @@ u32 spl_boot_device(void)
}
fallback:
+#endif
return BOOT_DEVICE_MMC1;
}
--
2.8.0.rc3.226.g39d4020
More information about the U-Boot
mailing list