bootm: Reduce arguments to boot_get_loadables()

This function only uses two arguments. The 'arch' always has a constant
value, so drop it. This simplifies the function call.

Tidy up the function comment while we are here.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/boot/bootm.c b/boot/bootm.c
index ae3fceb392daad433d72fb91873f42012dc8c161..aae097df0c7fe9df8095ab571265ff3810dce5cf 100644 (file)
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -563,8 +563,7 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start,
        }
 
        /* find all of the loadables */
-       ret = boot_get_loadable(argc, argv, &images, IH_ARCH_DEFAULT,
-                              NULL, NULL);
+       ret = boot_get_loadable(&images);
        if (ret) {
                printf("Loadable(s) is corrupt or invalid\n");
                return 1;

diff --git a/boot/image-board.c b/boot/image-board.c
index b926275ec9179916b7ade2ef6a9e8ddecdf65a0b..bb0ca9d7f22f39970437800b00fef12682d6afc7 100644 (file)
--- a/boot/image-board.c
+++ b/boot/image-board.c
@@ -718,8 +718,7 @@ static void fit_loadable_process(u8 img_type,
                        fit_loadable_handler->handler(img_data, img_len);
 }
 
-int boot_get_loadable(int argc, char *const argv[], struct bootm_headers *images,
-                     u8 arch, const ulong *ld_start, ulong * const ld_len)
+int boot_get_loadable(struct bootm_headers *images)
 {
        /*
         * These variables are used to hold the current image location
@@ -765,7 +764,8 @@ int boot_get_loadable(int argc, char *const argv[], struct bootm_headers *images
                        fit_img_result = fit_image_load(images, tmp_img_addr,
                                                        &uname,
                                                        &images->fit_uname_cfg,
-                                                       arch, IH_TYPE_LOADABLE,
+                                                       IH_ARCH_DEFAULT,
+                                                       IH_TYPE_LOADABLE,
                                                        BOOTSTAGE_ID_FIT_LOADABLE_START,
                                                        FIT_LOAD_OPTIONAL_NON_ZERO,
                                                        &img_data, &img_len);

diff --git a/include/image.h b/include/image.h
index 63f2bd3b37139bcb5b5e6e91427d601927b15a70..b89912a50f98db2c8c27131a7144c7477ea6f443 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -676,28 +676,22 @@ int boot_get_ramdisk(char const *select, struct bootm_headers *images,
                     uint arch, ulong *rd_start, ulong *rd_end);
 
 /**
- * boot_get_loadable - routine to load a list of binaries to memory
- * @argc: Ignored Argument
- * @argv: Ignored Argument
+ * boot_get_loadable() - load a list of binaries to memory
+ *
  * @images: pointer to the bootm images structure
- * @arch: expected architecture for the image
- * @ld_start: Ignored Argument
- * @ld_len: Ignored Argument
  *
- * boot_get_loadable() will take the given FIT configuration, and look
- * for a field named "loadables".  Loadables, is a list of elements in
- * the FIT given as strings.  exe:
+ * Takes the given FIT configuration, then looks for a field named
+ * "loadables", a list of elements in the FIT given as strings, e.g.:
  *   loadables = "linux_kernel", "fdt-2";
- * this function will attempt to parse each string, and load the
- * corresponding element from the FIT into memory.  Once placed,
- * no aditional actions are taken.
  *
- * @return:
+ * Each string is parsed, loading the corresponding element from the FIT into
+ * memory.  Once placed, no additional actions are taken.
+ *
+ * Return:
  *     0, if only valid images or no images are found
  *     error code, if an error occurs during fit_image_load
  */
-int boot_get_loadable(int argc, char *const argv[], struct bootm_headers *images,
-                     uint8_t arch, const ulong *ld_start, ulong *const ld_len);
+int boot_get_loadable(struct bootm_headers *images);
 
 int boot_get_setup_fit(struct bootm_headers *images, uint8_t arch,
                       ulong *setup_start, ulong *setup_len);