projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6efeeea
)
rockchip: Don't use spl_boot_device() with of-platdata
author
Simon Glass
<sjg@chromium.org>
Mon, 4 Jul 2016 17:58:32 +0000
(11:58 -0600)
committer
Simon Glass
<sjg@chromium.org>
Fri, 15 Jul 2016 02:40:24 +0000
(20:40 -0600)
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@chromium.org>
arch/arm/mach-rockchip/rk3288-board-spl.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-rockchip/rk3288-board-spl.c
b/arch/arm/mach-rockchip/rk3288-board-spl.c
index d8c9ca71cfcc7b5bb80ef6bebf3cef973f3b3302..123f58b27f2c3c459924e03f611e36b48ae50ad6 100644
(file)
--- 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;
}