diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-01-08 18:11:44 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-07 01:12:55 +0100 |
| commit | 261dcf4624b25f3c551efcf8634e9194fabba9c3 (patch) | |
| tree | 418fbb9ac11e38fd532c72c0078ef94439b80a13 /common/cmd_bootm.c | |
| parent | 559316faf7eae0614c91d77f509b57d6c4c091ba (diff) | |
| download | olio-uboot-2014.01-261dcf4624b25f3c551efcf8634e9194fabba9c3.tar.xz olio-uboot-2014.01-261dcf4624b25f3c551efcf8634e9194fabba9c3.zip | |
[new uImage] Remove I386 uImage fake_header() routine
I386 targets are not using a uImage format, instead fake header
is added to ram image before it is further processed by bootm.
Remove this fixup and force proper uImage use for I386.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index fbe81d303..aa7c0f5b7 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -79,10 +79,6 @@ static int do_imls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); static void print_type (image_header_t *hdr); -#ifdef __I386__ -image_header_t *fake_header(image_header_t *hdr, void *ptr, int size); -#endif - /* * Continue booting an OS image; caller already has: * - copied image header to global variable `header' @@ -157,22 +153,10 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif memmove (&header, (char *)addr, image_get_header_size ()); - if (!image_check_magic (hdr)) { -#ifdef __I386__ /* correct image format not implemented yet - fake it */ - if (fake_header(hdr, (void*)addr, -1) != NULL) { - /* to compensate for the addition below */ - addr -= image_get_header_size (); - /* turnof verify, - * fake_header() does not fake the data crc - */ - verify = 0; - } else -#endif /* __I386__ */ - { + if (!image_check_magic(hdr)) { puts ("Bad Magic Number\n"); show_boot_progress (-1); return 1; - } } show_boot_progress (2); |