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_sh/bootm.c | |
parent | 3dfe110149311425919e6d6a14b561b4207498f1 (diff) | |
download | bootable_bootloader_goldelico_gta04-cd7c596e9f561dbbc17b717277438aee78cde14f.zip bootable_bootloader_goldelico_gta04-cd7c596e9f561dbbc17b717277438aee78cde14f.tar.gz bootable_bootloader_goldelico_gta04-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_sh/bootm.c')
-rw-r--r-- | lib_sh/bootm.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c index 8055841..49462c8 100644 --- a/lib_sh/bootm.c +++ b/lib_sh/bootm.c @@ -70,12 +70,16 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], ep = image_get_ep (images->legacy_hdr_os); #if defined(CONFIG_FIT) } else if (images->fit_uname_os) { - fit_unsupported_reset ("SH linux bootm"); - do_reset (cmdtp, flag, argc, argv); + int 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; } void (*kernel) (void) = (void (*)(void))ep; @@ -87,4 +91,11 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], strcpy(COMMAND_LINE, bootargs); kernel(); + /* does not return */ + return; + +error: + if (images->autostart) + do_reset (cmdtp, flag, argc, argv); + return; } |