From cdb078e7353f92ed524602f2712827a0efe858fe Mon Sep 17 00:00:00 2001 From: Devarsh Thakkar Date: Tue, 19 Mar 2024 17:10:59 +0530 Subject: HACK: common: board_f: Don't treat bloblist failure as hard error Don't propagate error on bloblist failure as it is possible that splash logo file may not have been present in expected location since common defconfig is being used for other bootmodes too. Signed-off-by: Devarsh Thakkar --- common/board_f.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index aaf64ed9d8..7f5af1ed15 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -416,8 +416,10 @@ static int reserve_video(void) struct video_handoff *ho; ho = bloblist_find(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho)); - if (!ho) - return log_msg_ret("blf", -ENOENT); + if (!ho) { + printf("no bloblist found!"); + return 0; + } video_reserve_from_bloblist(ho); gd->relocaddr = ho->fb; } else if (CONFIG_IS_ENABLED(VIDEO)) { -- cgit v1.2.3 From f9b966c674731a1a29a20a8e143c61d4e046f13c Mon Sep 17 00:00:00 2001 From: Mattijs Korpershoek Date: Tue, 19 Mar 2024 09:16:22 +0100 Subject: configs: am62x_android_a53.config: Disable splashscreen When booting Android from eMMC, loading the splashscreen file fails: U-Boot SPL 2023.04 (Mar 18 2024 - 13:00:32 +0000) SYSFW ABI: 3.1 (firmware rev 0x0009 '9.2.5--v09.02.05 (Kool Koala)') SPL initial stack usage: 1856 bytes MMC: no card present ** Bad device specification mmc 1 ** Couldn't find partition mmc 1:1 Error: could not access storage. Trying to boot from DFU Authentication passed Authentication passed Since commit b66b203247a2 ("video: Fill video handoff in video post probe"), U-Boot proper crashes because of this: U-Boot 2023.04 (Mar 18 2024 - 13:00:32 +0000) SoC: AM62X SR1.0 HS-FS Model: Texas Instruments AM625 SK EEPROM not available at 80, trying to read at 81 Board: AM62B-SKEVM-P1 rev A DRAM: initcall sequence 00000000808ada08 failed at call 000000008082740c (err=-2) ### ERROR ### Please RESET the board ### Disable splashcreen for Android to fix the crash. Signed-off-by: Mattijs Korpershoek Reviewed-by: Devarsh Thakkar --- configs/am62x_android_a53.config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/am62x_android_a53.config b/configs/am62x_android_a53.config index 1c1406128a..a18e05f15a 100644 --- a/configs/am62x_android_a53.config +++ b/configs/am62x_android_a53.config @@ -25,3 +25,8 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_NOWHERE=n CONFIG_SYS_MMC_ENV_PART=1 CONFIG_SPL_ENV_IS_NOWHERE=y +# Disable splashscreen +CONFIG_SPL_VIDEO=n +CONFIG_VIDEO=n +CONFIG_SPL_BMP=n +CONFIG_BMP=n -- cgit v1.2.3