spl: Allow multiple loaders of the same time

At present we only support a single loader of each time. Extra ones are
ignored. This means that only one BOOT_DEVICE_BOARD can be used in the SPL
image.

This is inconvenient since we sometimes want to provide several
board-specific drivers, albeit at different priorties. Add support for
this.

This should have no functional change for existing boards.

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

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4635e77e979a633cc3870d0819224281d21fe926..6f2014b0e22421c9ea7f989963003060819342e1 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -630,23 +630,6 @@ __weak void board_boot_order(u32 *spl_boot_list)
        spl_boot_list[0] = spl_boot_device();
 }
 
-static struct spl_image_loader *spl_ll_find_loader(uint boot_device)
-{
-       struct spl_image_loader *drv =
-               ll_entry_start(struct spl_image_loader, spl_image_loader);
-       const int n_ents =
-               ll_entry_count(struct spl_image_loader, spl_image_loader);
-       struct spl_image_loader *entry;
-
-       for (entry = drv; entry != drv + n_ents; entry++) {
-               if (boot_device == entry->boot_device)
-                       return entry;
-       }
-
-       /* Not found */
-       return NULL;
-}
-
 __weak int spl_check_board_image(struct spl_image_info *spl_image,
                                 const struct spl_boot_device *bootdev)
 {
@@ -693,6 +676,10 @@ static int spl_load_image(struct spl_image_info *spl_image,
 static int boot_from_devices(struct spl_image_info *spl_image,
                             u32 spl_boot_list[], int count)
 {
+       struct spl_image_loader *drv =
+               ll_entry_start(struct spl_image_loader, spl_image_loader);
+       const int n_ents =
+               ll_entry_count(struct spl_image_loader, spl_image_loader);
        int ret = -ENODEV;
        int i;
 
@@ -702,20 +689,27 @@ static int boot_from_devices(struct spl_image_info *spl_image,
 
                if (CONFIG_IS_ENABLED(SHOW_ERRORS))
                        ret = -ENXIO;
-               loader = spl_ll_find_loader(bootdev);
-               if (!CONFIG_IS_ENABLED(SILENT_CONSOLE)) {
-                       if (loader)
-                               printf("Trying to boot from %s\n",
-                                      spl_loader_name(loader));
-                       else if (CONFIG_IS_ENABLED(SHOW_ERRORS))
-                               printf(SPL_TPL_PROMPT
-                                      "Unsupported Boot Device %d\n", bootdev);
-                       else
-                               puts(SPL_TPL_PROMPT "Unsupported Boot Device!\n");
-               }
-               if (loader && !spl_load_image(spl_image, loader)) {
-                       spl_image->boot_device = bootdev;
-                       return 0;
+               for (loader = drv; loader != drv + n_ents; loader++) {
+                       if (bootdev != loader->boot_device)
+                               continue;
+                       if (!CONFIG_IS_ENABLED(SILENT_CONSOLE)) {
+                               if (loader)
+                                       printf("Trying to boot from %s\n",
+                                              spl_loader_name(loader));
+                               else if (CONFIG_IS_ENABLED(SHOW_ERRORS)) {
+                                       printf(SPL_TPL_PROMPT
+                                              "Unsupported Boot Device %d\n",
+                                              bootdev);
+                               } else {
+                                       puts(SPL_TPL_PROMPT
+                                            "Unsupported Boot Device!\n");
+                               }
+                       }
+                       if (loader &&
+                               !spl_load_image(spl_image, loader)) {
+                               spl_image->boot_device = bootdev;
+                               return 0;
+                       }
                }
        }