mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
move booti_setup to arch/arm/lig/image.c
Follow bootz's pattern by moving the booti_setup to arch/arm/lib. This allows to use booti_setup in other paths, e.g booting an Android image containing Image format. Note that kernel relocation is move out of booti_setup and it is the caller's responsibility to do it and allows them do it differently. say, cmd/booti.c just do a manually, while in the bootm path, we can use bootm_load_os(with some changes). Signed-off-by: Bin Chen <bin.chen@linaro.org> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
104816142f
commit
6808ef9ac2
4 changed files with 100 additions and 80 deletions
|
@ -32,7 +32,7 @@ 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_BOOTI) += bootm.o
|
obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o
|
||||||
obj-$(CONFIG_CMD_BOOTM) += bootm.o
|
obj-$(CONFIG_CMD_BOOTM) += bootm.o
|
||||||
obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o
|
obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o
|
||||||
obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
|
obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
|
||||||
|
|
77
arch/arm/lib/image.c
Normal file
77
arch/arm/lib/image.c
Normal file
|
@ -0,0 +1,77 @@
|
||||||
|
/*
|
||||||
|
* (C) Copyright 2000-2009
|
||||||
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <common.h>
|
||||||
|
#include <mapmem.h>
|
||||||
|
#include <linux/sizes.h>
|
||||||
|
|
||||||
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
|
#define LINUX_ARM64_IMAGE_MAGIC 0x644d5241
|
||||||
|
|
||||||
|
/* See Documentation/arm64/booting.txt in the Linux kernel */
|
||||||
|
struct Image_header {
|
||||||
|
uint32_t code0; /* Executable code */
|
||||||
|
uint32_t code1; /* Executable code */
|
||||||
|
uint64_t text_offset; /* Image load offset, LE */
|
||||||
|
uint64_t image_size; /* Effective Image size, LE */
|
||||||
|
uint64_t flags; /* Kernel flags, LE */
|
||||||
|
uint64_t res2; /* reserved */
|
||||||
|
uint64_t res3; /* reserved */
|
||||||
|
uint64_t res4; /* reserved */
|
||||||
|
uint32_t magic; /* Magic number */
|
||||||
|
uint32_t res5;
|
||||||
|
};
|
||||||
|
|
||||||
|
int booti_setup(ulong image, ulong *relocated_addr, ulong *size)
|
||||||
|
{
|
||||||
|
struct Image_header *ih;
|
||||||
|
uint64_t dst;
|
||||||
|
uint64_t image_size, text_offset;
|
||||||
|
|
||||||
|
*relocated_addr = image;
|
||||||
|
|
||||||
|
ih = (struct Image_header *)map_sysmem(image, 0);
|
||||||
|
|
||||||
|
if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) {
|
||||||
|
puts("Bad Linux ARM64 Image magic!\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Prior to Linux commit a2c1d73b94ed, the text_offset field
|
||||||
|
* is of unknown endianness. In these cases, the image_size
|
||||||
|
* field is zero, and we can assume a fixed value of 0x80000.
|
||||||
|
*/
|
||||||
|
if (ih->image_size == 0) {
|
||||||
|
puts("Image lacks image_size field, assuming 16MiB\n");
|
||||||
|
image_size = 16 << 20;
|
||||||
|
text_offset = 0x80000;
|
||||||
|
} else {
|
||||||
|
image_size = le64_to_cpu(ih->image_size);
|
||||||
|
text_offset = le64_to_cpu(ih->text_offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
*size = image_size;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If bit 3 of the flags field is set, the 2MB aligned base of the
|
||||||
|
* kernel image can be anywhere in physical memory, so respect
|
||||||
|
* images->ep. Otherwise, relocate the image to the base of RAM
|
||||||
|
* since memory below it is not accessible via the linear mapping.
|
||||||
|
*/
|
||||||
|
if (le64_to_cpu(ih->flags) & BIT(3))
|
||||||
|
dst = image - text_offset;
|
||||||
|
else
|
||||||
|
dst = gd->bd->bi_dram[0].start;
|
||||||
|
|
||||||
|
*relocated_addr = ALIGN(dst, SZ_2M) + text_offset;
|
||||||
|
|
||||||
|
unmap_sysmem(ih);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
92
cmd/booti.c
92
cmd/booti.c
|
@ -16,77 +16,6 @@
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
/* See Documentation/arm64/booting.txt in the Linux kernel */
|
|
||||||
struct Image_header {
|
|
||||||
uint32_t code0; /* Executable code */
|
|
||||||
uint32_t code1; /* Executable code */
|
|
||||||
uint64_t text_offset; /* Image load offset, LE */
|
|
||||||
uint64_t image_size; /* Effective Image size, LE */
|
|
||||||
uint64_t flags; /* Kernel flags, LE */
|
|
||||||
uint64_t res2; /* reserved */
|
|
||||||
uint64_t res3; /* reserved */
|
|
||||||
uint64_t res4; /* reserved */
|
|
||||||
uint32_t magic; /* Magic number */
|
|
||||||
uint32_t res5;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define LINUX_ARM64_IMAGE_MAGIC 0x644d5241
|
|
||||||
|
|
||||||
static int booti_setup(bootm_headers_t *images)
|
|
||||||
{
|
|
||||||
struct Image_header *ih;
|
|
||||||
uint64_t dst;
|
|
||||||
uint64_t image_size, text_offset;
|
|
||||||
|
|
||||||
ih = (struct Image_header *)map_sysmem(images->ep, 0);
|
|
||||||
|
|
||||||
if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) {
|
|
||||||
puts("Bad Linux ARM64 Image magic!\n");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Prior to Linux commit a2c1d73b94ed, the text_offset field
|
|
||||||
* is of unknown endianness. In these cases, the image_size
|
|
||||||
* field is zero, and we can assume a fixed value of 0x80000.
|
|
||||||
*/
|
|
||||||
if (ih->image_size == 0) {
|
|
||||||
puts("Image lacks image_size field, assuming 16MiB\n");
|
|
||||||
image_size = 16 << 20;
|
|
||||||
text_offset = 0x80000;
|
|
||||||
} else {
|
|
||||||
image_size = le64_to_cpu(ih->image_size);
|
|
||||||
text_offset = le64_to_cpu(ih->text_offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If bit 3 of the flags field is set, the 2MB aligned base of the
|
|
||||||
* kernel image can be anywhere in physical memory, so respect
|
|
||||||
* images->ep. Otherwise, relocate the image to the base of RAM
|
|
||||||
* since memory below it is not accessible via the linear mapping.
|
|
||||||
*/
|
|
||||||
if (le64_to_cpu(ih->flags) & BIT(3))
|
|
||||||
dst = images->ep - text_offset;
|
|
||||||
else
|
|
||||||
dst = gd->bd->bi_dram[0].start;
|
|
||||||
|
|
||||||
dst = ALIGN(dst, SZ_2M) + text_offset;
|
|
||||||
|
|
||||||
unmap_sysmem(ih);
|
|
||||||
|
|
||||||
if (images->ep != dst) {
|
|
||||||
void *src;
|
|
||||||
|
|
||||||
debug("Moving Image from 0x%lx to 0x%llx\n", images->ep, dst);
|
|
||||||
|
|
||||||
src = (void *)images->ep;
|
|
||||||
images->ep = dst;
|
|
||||||
memmove((void *)dst, src, image_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Image booting support
|
* Image booting support
|
||||||
*/
|
*/
|
||||||
|
@ -94,31 +23,36 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||||
char * const argv[], bootm_headers_t *images)
|
char * const argv[], bootm_headers_t *images)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct Image_header *ih;
|
ulong ld;
|
||||||
|
ulong relocated_addr;
|
||||||
|
ulong image_size;
|
||||||
|
|
||||||
ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START,
|
ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START,
|
||||||
images, 1);
|
images, 1);
|
||||||
|
|
||||||
/* Setup Linux kernel Image entry point */
|
/* Setup Linux kernel Image entry point */
|
||||||
if (!argc) {
|
if (!argc) {
|
||||||
images->ep = load_addr;
|
ld = load_addr;
|
||||||
debug("* kernel: default image load address = 0x%08lx\n",
|
debug("* kernel: default image load address = 0x%08lx\n",
|
||||||
load_addr);
|
load_addr);
|
||||||
} else {
|
} else {
|
||||||
images->ep = simple_strtoul(argv[0], NULL, 16);
|
ld = simple_strtoul(argv[0], NULL, 16);
|
||||||
debug("* kernel: cmdline image address = 0x%08lx\n",
|
debug("* kernel: cmdline image address = 0x%08lx\n",
|
||||||
images->ep);
|
images->ep);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = booti_setup(images);
|
ret = booti_setup(ld, &relocated_addr, &image_size);
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
ih = (struct Image_header *)map_sysmem(images->ep, 0);
|
/* Handle BOOTM_STATE_LOADOS */
|
||||||
|
if (relocated_addr != ld) {
|
||||||
|
debug("Moving Image from 0x%lx to 0x%lx\n", ld, relocated_addr);
|
||||||
|
memmove((void *)relocated_addr, (void *)ld, image_size);
|
||||||
|
}
|
||||||
|
|
||||||
lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size));
|
images->ep = relocated_addr;
|
||||||
|
lmb_reserve(&images->lmb, images->ep, le32_to_cpu(image_size));
|
||||||
unmap_sysmem(ih);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
|
* Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
|
||||||
|
|
|
@ -871,6 +871,15 @@ int image_setup_linux(bootm_headers_t *images);
|
||||||
*/
|
*/
|
||||||
int bootz_setup(ulong image, ulong *start, ulong *end);
|
int bootz_setup(ulong image, ulong *start, ulong *end);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the correct start address and size of a Linux aarch64 Image.
|
||||||
|
*
|
||||||
|
* @image: Address of image
|
||||||
|
* @start: Returns start address of image
|
||||||
|
* @size : Returns size image
|
||||||
|
* @return 0 if OK, 1 if the image was not recognised
|
||||||
|
*/
|
||||||
|
int booti_setup(ulong image, ulong *relocated_addr, ulong *size);
|
||||||
|
|
||||||
/*******************************************************************/
|
/*******************************************************************/
|
||||||
/* New uImage format specific code (prefixed with fit_) */
|
/* New uImage format specific code (prefixed with fit_) */
|
||||||
|
|
Loading…
Add table
Reference in a new issue