diff options
author | Marian Balakowicz <m8@semihalf.com> | 2008-02-04 08:28:09 +0100 |
---|---|---|
committer | Marian Balakowicz <m8@semihalf.com> | 2008-02-25 15:53:49 +0100 |
commit | d5934ad7756f038a393a9cfab76a4fe306d9d930 (patch) | |
tree | 0299a8fc06709c436f3e1715f80f3e5f9f00885d /lib_sh/bootm.c | |
parent | 5583cbf736474ef754e128a54fb78632f57b48fd (diff) | |
download | bootable_bootloader_goldelico_gta04-d5934ad7756f038a393a9cfab76a4fe306d9d930.zip bootable_bootloader_goldelico_gta04-d5934ad7756f038a393a9cfab76a4fe306d9d930.tar.gz bootable_bootloader_goldelico_gta04-d5934ad7756f038a393a9cfab76a4fe306d9d930.tar.bz2 |
[new uImage] Add dual format uImage support framework
This patch adds framework for dual format images. Format detection is added
and the bootm controll flow is updated to include cases for new FIT format
uImages.
When the legacy (image_header based) format is detected appropriate
legacy specific handling is invoked. For the new (FIT based) format uImages
dual boot framework has a minial support, that will only print out a
corresponding debug messages. Implementation of the FIT specific handling will
be added in following patches.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'lib_sh/bootm.c')
-rw-r--r-- | lib_sh/bootm.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c index 4e5fe77..55e64f5 100644 --- a/lib_sh/bootm.c +++ b/lib_sh/bootm.c @@ -43,6 +43,8 @@ #define RAMDISK_IMAGE_START_MASK 0x07FF +extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); + #ifdef CFG_DEBUG static void hexdump (unsigned char *buf, int len) { @@ -58,10 +60,24 @@ static void hexdump (unsigned char *buf, int len) #endif void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], - image_header_t *hdr, int verify) + bootm_headers_t *images, int verify) { - char *bootargs = getenv("bootargs"); - void (*kernel) (void) = (void (*)(void))image_get_ep (hdr); + ulong ep = 0; + char *bootargs = getenv("bootargs"); + + /* 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 ("SH linux bootm"); + do_reset (cmdtp, flag, argc, argv); +#endif + } else { + puts ("Could not find kernel entry point!\n"); + do_reset (cmdtp, flag, argc, argv); + } + void (*kernel) (void) = (void (*)(void))ep; /* Setup parameters */ memset(PARAM, 0, 0x1000); /* Clear zero page */ |