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 | |
| parent | bf55cd4f3e3bc0ebf92c81bde1921f983e999451 (diff) | |
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')
| -rw-r--r-- | arch/arm/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/lib/bootm.c | 32 | ||||
| -rw-r--r-- | arch/arm/lib/zimage.c | 40 |
3 files changed, 42 insertions, 32 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index f406419d88..9f71376d30 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -27,11 +27,13 @@ endif obj-$(CONFIG_CPU_V7M) += cmd_boot.o obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o obj-$(CONFIG_CMD_BOOTM) += bootm.o +obj-$(CONFIG_CMD_BOOTM) += zimage.o obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o else obj-$(CONFIG_SPL_FRAMEWORK) += spl.o +obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o endif obj-$(CONFIG_SEMIHOSTING) += semihosting.o 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) { diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c new file mode 100644 index 0000000000..1e811a87dd --- /dev/null +++ b/arch/arm/lib/zimage.c @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2016 + * Ladislav Michl <ladis@linux-mips.org> + * + * bootz code: + * Copyright (C) 2012 Marek Vasut <marek.vasut@gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include <common.h> + +#define LINUX_ARM_ZIMAGE_MAGIC 0x016f2818 + +struct arm_z_header { + uint32_t code[9]; + uint32_t zi_magic; + uint32_t zi_start; + uint32_t zi_end; +} __attribute__ ((__packed__)); + +int bootz_setup(ulong image, ulong *start, ulong *end) +{ + struct arm_z_header *zi = (struct arm_z_header *)image; + + if (zi->zi_magic != LINUX_ARM_ZIMAGE_MAGIC) { +#ifndef CONFIG_SPL_FRAMEWORK + puts("Bad Linux ARM zImage magic!\n"); +#endif + return 1; + } + + *start = zi->zi_start; + *end = zi->zi_end; +#ifndef CONFIG_SPL_FRAMEWORK + printf("Kernel image @ %#08lx [ %#08lx - %#08lx ]\n", + image, *start, *end); +#endif + + return 0; +} |