smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: Update boot_prep_linux() to return an error

Browse Source 
Rather than panicing, return the error so that the top-level bootm logic
can decide what to do.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-09-22 06:22:12 -06:00
parent 829f6a3e0a
commit 07bc1efe0a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/lib/bootm.c
View File

@@ -164,14 +164,15 @@ static void do_nonsec_virt_switch(void)
__weak void board_prep_linux(struct bootm_headers *images) { }
/* Subcommand: PREP */
static void boot_prep_linux(struct bootm_headers *images)
static int boot_prep_linux(struct bootm_headers *images)
{
char *commandline = env_get("bootargs");
if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
debug("using: FDT\n");
if (image_setup_linux(images)) {
panic("FDT creation failed!");
log_err("FDT creation failed!");
return -EINVAL;
}
} else if (BOOTM_ENABLE_TAGS) {
debug("using: ATAGS\n");
@@ -207,6 +208,8 @@ static void boot_prep_linux(struct bootm_headers *images)
}
board_prep_linux(images);
return 0;
}
__weak bool armv7_boot_nonsec_default(void)
@@ -345,6 +348,7 @@ static void boot_jump_linux(struct bootm_headers *images, int flag)
int do_bootm_linux(int flag, struct bootm_info *bmi)
{
struct bootm_headers *images = bmi->images;
int ret;
log_debug("boot linux flag %x\n", flag);
/* No need for those on ARM */
@@ -353,7 +357,9 @@ int do_bootm_linux(int flag, struct bootm_info *bmi)
if (flag & BOOTM_STATE_OS_PREP) {
log_debug("Preparing to boot Linux\n");
boot_prep_linux(images);
ret = boot_prep_linux(images);
if (ret)
return ret;
return 0;
}
@@ -364,7 +370,9 @@ int do_bootm_linux(int flag, struct bootm_info *bmi)
}
log_debug("No flags set: continuing to prepare and jump to Linux\n");
boot_prep_linux(images);
ret = boot_prep_linux(images);
if (ret)
return ret;
boot_jump_linux(images, flag);
return 0;
}