diff options
author | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 10:33:00 +0100 |
---|---|---|
committer | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 10:33:00 +0100 |
commit | cd7c596e9f561dbbc17b717277438aee78cde14f (patch) | |
tree | 1766af01b819e4f7c341cb841742cb6242ff0b33 /lib_avr32 | |
parent | 3dfe110149311425919e6d6a14b561b4207498f1 (diff) | |
download | u-boot-cd7c596e9f561dbbc17b717277438aee78cde14f.zip u-boot-cd7c596e9f561dbbc17b717277438aee78cde14f.tar.gz u-boot-cd7c596e9f561dbbc17b717277438aee78cde14f.tar.bz2 |
[new uImage] Add new uImage format support to arch specific do_bootm_linux() routines
This patch updates architecture specific implementations of
do_bootm_linux() adding new uImage format handling for
operations like get kernel entry point address, get kernel
image data start address.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'lib_avr32')
-rw-r--r-- | lib_avr32/bootm.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c index c9a0190..b1c651a 100644 --- a/lib_avr32/bootm.c +++ b/lib_avr32/bootm.c @@ -181,25 +181,30 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], void (*theKernel)(int magic, void *tagtable); struct tag *params, *params_start; char *commandline = getenv("bootargs"); + int ret; /* find kernel entry point */ if (images->legacy_hdr_valid) { ep = image_get_ep (images->legacy_hdr_os); #if defined(CONFIG_FIT) } else if (images->fit_uname_os) { - fit_unsupported_reset ("AVR32 linux bootm"); - do_reset (cmdtp, flag, argc, argv); + ret = fit_image_get_entry (images->fit_hdr_os, + images->fit_noffset_os, &ep); + if (ret) { + puts ("Can't get entry point property!\n"); + goto error; + } #endif } else { puts ("Could not find kernel entry point!\n"); - do_reset (cmdtp, flag, argc, argv); + goto error; } theKernel = (void *)ep; ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_AVR32, &initrd_start, &initrd_end); if (ret) - do_reset (cmdtp, flag, argc, argv); + goto error; show_boot_progress (15); @@ -225,4 +230,11 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], prepare_to_boot(); theKernel(ATAG_MAGIC, params_start); + /* does not return */ + return; + +error: + if (images->autostart) + do_reset (cmdtp, flag, argc, argv); + return; } |