]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
common: splash_source: Don't compile ubifs splash cmd for SPL build
authorDevarsh Thakkar <devarsht@ti.com>
Wed, 24 Jan 2024 09:05:09 +0000 (14:35 +0530)
committerTom Rini <trini@konsulko.com>
Mon, 29 Jan 2024 19:50:05 +0000 (14:50 -0500)
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:

"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")
Signed-off-by: Devarsh Thakkar <devarsht@ti.com>
Reviewed-by: Nikhil M Jain <n-jain1@ti.com>
common/splash_source.c

index 7223a1aae7882178931ac7e2a9e88e9f459fe954..2ce0768833d9d1f4058fa005728aa21b5b283c58 100644 (file)
@@ -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;