aboutsummaryrefslogtreecommitdiff
path: root/lib_mips
diff options
context:
space:
mode:
authorMarian Balakowicz2008-03-12 10:14:38 +0100
committerMarian Balakowicz2008-03-12 10:14:38 +0100
commitd985c8498c4e47095820da97aa722381d39172c5 (patch)
tree213d5b778f1a1a66aa296d90513089759120fe56 /lib_mips
parentc87796483bc7c2900470dc747c367f602577608d (diff)
[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>
Diffstat (limited to 'lib_mips')
-rw-r--r--lib_mips/bootm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index b336a364986..5e7a46031d8 100644
--- 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);