diff options
| author | Kumar Gala | 2008-08-15 08:24:37 -0500 |
|---|---|---|
| committer | Wolfgang Denk | 2008-08-26 23:35:24 +0200 |
| commit | c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865 (patch) | |
| tree | cdd3de7eec29a70630a6a98f1de434a4ae868cf7 /lib_i386 | |
| parent | c160a9544743e80e8889edb2275538e7764ce334 (diff) | |
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_i386')
| -rw-r--r-- | lib_i386/bootm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c index 452eef73bda..8c0b225a177 100644 --- a/lib_i386/bootm.c +++ b/lib_i386/bootm.c @@ -36,7 +36,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], { void *base_ptr; ulong os_data, os_len; - ulong initrd_start, initrd_end; image_header_t *hdr; int ret; #if defined(CONFIG_FIT) @@ -44,11 +43,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], size_t len; #endif - ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_I386, - &initrd_start, &initrd_end); - if (ret) - goto error; - if (images->legacy_hdr_valid) { hdr = images->legacy_hdr_os; if (image_check_type (hdr, IH_TYPE_MULTI)) { @@ -76,7 +70,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], } base_ptr = load_zimage ((void*)os_data, os_len, - initrd_start, initrd_end - initrd_start, 0); + images->rd_start, images->rd_end - images->rd_start, 0); if (NULL == base_ptr) { printf ("## Kernel loading failed ...\n"); |