From c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 15 Aug 2008 08:24:37 -0500 Subject: 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 --- lib_arm/bootm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lib_arm') diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c index 5660a503d..f9f702fff 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); -- cgit v1.2.3