rockchip: rk3308: fix same-as-spl boot order
authorJohn Keeping <john@metanate.com>
Thu, 14 Jul 2022 14:18:37 +0000 (15:18 +0100)
committerKever Yang <kever.yang@rock-chips.com>
Sun, 4 Sep 2022 12:00:38 +0000 (20:00 +0800)
Rockchip SoCs need the boot_devices array defined in order to map the
bootloader's value to a U-Boot device.  Implement this for rk3308.

Signed-off-by: John Keeping <john@metanate.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@vrull.eu>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
arch/arm/mach-rockchip/rk3308/rk3308.c

index 70fe0d0..dd9109b 100644 (file)
@@ -8,6 +8,7 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/grf_rk3308.h>
+#include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/gpio.h>
 #include <debug_uart.h>
@@ -142,6 +143,11 @@ enum {
 
 #define GPIO0_A4       4
 
+const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
+       [BROM_BOOTSOURCE_EMMC] = "/mmc@ff490000",
+       [BROM_BOOTSOURCE_SD] = "/mmc@ff480000",
+};
+
 int rk_board_init(void)
 {
        static struct rk3308_grf * const grf = (void *)GRF_BASE;