| Message ID | 20240124090509.303787-1-devarsht@ti.com |
|---|---|
| State | Accepted |
| Commit | 54245af0ae30369170815bbc405c2f69f778bee1 |
| Delegated to: | Anatolij Gustschin |
| Headers | show |
| Series | [v2] common: splash_source: Don't compile ubifs splash cmd for SPL build | expand |
Hi Devarsh, On 24/01/24 14:35, Devarsh Thakkar wrote: > 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>
Hi Simon, Tom, On 24/01/24 17:26, Nikhil Jain wrote: > Hi Devarsh, > > On 24/01/24 14:35, Devarsh Thakkar wrote: >> 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> Sorry for the rush, but just wanted to check if it is possible to pull this in for current merge window for v2024.04 ? Regards Devarsh
On Wed, 24 Jan 2024 14:35:09 +0530, Devarsh Thakkar wrote: > 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" > > [...] Applied to u-boot/master, thanks!
diff --git a/common/splash_source.c b/common/splash_source.c index 7223a1aae7..2ce0768833 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -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;
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> --- V2: Drop repeat sentence in commit msg common/splash_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)