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

spl: Add a parameter to spl_parse_image_header()

Browse source 
Instead of using the global spl_image variable, pass the required struct in
as an argument.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2016-09-24 18:19:53 -06:00 • committed by Tom Rini
parent d95ceb97c0
commit 71316c1d8c
14 changed files with 58 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-uniphier/boot-mode/spl_board.c
View file

@ -113,7 +113,7 @@ int spl_board_load_image(void)
return ret; return ret;
} }
ret = spl_parse_image_header((void *)CONFIG_SYS_TEXT_BASE); ret = spl_parse_image_header(&spl_image, (void *)CONFIG_SYS_TEXT_BASE);
if (ret) if (ret)
return ret; return ret;

41
common/spl/spl.c
View file

@ -91,33 +91,34 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
spl_image->name = "U-Boot"; spl_image->name = "U-Boot";
} }
int spl_parse_image_header(const struct image_header *header) int spl_parse_image_header(struct spl_image_info *spl_image,
const struct image_header *header)
{ {
u32 header_size = sizeof(struct image_header); u32 header_size = sizeof(struct image_header);
if (image_get_magic(header) == IH_MAGIC) { if (image_get_magic(header) == IH_MAGIC) {
if (spl_image.flags & SPL_COPY_PAYLOAD_ONLY) { if (spl_image->flags & SPL_COPY_PAYLOAD_ONLY) {
/* /*
* On some system (e.g. powerpc), the load-address and * On some system (e.g. powerpc), the load-address and
* entry-point is located at address 0. We can't load * entry-point is located at address 0. We can't load
* to 0-0x40. So skip header in this case. * to 0-0x40. So skip header in this case.
*/ */
spl_image.load_addr = image_get_load(header); spl_image->load_addr = image_get_load(header);
spl_image.entry_point = image_get_ep(header); spl_image->entry_point = image_get_ep(header);
spl_image.size = image_get_data_size(header); spl_image->size = image_get_data_size(header);
} else { } else {
spl_image.entry_point = image_get_load(header); spl_image->entry_point = image_get_load(header);
/* Load including the header */ /* Load including the header */
spl_image.load_addr = spl_image.entry_point - spl_image->load_addr = spl_image->entry_point -
header_size; header_size;
spl_image.size = image_get_data_size(header) + spl_image->size = image_get_data_size(header) +
header_size; header_size;
} }
spl_image.os = image_get_os(header); spl_image->os = image_get_os(header);
spl_image.name = image_get_name(header); spl_image->name = image_get_name(header);
debug("spl: payload image: %.*s load addr: 0x%x size: %d\n", debug("spl: payload image: %.*s load addr: 0x%x size: %d\n",
(int)sizeof(spl_image.name), spl_image.name, (int)sizeof(spl_image->name), spl_image->name,
spl_image.load_addr, spl_image.size); spl_image->load_addr, spl_image->size);
} else { } else {
#ifdef CONFIG_SPL_PANIC_ON_RAW_IMAGE #ifdef CONFIG_SPL_PANIC_ON_RAW_IMAGE
/* /*
@ -135,13 +136,13 @@ int spl_parse_image_header(const struct image_header *header)
ulong start, end; ulong start, end;
if (!bootz_setup((ulong)header, &start, &end)) { if (!bootz_setup((ulong)header, &start, &end)) {
spl_image.name = "Linux"; spl_image->name = "Linux";
spl_image.os = IH_OS_LINUX; spl_image->os = IH_OS_LINUX;
spl_image.load_addr = CONFIG_SYS_LOAD_ADDR; spl_image->load_addr = CONFIG_SYS_LOAD_ADDR;
spl_image.entry_point = CONFIG_SYS_LOAD_ADDR; spl_image->entry_point = CONFIG_SYS_LOAD_ADDR;
spl_image.size = end - start; spl_image->size = end - start;
debug("spl: payload zImage, load addr: 0x%x size: %d\n", debug("spl: payload zImage, load addr: 0x%x size: %d\n",
spl_image.load_addr, spl_image.size); spl_image->load_addr, spl_image->size);
return 0; return 0;
} }
#endif #endif
@ -153,7 +154,7 @@ int spl_parse_image_header(const struct image_header *header)
/* 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);
spl_set_header_raw_uboot(&spl_image); spl_set_header_raw_uboot(spl_image);
#endif #endif
} }
return 0; return 0;
@ -209,7 +210,7 @@ static int spl_ram_load_image(void)
header = (struct image_header *) header = (struct image_header *)
(CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); (CONFIG_SYS_TEXT_BASE - sizeof(struct image_header));
spl_parse_image_header(header); spl_parse_image_header(&spl_image, header);
} }
return 0; return 0;

2
common/spl/spl_ext.c
View file

@ -48,7 +48,7 @@ int spl_load_image_ext(struct blk_desc *block_dev,
goto end; goto end;
} }
err = spl_parse_image_header(header); err = spl_parse_image_header(&spl_image, header);
if (err < 0) { if (err < 0) {
puts("spl: ext: failed to parse image header\n"); puts("spl: ext: failed to parse image header\n");
goto end; goto end;

2
common/spl/spl_fat.c
View file

@ -84,7 +84,7 @@ int spl_load_image_fat(struct blk_desc *block_dev,
return spl_load_simple_fit(&load, 0, header); return spl_load_simple_fit(&load, 0, header);
} else { } else {
err = spl_parse_image_header(header); err = spl_parse_image_header(&spl_image, header);
if (err) if (err)
goto end; goto end;

2
common/spl/spl_mmc.c
View file

@ -25,7 +25,7 @@ static int mmc_load_legacy(struct mmc *mmc, ulong sector,
unsigned long count; unsigned long count;
int ret; int ret;
ret = spl_parse_image_header(header); ret = spl_parse_image_header(&spl_image, header);
if (ret) if (ret)
return ret; return ret;

4
common/spl/spl_nand.c
View file

@ -59,7 +59,7 @@ static int spl_nand_load_element(int offset, struct image_header *header)
load.read = spl_nand_fit_read; load.read = spl_nand_fit_read;
return spl_load_simple_fit(&load, offset, header); return spl_load_simple_fit(&load, offset, header);
} else { } else {
err = spl_parse_image_header(header); err = spl_parse_image_header(&spl_image, header);
if (err) if (err)
return err; return err;
return nand_spl_load_image(offset, spl_image.size, return nand_spl_load_image(offset, spl_image.size,
@ -107,7 +107,7 @@ int spl_nand_load_image(void)
/* load linux */ /* load linux */
nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS, nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
sizeof(*header), (void *)header); sizeof(*header), (void *)header);
err = spl_parse_image_header(header); err = spl_parse_image_header(&spl_image, header);
if (err) if (err)
return err; return err;
if (header->ih_os == IH_OS_LINUX) { if (header->ih_os == IH_OS_LINUX) {

3
common/spl/spl_net.c
View file

@ -34,5 +34,6 @@ int spl_net_load_image(const char *device)
printf("Problem booting with BOOTP\n"); printf("Problem booting with BOOTP\n");
return rv; return rv;
} }
return spl_parse_image_header((struct image_header *)load_addr); return spl_parse_image_header(&spl_image,
(struct image_header *)load_addr);
} }

4
common/spl/spl_nor.c
View file

@ -29,7 +29,7 @@ int spl_nor_load_image(void)
if (image_get_os(header) == IH_OS_LINUX) { if (image_get_os(header) == IH_OS_LINUX) {
/* happy - was a Linux */ /* happy - was a Linux */
ret = spl_parse_image_header(header); ret = spl_parse_image_header(&spl_image, header);
if (ret) if (ret)
return ret; return ret;
@ -59,7 +59,7 @@ int spl_nor_load_image(void)
* Load real U-Boot from its location in NOR flash to its * Load real U-Boot from its location in NOR flash to its
* defined location in SDRAM * defined location in SDRAM
*/ */
ret = spl_parse_image_header( ret = spl_parse_image_header(&spl_image,
(const struct image_header *)CONFIG_SYS_UBOOT_BASE); (const struct image_header *)CONFIG_SYS_UBOOT_BASE);
if (ret) if (ret)
return ret; return ret;

2
common/spl/spl_onenand.c
View file

@ -26,7 +26,7 @@ int spl_onenand_load_image(void)
/* Load u-boot */ /* Load u-boot */
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS, onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
CONFIG_SYS_ONENAND_PAGE_SIZE, (void *)header); CONFIG_SYS_ONENAND_PAGE_SIZE, (void *)header);
ret = spl_parse_image_header(header); ret = spl_parse_image_header(&spl_image, header);
if (ret) if (ret)
return ret; return ret;
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS, onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,

4
common/spl/spl_ubi.c
View file

@ -54,7 +54,7 @@ int spl_ubi_load_image(u32 boot_device)
ret = ubispl_load_volumes(&info, volumes, 2); ret = ubispl_load_volumes(&info, volumes, 2);
if (!ret) { if (!ret) {
header = (struct image_header *)volumes[0].load_addr; header = (struct image_header *)volumes[0].load_addr;
spl_parse_image_header(header); spl_parse_image_header(&spl_image, header);
puts("Linux loaded.\n"); puts("Linux loaded.\n");
goto out; goto out;
} }
@ -68,7 +68,7 @@ int spl_ubi_load_image(u32 boot_device)
ret = ubispl_load_volumes(&info, volumes, 1); ret = ubispl_load_volumes(&info, volumes, 1);
if (!ret) if (!ret)
spl_parse_image_header(header); spl_parse_image_header(&spl_image, header);
out: out:
#ifdef CONFIG_SPL_NAND_SUPPORT #ifdef CONFIG_SPL_NAND_SUPPORT
if (boot_device == BOOT_DEVICE_NAND) if (boot_device == BOOT_DEVICE_NAND)

5
common/spl/spl_ymodem.c
View file

@ -108,8 +108,9 @@ int spl_ymodem_load_image(void)
while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0) while ((res = xyzModem_stream_read(buf, BUF_SIZE, &err)) > 0)
size += res; size += res;
} else { } else {
spl_parse_image_header((struct image_header *)buf); spl_parse_image_header(&spl_image, (struct image_header *)buf);
ret = spl_parse_image_header((struct image_header *)buf); ret = spl_parse_image_header(&spl_image,
(struct image_header *)buf);
if (ret) if (ret)
return ret; return ret;
addr = spl_image.load_addr; addr = spl_image.load_addr;

4
drivers/mtd/spi/spi_spl_load.c
View file

@ -32,7 +32,7 @@ static int spi_load_image_os(struct spi_flash *flash,
if (image_get_magic(header) != IH_MAGIC) if (image_get_magic(header) != IH_MAGIC)
return -1; return -1;
err = spl_parse_image_header(header); err = spl_parse_image_header(&spl_image, header);
if (err) if (err)
return err; return err;
@ -110,7 +110,7 @@ int spl_spi_load_image(void)
CONFIG_SYS_SPI_U_BOOT_OFFS, CONFIG_SYS_SPI_U_BOOT_OFFS,
header); header);
} else { } else {
err = spl_parse_image_header(header); err = spl_parse_image_header(&spl_image, header);
if (err) if (err)
return err; return err;
err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS,

2
drivers/mtd/spi/sunxi_spi_spl.c
View file

@ -271,7 +271,7 @@ int spl_spi_load_image(void)
spi0_init(); spi0_init();
spi0_read_data((void *)header, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40); spi0_read_data((void *)header, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40);
err = spl_parse_image_header(header); err = spl_parse_image_header(&spl_image, header);
if (err) if (err)
return err; return err;

20
include/spl.h
View file

@ -75,11 +75,27 @@ u32 spl_boot_mode(const u32 boot_device);
* config options: CONFIG_SYS_MONITOR_LEN, CONFIG_SYS_UBOOT_START, * config options: CONFIG_SYS_MONITOR_LEN, CONFIG_SYS_UBOOT_START,
* CONFIG_SYS_TEXT_BASE. * CONFIG_SYS_TEXT_BASE.
* *
* @spl_image: Image to set up * @spl_image: Image description to set up
*/ */
void spl_set_header_raw_uboot(struct spl_image_info *spl_image); void spl_set_header_raw_uboot(struct spl_image_info *spl_image);
int spl_parse_image_header(const struct image_header *header); /**
* spl_parse_image_header() - parse the image header and set up info
*
* This parses the legacy image header information at @header and sets up
* @spl_image according to what is found. If no image header is found, then
* a raw image or bootz is assumed. If CONFIG_SPL_PANIC_ON_RAW_IMAGE is
* enabled, then this causes a panic. If CONFIG_SPL_ABORT_ON_RAW_IMAGE is
* enabled then U-Boot gives up. Otherwise U-Boot sets up the image using
* spl_set_header_raw_uboot(), or possibly the bootz header.
*
* @spl_image: Image description to set up
* @header image header to parse
* @return 0 if a header was correctly parsed, -ve on error
*/
int spl_parse_image_header(struct spl_image_info *spl_image,
const struct image_header *header);
void spl_board_prepare_for_linux(void); void spl_board_prepare_for_linux(void);
void spl_board_prepare_for_boot(void); void spl_board_prepare_for_boot(void);
int spl_board_ubi_load_image(u32 boot_device); int spl_board_ubi_load_image(u32 boot_device);