spl: Drop the switch() statement for OS selection

This code is pretty ugly, with many #ifdefs

There are quite a lot of IH_OS_U_BOOT values so the compiler struggles
to create a jump table here. Also, most of the options are normally
disabled.

Change it to an else...if construct instead. Add an accessor for the
spl_image field behind an #ifdef to avoid needing #ifdef in the C code.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 8ed2eeb593010279635d48990c78e206efc5a70c..898ddfe0c78e80bed7f2158c28b38a5e18eca7d9 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -744,7 +744,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                BOOT_DEVICE_NONE,
        };
        struct spl_image_info spl_image;
-       int ret;
+       int ret, os;
 
        debug(">>" SPL_TPL_PROMPT "board_init_r()\n");
 
@@ -837,39 +837,27 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                               ret);
        }
 
-       switch (spl_image.os) {
-       case IH_OS_U_BOOT:
+       os = spl_image.os;
+       if (os == IH_OS_U_BOOT) {
                debug("Jumping to %s...\n", spl_phase_name(spl_next_phase()));
-               break;
-#if CONFIG_IS_ENABLED(ATF)
-       case IH_OS_ARM_TRUSTED_FIRMWARE:
+       } else if (CONFIG_IS_ENABLED(ATF) && os == IH_OS_ARM_TRUSTED_FIRMWARE) {
                debug("Jumping to U-Boot via ARM Trusted Firmware\n");
-               spl_fixup_fdt(spl_image.fdt_addr);
+               spl_fixup_fdt(spl_image_fdt_addr(&spl_image));
                spl_invoke_atf(&spl_image);
-               break;
-#endif
-#if CONFIG_IS_ENABLED(OPTEE_IMAGE)
-       case IH_OS_TEE:
+       } else if (CONFIG_IS_ENABLED(OPTEE_IMAGE) && os == IH_OS_TEE) {
                debug("Jumping to U-Boot via OP-TEE\n");
-               spl_board_prepare_for_optee(spl_image.fdt_addr);
+               spl_board_prepare_for_optee(spl_image_fdt_addr(&spl_image));
                jump_to_image_optee(&spl_image);
-               break;
-#endif
-#if CONFIG_IS_ENABLED(OPENSBI)
-       case IH_OS_OPENSBI:
+       } else if (CONFIG_IS_ENABLED(OPENSBI) && os == IH_OS_OPENSBI) {
                debug("Jumping to U-Boot via RISC-V OpenSBI\n");
                spl_invoke_opensbi(&spl_image);
-               break;
-#endif
-#if CONFIG_IS_ENABLED(OS_BOOT)
-       case IH_OS_LINUX:
+       } else if (CONFIG_IS_ENABLED(OS_BOOT) && os == IH_OS_LINUX) {
                debug("Jumping to Linux\n");
                if (IS_ENABLED(CONFIG_SPL_OS_BOOT))
                        spl_fixup_fdt((void *)SPL_PAYLOAD_ARGS_ADDR);
                spl_board_prepare_for_linux();
                jump_to_image_linux(&spl_image);
-#endif
-       default:
+       } else {
                debug("Unsupported OS image.. Jumping nevertheless..\n");
        }
 #if CONFIG_VAL(SYS_MALLOC_F_LEN) && !defined(CONFIG_SPL_SYS_MALLOC_SIZE)

diff --git a/include/spl.h b/include/spl.h
index ab06e32ebd9611a4d7c49a2cfb1d4809622e5d5a..6c6ca07dbcc1697d4fd40444befd1b1a97992207 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -263,6 +263,15 @@ struct spl_image_info {
 #endif
 };
 
+static inline void *spl_image_fdt_addr(struct spl_image_info *info)
+{
+#if CONFIG_IS_ENABLED(LOAD_FIT) || CONFIG_IS_ENABLED(LOAD_FIT_FULL)
+       return info->fdt_addr;
+#else
+       return 0;
+#endif
+}
+
 /**
  * Information required to load data from a device
  *