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_avr32 | |
| parent | c160a9544743e80e8889edb2275538e7764ce334 (diff) | |
| download | talos-obmc-uboot-c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865.tar.gz talos-obmc-uboot-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_avr32')
| -rw-r--r-- | lib_avr32/bootm.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c index 7beab99868..762701fa26 100644 --- a/lib_avr32/bootm.c +++ b/lib_avr32/bootm.c @@ -176,7 +176,6 @@ static void setup_end_tag(struct tag *params) void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], bootm_headers_t *images) { - ulong initrd_start, initrd_end; void (*theKernel)(int magic, void *tagtable); struct tag *params, *params_start; char *commandline = getenv("bootargs"); @@ -184,20 +183,15 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], theKernel = (void *)images->ep; - ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_AVR32, - &initrd_start, &initrd_end); - if (ret) - goto error; - show_boot_progress (15); params = params_start = (struct tag *)gd->bd->bi_boot_params; params = setup_start_tag(params); params = setup_memory_tags(params); - if (initrd_start) { + if (images->rd_start) { params = setup_ramdisk_tag(params, - PHYSADDR(initrd_start), - PHYSADDR(initrd_end)); + PHYSADDR(images->rd_start), + PHYSADDR(images->rd_end)); } params = setup_commandline_tag(params, commandline); params = setup_clock_tags(params); |
