diff options
author | Ladislav Michl <ladis@linux-mips.org> | 2016-07-12 20:28:14 +0200 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-07-22 09:53:00 -0400 |
commit | 431889d6ad9a39846636716478d504aa7ff976fc (patch) | |
tree | 13351d0f1ecc3b96ab3d896b68c0322a95ea171b /arch/arm/lib/bootm.c | |
parent | bf55cd4f3e3bc0ebf92c81bde1921f983e999451 (diff) | |
download | u-boot-431889d6ad9a39846636716478d504aa7ff976fc.tar.gz u-boot-431889d6ad9a39846636716478d504aa7ff976fc.tar.xz u-boot-431889d6ad9a39846636716478d504aa7ff976fc.zip |
spl: zImage support in Falcon mode
Other payload than uImage is currently considered to be raw U-Boot
image. Check also for zImage in Falcon mode.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'arch/arm/lib/bootm.c')
-rw-r--r-- | arch/arm/lib/bootm.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 0838d89907..c20ef227fb 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -358,38 +358,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[], return 0; } -#ifdef CONFIG_CMD_BOOTZ - -struct zimage_header { - uint32_t code[9]; - uint32_t zi_magic; - uint32_t zi_start; - uint32_t zi_end; -}; - -#define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818 - -int bootz_setup(ulong image, ulong *start, ulong *end) -{ - struct zimage_header *zi; - - zi = (struct zimage_header *)map_sysmem(image, 0); - if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC) { - puts("Bad Linux ARM zImage magic!\n"); - return 1; - } - - *start = zi->zi_start; - *end = zi->zi_end; - - printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n", image, *start, - *end); - - return 0; -} - -#endif /* CONFIG_CMD_BOOTZ */ - #if defined(CONFIG_BOOTM_VXWORKS) void boot_prep_vxworks(bootm_headers_t *images) { |