michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spl: nor: refactor spl_nor_load_image for falcon mode

Browse Source 
This patch moves the falcon mode handling logic out of
spl_nor_load_image to spl_nor_load_image_os, this allows for cleaner
handling for fallback to U-Boot in case falcon mode fails.

Signed-off-by: Anshul Dalal <anshuld@ti.com>
This commit is contained in:
Anshul Dalal
2025-10-18 01:03:10 +05:30
committed by Tom Rini
parent a6a801fcd6
commit b5446fd478
1 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
common/spl/spl_nor.c
View File

@@ -25,6 +25,58 @@ unsigned long __weak spl_nor_get_uboot_base(void)
return CFG_SYS_UBOOT_BASE;
}
#if IS_ENABLED(CONFIG_SPL_OS_BOOT)
static int spl_nor_load_image_os(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
/*
* Load Linux from its location in NOR flash to its defined
* location in SDRAM
*/
const struct legacy_img_hdr *header =
(const struct legacy_img_hdr *)CONFIG_SYS_OS_BASE;
struct spl_load_info load;
#ifdef CONFIG_SPL_LOAD_FIT
if (image_get_magic(header) == FDT_MAGIC) {
int ret;
debug("Found FIT\n");
spl_load_init(&load, spl_nor_load_read, NULL, 1);
ret = spl_load_simple_fit(spl_image, &load, CONFIG_SYS_OS_BASE,
(void *)header);
#if defined CONFIG_SPL_PAYLOAD_ARGS_ADDR && defined CONFIG_CMD_SPL_NOR_OFS
memcpy((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR,
(void *)CONFIG_CMD_SPL_NOR_OFS,
CONFIG_CMD_SPL_WRITE_SIZE);
#endif
return ret;
}
#endif
if (image_get_os(header) != IH_OS_LINUX)
return -EINVAL;
/* happy - was a Linux */
int ret;
ret = spl_parse_image_header(spl_image, bootdev, header);
if (ret)
return ret;
memcpy((void *)spl_image->load_addr,
(void *)(CONFIG_SYS_OS_BASE + sizeof(struct legacy_img_hdr)),
spl_image->size);
#ifdef CONFIG_SPL_PAYLOAD_ARGS_ADDR
spl_image->arg = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR;
#endif
return 0;
}
#endif
static int spl_nor_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
@@ -36,55 +88,16 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
*/
spl_image->flags |= SPL_COPY_PAYLOAD_ONLY;
#if CONFIG_IS_ENABLED(OS_BOOT)
#if IS_ENABLED(CONFIG_SPL_OS_BOOT)
int err;
if (!spl_start_uboot()) {
/*
* Load Linux from its location in NOR flash to its defined
* location in SDRAM
*/
const struct legacy_img_hdr *header =
(const struct legacy_img_hdr *)CONFIG_SYS_OS_BASE;
#ifdef CONFIG_SPL_LOAD_FIT
if (image_get_magic(header) == FDT_MAGIC) {
int ret;
debug("Found FIT\n");
spl_load_init(&load, spl_nor_load_read, NULL, 1);
ret = spl_load_simple_fit(spl_image, &load,
CONFIG_SYS_OS_BASE,
(void *)header);
#if defined CONFIG_SPL_PAYLOAD_ARGS_ADDR && defined CONFIG_CMD_SPL_NOR_OFS
memcpy((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR,
(void *)CONFIG_CMD_SPL_NOR_OFS,
CONFIG_CMD_SPL_WRITE_SIZE);
#endif
return ret;
}
#endif
if (image_get_os(header) == IH_OS_LINUX) {
/* happy - was a Linux */
int ret;
ret = spl_parse_image_header(spl_image, bootdev, header);
if (ret)
return ret;
memcpy((void *)spl_image->load_addr,
(void *)(CONFIG_SYS_OS_BASE +
sizeof(struct legacy_img_hdr)),
spl_image->size);
#ifdef CONFIG_SPL_PAYLOAD_ARGS_ADDR
spl_image->arg = (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR;
#endif
err = spl_nor_load_image_os(spl_image, bootdev);
if (!err)
return 0;
} else {
puts("The Expected Linux image was not found.\n"
"Please check your NOR configuration.\n"
"Trying to start u-boot now...\n");
}
printf("%s: Failed in falcon boot: %d, fallback to U-Boot",
__func__, err);
}
#endif