diff options
| author | Simon Glass <sjg@chromium.org> | 2016-07-04 11:58:32 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-07-14 20:40:24 -0600 |
| commit | 6afc4661e0a2daa655096702171c420518f8c2a8 (patch) | |
| tree | fe5e30de0e8f64ee9bf65ea8f077a937bb62794a /arch/arm | |
| parent | 6efeeea79c880d3dd262e0dca9da2687f0ab68c9 (diff) | |
rockchip: Don't use spl_boot_device() with of-platdata
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-rockchip/rk3288-board-spl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c index d8c9ca71cf..123f58b27f 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; } |