[new uImage] Remove unnecessary arguments passed to ramdisk routines

boot_get_ramdisk() and image_get_ramdisk() do not need all
cmdtp, flag, argc and argv arguments. Simplify routines definition.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>

diff --git a/common/image.c b/common/image.c
index 3b15853c922506e5643745d084a04f121ef732b6..6458fb13f5ff0ea7a99886bbed53fef5b8c625d1 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -66,9 +66,8 @@ extern int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static image_header_t* image_get_ramdisk (cmd_tbl_t *cmdtp, int flag,
-               int argc, char *argv[],
-               ulong rd_addr, uint8_t arch, int verify);
+static image_header_t* image_get_ramdisk (ulong rd_addr, uint8_t arch,
+                                               int verify);
 #else
 #include "mkimage.h"
 #include <time.h>
@@ -379,10 +378,6 @@ inline void image_print_contents_noindent (image_header_t *hdr)
 #ifndef USE_HOSTCC
 /**
  * image_get_ramdisk - get and verify ramdisk image
- * @cmdtp: command table pointer
- * @flag: command flag
- * @argc: command argument count
- * @argv: command argument list
  * @rd_addr: ramdisk image start address
  * @arch: expected ramdisk architecture
  * @verify: checksum verification flag
@@ -399,9 +394,8 @@ inline void image_print_contents_noindent (image_header_t *hdr)
  *     pointer to a ramdisk image header, if image was found and valid
  *     otherwise, return NULL
  */
-static image_header_t* image_get_ramdisk (cmd_tbl_t *cmdtp, int flag,
-               int argc, char *argv[],
-               ulong rd_addr, uint8_t arch, int verify)
+static image_header_t* image_get_ramdisk (ulong rd_addr, uint8_t arch,
+                                               int verify)
 {
        image_header_t *rd_hdr;
 
@@ -748,8 +742,6 @@ ulong genimg_get_image (ulong img_addr)
 
 /**
  * boot_get_ramdisk - main ramdisk handling routine
- * @cmdtp: command table pointer
- * @flag: command flag
  * @argc: command argument count
  * @argv: command argument list
  * @images: pointer to the bootm images structure
@@ -763,14 +755,15 @@ ulong genimg_get_image (ulong img_addr)
  *      - commandline provided address of decicated ramdisk image.
  *
  * returns:
+ *     0, if ramdisk image was found and valid, or skiped
  *     rd_start and rd_end are set to ramdisk start/end addresses if
  *     ramdisk image is found and valid
+ *
+ *     1, if ramdisk image is found but corrupted
  *     rd_start and rd_end are set to 0 if no ramdisk exists
- *     return 1 if ramdisk image is found but corrupted
  */
-int boot_get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
-               bootm_headers_t *images, uint8_t arch,
-               ulong *rd_start, ulong *rd_end)
+int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
+               uint8_t arch, ulong *rd_start, ulong *rd_end)
 {
        ulong rd_addr, rd_load;
        ulong rd_data, rd_len;
@@ -837,8 +830,8 @@ int boot_get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                        printf ("## Loading init Ramdisk from Legacy "
                                        "Image at %08lx ...\n", rd_addr);
 
-                       rd_hdr = image_get_ramdisk (cmdtp, flag, argc, argv,
-                                               rd_addr, arch, images->verify);
+                       rd_hdr = image_get_ramdisk (rd_addr, arch,
+                                                       images->verify);
 
                        if (rd_hdr == NULL)
                                return 1;
@@ -901,8 +894,7 @@ int boot_get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                        break;
 #endif
                default:
-                       printf ("Wrong Image Format for %s command\n",
-                                       cmdtp->name);
+                       puts ("Wrong Ramdisk Image Format\n");
                        rd_data = rd_len = rd_load = 0;
                }
 

diff --git a/include/image.h b/include/image.h
index 681c753d1d14b8d7c5ee34e2f58eab88c7d279cb..6fca6f4d4db539aee185e135d0d1dc905a9391ce 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -250,9 +250,8 @@ int genimg_get_comp_id (const char *name);
 int genimg_get_format (void *img_addr);
 ulong genimg_get_image (ulong img_addr);
 
-int boot_get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
-               bootm_headers_t *images, uint8_t arch,
-               ulong *rd_start, ulong *rd_end);
+int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
+               uint8_t arch, ulong *rd_start, ulong *rd_end);
 
 #if defined(CONFIG_PPC) || defined(CONFIG_M68K)
 int boot_ramdisk_high (struct lmb *lmb, ulong rd_data, ulong rd_len,

diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 865e711e91999c746f4f3d5095464a13bab4eceb..08eef0bc2856a98eb8d241da04021b6f84ffbb0c 100644 (file)
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -95,8 +95,10 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                printf ("Using machid 0x%x from environment\n", machid);
        }
 
-       boot_get_ramdisk (cmdtp, flag, argc, argv, images,
-                       IH_ARCH_ARM, &initrd_start, &initrd_end);
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_ARM,
+                       &initrd_start, &initrd_end);
+       if (ret)
+               do_reset (cmdtp, flag, argc, argv);
 
        show_boot_progress (15);
 

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index e8e537a2ce33ac4d14f09ff48d3b8f4a8f4b73dc..c9a0190023ed10336cd2b5a0f18b5f5942ca7a0b 100644 (file)
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -196,8 +196,10 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        }
        theKernel = (void *)ep;
 
-       boot_get_ramdisk (cmdtp, flag, argc, argv, images,
-                       IH_ARCH_AVR32, &initrd_start, &initrd_end);
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_AVR32,
+                       &initrd_start, &initrd_end);
+       if (ret)
+               do_reset (cmdtp, flag, argc, argv);
 
        show_boot_progress (15);
 

diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c
index 76bcf6cd85e3999d818ee060abce57f6ff46eb2e..b4a52fa21d73f021c38ec2d9d5fd1e216aefa0fd 100644 (file)
--- a/lib_i386/bootm.c
+++ b/lib_i386/bootm.c
@@ -39,9 +39,12 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        ulong           initrd_start, initrd_end;
        ulong           ep;
        image_header_t  *hdr;
+       int             ret;
 
-       boot_get_ramdisk (cmdtp, flag, argc, argv, images,
-                       IH_ARCH_I386, &initrd_start, &initrd_end);
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_I386,
+                       &initrd_start, &initrd_end);
+       if (ret)
+               do_reset (cmdtp, flag, argc, argv);
 
        if (images->legacy_hdr_valid) {
                hdr = images->legacy_hdr_os;

diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
index fba7499090d2dc319a2ccd89cace42a2d2a369e9..f185beaa9ec9eea06aa9a42b5b2d0970251aab8d 100644 (file)
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -111,9 +111,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
        kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))ep;
 
        /* find ramdisk */
-       ret = boot_get_ramdisk (cmdtp, flag, argc, argv, images,
-                       IH_ARCH_M68K, &rd_data_start, &rd_data_end);
-
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_M68K,
+                       &rd_data_start, &rd_data_end);
        if (ret)
                goto error;
 

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index b336a364986461e94aab8cea80d660cb54ad31d7..5e7a46031d80160b73c9ba50ffd893649adc7325 100644 (file)
--- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c
@@ -53,6 +53,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        void    (*theKernel) (int, char **, char **, int *);
        char    *commandline = getenv ("bootargs");
        char    env_buf[12];
+       int     ret;
 
        /* find kernel entry point */
        if (images->legacy_hdr_valid) {
@@ -68,8 +69,10 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        }
        theKernel = (void (*)(int, char **, char **, int *))ep;
 
-       boot_get_ramdisk (cmdtp, flag, argc, argv, images,
-                       IH_ARCH_MIPS, &initrd_start, &initrd_end);
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_MIPS,
+                       &initrd_start, &initrd_end);
+       if (ret)
+               do_reset (cmdtp, flag, argc, argv);
 
        show_boot_progress (15);
 

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 797715773d3304bf3939258b37cf089eaef19a10..ac06b2667e39436c7816f3da7f6413abb0a583c3 100644 (file)
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -160,9 +160,8 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))ep;
 
        /* find ramdisk */
-       ret = boot_get_ramdisk (cmdtp, flag, argc, argv, images,
-                       IH_ARCH_PPC, &rd_data_start, &rd_data_end);
-
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_PPC,
+                       &rd_data_start, &rd_data_end);
        if (ret)
                goto error;