diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 10:14:38 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 10:14:38 +0100 |
| commit | d985c8498c4e47095820da97aa722381d39172c5 (patch) | |
| tree | 213d5b778f1a1a66aa296d90513089759120fe56 /lib_mips | |
| parent | c87796483bc7c2900470dc747c367f602577608d (diff) | |
| download | u-boot-d985c8498c4e47095820da97aa722381d39172c5.tar.gz u-boot-d985c8498c4e47095820da97aa722381d39172c5.tar.xz u-boot-d985c8498c4e47095820da97aa722381d39172c5.zip | |
[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.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c index b336a36498..5e7a46031d 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); |