Skip to contentSkip to conversation

common: splash_source: Don't compile ubifs splash cmd for SPL build

PATCH Superseded Devarsh Thakkar 1 participant 1 message Jan 24, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common: splash_source: Don't compile ubifs splash cmd for SPL build

Don't compile ubifs splash mount command for SPL build as this command is not supported (and also not enabled) during SPL stage.

This fixes below compilation error, when CONFIG_CMD_UBIFS is enabled in defconfig along with splash screen enabled at SPL stage.

Fixes below error when CONFIG_CMD_UBIFS is enabled in defconfig along with splash screen at SPL stage:

"aarch64-none-linux-gnu-ld.bfd: common/cli.o: in function `run_command':
u-boot-next/u-boot/common/cli.c:51: undefined reference to parse_string_outer' u-boot-next/u-boot/common/cli.c:51:(.text.run_command+0x10): relocation truncated to fit: R_AARCH64_JUMP26 against undefined symbol parse_string_outer' make[2]: *** [u-boot-next/u-boot/scripts/Makefile.spl:527: spl/u-boot-spl] Error 1 make[1]: *** [u-boot-next/u-boot/Makefile:2053: spl/u-boot-spl] Error 2 make[1]: Leaving directory 'u-boot-next/u-boot/out/a53' make: *** [Makefile:177: sub-make] Error 2"

Fixes eb9217dc03 ("common: Enable splash functions at SPL")
---
 common/splash_source.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/splash_source.c +1 -1
index 7223a1aae7..2ce0768833 100644
@@ -216,7 +216,7 @@ static int splash_init_virtio(void)
 	}
 }
 
-#ifdef CONFIG_CMD_UBIFS
+#if defined(CONFIG_CMD_UBIFS) && !defined(CONFIG_SPL_BUILD)
 static int splash_mount_ubifs(struct splash_location *location)
 {
 	int res;
Signature · 1 line
2.34.1