mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-17 18:28:55 +00:00
9f9d8704b6
If CONFIG_SPL_NOR_SUPPORT is defined, spl_nor_load_image() requires spl_start_uboot(), CONFIG_SYS_OS_BASE, CONFIG_SYS_SPL_ARGS_ADDR, CONFIG_SYS_FDT_BASE to be defined even if users just want to run U-Boot, not Linux. This is inconvenient. This patch is following the codying style of common/spl/spl_nand.c. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
65 lines
1.5 KiB
C
65 lines
1.5 KiB
C
/*
|
|
* Copyright (C) 2012 Stefan Roese <sr@denx.de>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <spl.h>
|
|
|
|
void spl_nor_load_image(void)
|
|
{
|
|
/*
|
|
* Loading of the payload to SDRAM is done with skipping of
|
|
* the mkimage header in this SPL NOR driver
|
|
*/
|
|
spl_image.flags |= SPL_COPY_PAYLOAD_ONLY;
|
|
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
if (!spl_start_uboot()) {
|
|
struct image_header *header;
|
|
|
|
/*
|
|
* Load Linux from its location in NOR flash to its defined
|
|
* location in SDRAM
|
|
*/
|
|
header = (const struct image_header *)CONFIG_SYS_OS_BASE;
|
|
|
|
if (image_get_os(header) == IH_OS_LINUX) {
|
|
/* happy - was a Linux */
|
|
|
|
spl_parse_image_header(header);
|
|
|
|
memcpy((void *)spl_image.load_addr,
|
|
(void *)(CONFIG_SYS_OS_BASE +
|
|
sizeof(struct image_header)),
|
|
spl_image.size);
|
|
|
|
/*
|
|
* Copy DT blob (fdt) to SDRAM. Passing pointer to
|
|
* flash doesn't work (16 KiB should be enough for DT)
|
|
*/
|
|
memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR,
|
|
(void *)(CONFIG_SYS_FDT_BASE),
|
|
(16 << 10));
|
|
|
|
return;
|
|
} else {
|
|
puts("The Expected Linux image was not found.\n"
|
|
"Please check your NOR configuration.\n"
|
|
"Trying to start u-boot now...\n");
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Load real U-Boot from its location in NOR flash to its
|
|
* defined location in SDRAM
|
|
*/
|
|
spl_parse_image_header(
|
|
(const struct image_header *)CONFIG_SYS_UBOOT_BASE);
|
|
|
|
memcpy((void *)spl_image.load_addr,
|
|
(void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)),
|
|
spl_image.size);
|
|
}
|