]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: rk3588: Add boot device detection
authorJonas Karlman <jonas@kwiboo.se>
Tue, 14 Mar 2023 00:38:30 +0000 (00:38 +0000)
committerKever Yang <kever.yang@rock-chips.com>
Sun, 19 Mar 2023 05:20:21 +0000 (13:20 +0800)
Enable SPL on RK3588 to detect which device it was booted from.
Fixes use of same-as-spl in u-boot,spl-boot-order prop.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
arch/arm/mach-rockchip/rk3588/rk3588.c

index 2ee1db47671feeffe5b1fa6f9f478b2d4a3bab52..18e67b5ca9b22af3a727cdc74194a6b8a8088b5d 100644 (file)
@@ -8,6 +8,7 @@
 #include <spl.h>
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
+#include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/ioc_rk3588.h>
 
@@ -36,6 +37,12 @@ DECLARE_GLOBAL_DATA_PTR;
 #define BUS_IOC_GPIO2D_IOMUX_SEL_H     0x5c
 #define BUS_IOC_GPIO3A_IOMUX_SEL_L     0x60
 
+const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
+       [BROM_BOOTSOURCE_EMMC] = "/mmc@fe2e0000",
+       [BROM_BOOTSOURCE_SPINOR] = "/spi@fe2b0000/flash@0",
+       [BROM_BOOTSOURCE_SD] = "/mmc@fe2c0000",
+};
+
 static struct mm_region rk3588_mem_map[] = {
        {
                .virt = 0x0UL,