rockchip: rk3399: simplify logic for getting SPL boot medium DT node

In preparation of moving spl_perform_fixups to spl-boot-order.c, let's
simplify the logic around mapping the BOOT_DEVICE_x enum index to a DT
node by using an instantiated array of chars instead of creating a new
data structure on the fly.

This will make it easier to factor out the code handling the SPL boot
medium detection by having spl_decode_boot_device common to all SoCs.

Cc: Quentin Schulz <foss+uboot@0leil.net>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>

diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 14565d2..60d95c8 100644 (file)
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -175,23 +175,27 @@ void board_debug_uart_init(void)
 #endif
 
 #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_TPL_BUILD)
+const char * const spl_boot_devices[BOOT_DEVICE_NONE + 1] = {
+       [BOOT_DEVICE_MMC2] = "/mmc@fe320000",
+       [BOOT_DEVICE_MMC1] = "/mmc@fe330000",
+       [BOOT_DEVICE_SPI] = "/spi@ff1d0000/flash@0",
+};
+
 const char *spl_decode_boot_device(u32 boot_device)
 {
-       int i;
-       static const struct {
-               u32 boot_device;
-               const char *ofpath;
-       } spl_boot_devices_tbl[] = {
-               { BOOT_DEVICE_MMC2, "/mmc@fe320000" },
-               { BOOT_DEVICE_MMC1, "/mmc@fe330000" },
-               { BOOT_DEVICE_SPI, "/spi@ff1d0000/flash@0" },
-       };
-
-       for (i = 0; i < ARRAY_SIZE(spl_boot_devices_tbl); ++i)
-               if (spl_boot_devices_tbl[i].boot_device == boot_device)
-                       return spl_boot_devices_tbl[i].ofpath;
-
-       return NULL;
+       const char *spl_bootdevice_ofpath = NULL;
+
+       if (boot_device < ARRAY_SIZE(spl_boot_devices))
+               spl_bootdevice_ofpath = spl_boot_devices[boot_device];
+
+       if (spl_bootdevice_ofpath)
+               debug("%s: spl_bootdevice_id %x maps to '%s'\n",
+                     __func__, boot_device, spl_bootdevice_ofpath);
+       else
+               debug("%s: failed to resolve spl_bootdevice_id %x\n",
+                     __func__, boot_device);
+
+       return spl_bootdevice_ofpath;
 }
 
 void spl_perform_fixups(struct spl_image_info *spl_image)