leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: Don't use spl_boot_device() with of-platdata

Browse Source 
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>
This commit is contained in:
Simon Glass 2016-07-04 11:58:32 -06:00
parent 6efeeea79c
commit 6afc4661e0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rockchip/rk3288-board-spl.c
View File

@ -29,6 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
u32 spl_boot_device(void) u32 spl_boot_device(void)
{ {
#if !CONFIG_IS_ENABLED(OF_PLATDATA)
const void *blob = gd->fdt_blob; const void *blob = gd->fdt_blob;
struct udevice *dev; struct udevice *dev;
const char *bootdev; const char *bootdev;
@ -63,6 +64,7 @@ u32 spl_boot_device(void)
} }
fallback: fallback:
#endif
return BOOT_DEVICE_MMC1; return BOOT_DEVICE_MMC1;
} }