summaryrefslogtreecommitdiff
path: root/lib_blackfin
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-02-04 08:28:09 +0100
committerMarian Balakowicz <m8@semihalf.com>2008-02-25 15:53:49 +0100
commitd5934ad7756f038a393a9cfab76a4fe306d9d930 (patch)
tree0299a8fc06709c436f3e1715f80f3e5f9f00885d /lib_blackfin
parent5583cbf736474ef754e128a54fb78632f57b48fd (diff)
downloadu-boot-imx-d5934ad7756f038a393a9cfab76a4fe306d9d930.zip
u-boot-imx-d5934ad7756f038a393a9cfab76a4fe306d9d930.tar.gz
u-boot-imx-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_blackfin')
-rw-r--r--lib_blackfin/bootm.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c
index 6299415..8010e5d 100644
--- a/lib_blackfin/bootm.c
+++ b/lib_blackfin/bootm.c
@@ -47,16 +47,30 @@ extern void flush_data_cache(void);
static char *make_command_line(void);
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)
{
- int (*appl) (char *cmdline);
- char *cmdline;
+ int (*appl) (char *cmdline);
+ char *cmdline;
+ ulong ep = 0;
#ifdef SHARED_RESOURCES
swap_to(FLASH);
#endif
- appl = (int (*)(char *))image_get_ep (hdr);
+ /* 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);
+#endif
+ } else {
+ puts ("Could not find kernel entry point!\n");
+ do_reset (cmdtp, flag, argc, argv);
+ }
+ appl = (int (*)(char *))ep;
+
printf("Starting Kernel at = %x\n", appl);
cmdline = make_command_line();
if (icache_status()) {