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_ppc/bootm.c | |
parent | c160a9544743e80e8889edb2275538e7764ce334 (diff) | |
download | bootable_bootloader_goldelico_gta04-c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865.zip bootable_bootloader_goldelico_gta04-c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865.tar.gz bootable_bootloader_goldelico_gta04-c4f9419c6b54958e0eddbcbc9e5a4a7b7ec99865.tar.bz2 |
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_ppc/bootm.c')
-rw-r--r-- | lib_ppc/bootm.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index b08ee0d..e6a6e44 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -73,7 +73,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], ulong sp; ulong initrd_start, initrd_end; - ulong rd_data_start, rd_data_end, rd_len; + ulong rd_len; ulong size; phys_size_t bootm_size; @@ -153,13 +153,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], set_clocks_in_mhz(kbd); } - /* find ramdisk */ - ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_PPC, - &rd_data_start, &rd_data_end); - if (ret) - goto error; - - rd_len = rd_data_end - rd_data_start; + rd_len = images->rd_end - images->rd_start; #if defined(CONFIG_OF_LIBFDT) ret = boot_relocate_fdt (lmb, bootmap_base, @@ -171,7 +165,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], */ if (of_size) { /* pass in dummy initrd info, we'll fix up later */ - if (fdt_chosen(of_flat_tree, rd_data_start, rd_data_end, 0) < 0) { + if (fdt_chosen(of_flat_tree, images->rd_start, images->rd_end, 0) < 0) { fdt_error ("/chosen node create failed"); goto error; } @@ -221,7 +215,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], } #endif /* CONFIG_OF_LIBFDT */ - ret = boot_ramdisk_high (lmb, rd_data_start, rd_len, &initrd_start, &initrd_end); + ret = boot_ramdisk_high (lmb, images->rd_start, rd_len, &initrd_start, &initrd_end); if (ret) goto error; @@ -235,7 +229,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], /* Look for the dummy entry and delete it */ for (j = 0; j < total; j++) { fdt_get_mem_rsv(of_flat_tree, j, &addr, &size); - if (addr == rd_data_start) { + if (addr == images->rd_start) { fdt_del_mem_rsv(of_flat_tree, j); break; } |