diff options
author | Marian Balakowicz <m8@semihalf.com> | 2008-01-31 12:55:39 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-02-07 00:12:59 (GMT) |
commit | 5ad03eb3854c162684222a718b44c0716ea0db03 (patch) | |
tree | 4128cb8b65369a712b488c124d1297bc6c50dc67 /lib_microblaze/bootm.c | |
parent | d3c5eb6dd1f4ed3c3388386cf1d1bf82aa51d56b (diff) | |
download | u-boot-fsl-qoriq-5ad03eb3854c162684222a718b44c0716ea0db03.tar.xz |
[new uImage] Factor out common image_get_ramdisk() routine
Architecture specific do_bootm_linux() routines share common
ramdisk image processing code. Move this code to a common
helper routine.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'lib_microblaze/bootm.c')
-rw-r--r-- | lib_microblaze/bootm.c | 85 |
1 files changed, 2 insertions, 83 deletions
diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c index a4fce5a..1f3e777 100644 --- a/lib_microblaze/bootm.c +++ b/lib_microblaze/bootm.c @@ -32,17 +32,10 @@ DECLARE_GLOBAL_DATA_PTR; -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[], image_header_t *hdr, int verify) { - int i; - ulong checksum; - - ulong rd_data, rd_len; ulong initrd_start, initrd_end; - image_header_t *rd_hdr; /* First parameter is mapped to $r5 for kernel boot args */ void (*theKernel) (char *); @@ -50,82 +43,8 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], theKernel = (void (*)(char *))image_get_ep (hdr); - /* Check if there is an initrd image */ - if (argc >= 3) { - show_boot_progress (9); - - rd_hdr = (image_header_t *)simple_strtoul (argv[2], NULL, 16); - printf ("## Loading Ramdisk Image at %08lx ...\n", rd_hdr); - - if (!image_check_magic (rd_hdr)) { - printf ("Bad Magic Number\n"); - show_boot_progress (-10); - do_reset (cmdtp, flag, argc, argv); - } - - if (!image_check_magic (rd_hdr)) { - printf ("Bad Header Checksum\n"); - show_boot_progress (-11); - do_reset (cmdtp, flag, argc, argv); - } - - show_boot_progress (10); - print_image_hdr (rd_hdr); - - rd_data = image_get_data (rd_hdr); - rd_en = image_get_data_size (rd_hdr); - - if (verify) { - printf (" Verifying Checksum ... "); - if (!image_check_dcrc (rd_hdr)) { - printf ("Bad Data CRC\n"); - show_boot_progress (-12); - do_reset (cmdtp, flag, argc, argv); - } - printf ("OK\n"); - } - - show_boot_progress (11); - - if (!image_check_os (rd_hdr, IH_OS_LINUX) || - !image_check_arch (rd_hdr, IH_ARCH_MICROBLAZE) || - !image_check_type (rd_hdr, IH_TYPE_RAMDISK)) { - printf ("No Linux Microblaze Ramdisk Image\n"); - show_boot_progress (-13); - do_reset (cmdtp, flag, argc, argv); - } - - /* - * Now check if we have a multifile image - */ - } else if (image_check_type (hdr, IH_TYPE_MULTI)) { - /* - * Get second entry data start address and len - */ - show_boot_progress (13); - image_multi_getimg (hdr, 1, &rd_data, &rd_len); - } else { - /* - * no initrd image - */ - show_boot_progress (14); - - rd_data = rd_len = 0; - } - -#ifdef DEBUG - if (!rd_data) { - printf ("No initrd\n"); - } -#endif - - if (rd_data) { - initrd_start = rd_data; - initrd_end = initrd_start + rd_len; - } else { - initrd_start = 0; - initrd_end = 0; - } + get_ramdisk (cmdtp, flag, argc, argv, hdr, verify, + IH_ARCH_MICROBLAZE, &initrd_start, &initrd_end); show_boot_progress (15); |