diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-15 08:24:37 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-26 23:35:24 +0200 |
| commit | c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865 (patch) | |
| tree | cdd3de7eec29a70630a6a98f1de434a4ae868cf7 /lib_arm | |
| parent | c160a9544743e80e8889edb2275538e7764ce334 (diff) | |
| download | u-boot-c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865.tar.gz u-boot-c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865.tar.xz u-boot-c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865.zip | |
bootm: refactor ramdisk locating code
Move determing if we have a ramdisk and where its located into the
common code. Keep track of the ramdisk start and end in the
bootm_headers_t image struct.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'lib_arm')
| -rw-r--r-- | lib_arm/bootm.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c index 5660a503dc..f9f702fff7 100644 --- a/lib_arm/bootm.c +++ b/lib_arm/bootm.c @@ -61,7 +61,6 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], bootm_headers_t *images) { - ulong initrd_start, initrd_end; bd_t *bd = gd->bd; char *s; int machid = bd->bi_arch_number; @@ -80,11 +79,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], printf ("Using machid 0x%x from environment\n", machid); } - ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_ARM, - &initrd_start, &initrd_end); - if (ret) - goto error; - show_boot_progress (15); debug ("## Transferring control to Linux (at address %08lx) ...\n", @@ -111,8 +105,8 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], setup_commandline_tag (bd, commandline); #endif #ifdef CONFIG_INITRD_TAG - if (initrd_start && initrd_end) - setup_initrd_tag (bd, initrd_start, initrd_end); + if (images->rd_start && images->rd_end) + setup_initrd_tag (bd, images->rd_start, images->rd_end); #endif #if defined (CONFIG_VFD) || defined (CONFIG_LCD) setup_videolfb_tag ((gd_t *) gd); |