GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spl: zImage support in Falcon mode

Browse source 
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>
This commit is contained in:
Ladislav Michl 2016-07-12 20:28:14 +02:00 • committed by Tom Rini
parent bf55cd4f3e
commit 431889d6ad
4 changed files with 65 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/lib/Makefile
View file

@ -27,11 +27,13 @@ endif
obj-$(CONFIG_CPU_V7M) += cmd_boot.o obj-$(CONFIG_CPU_V7M) += cmd_boot.o
obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-$(CONFIG_CMD_BOOTM) += zimage.o
obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o
obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o
else else
obj-$(CONFIG_SPL_FRAMEWORK) += spl.o obj-$(CONFIG_SPL_FRAMEWORK) += spl.o
obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o
endif endif
obj-$(CONFIG_SEMIHOSTING) += semihosting.o obj-$(CONFIG_SEMIHOSTING) += semihosting.o

32
arch/arm/lib/bootm.c
View file

@ -358,38 +358,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
return 0; 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) #if defined(CONFIG_BOOTM_VXWORKS)
void boot_prep_vxworks(bootm_headers_t *images) void boot_prep_vxworks(bootm_headers_t *images)
{ {

40
arch/arm/lib/zimage.c Normal file
View file

@ -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;
}

23
common/spl/spl.c
View file

@ -56,6 +56,15 @@ __weak int spl_start_uboot(void)
puts("SPL: Direct Linux boot not active!\n"); puts("SPL: Direct Linux boot not active!\n");
return 1; return 1;
} }
/*
* Weak default function for arch specific zImage check. Return zero
* and fill start and end address if image is recognized.
*/
int __weak bootz_setup(ulong image, ulong *start, ulong *end)
{
return 1;
}
#endif #endif
/* /*
@ -124,6 +133,20 @@ int spl_parse_image_header(const struct image_header *header)
/* Signature not found, proceed to other boot methods. */ /* Signature not found, proceed to other boot methods. */
return -EINVAL; return -EINVAL;
#else #else
#ifdef CONFIG_SPL_OS_BOOT
ulong start, end;
if (!bootz_setup((ulong)header, &start, &end)) {
spl_image.name = "Linux";
spl_image.os = IH_OS_LINUX;
spl_image.load_addr = CONFIG_SYS_LOAD_ADDR;
spl_image.entry_point = CONFIG_SYS_LOAD_ADDR;
spl_image.size = end - start;
debug("spl: payload zImage, load addr: 0x%x size: %d\n",
spl_image.load_addr, spl_image.size);
return 0;
}
#endif
/* Signature not found - assume u-boot.bin */ /* Signature not found - assume u-boot.bin */
debug("mkimage signature not found - ih_magic = %x\n", debug("mkimage signature not found - ih_magic = %x\n",
header->ih_magic); header->ih_magic);