]> git.dujemihanovic.xyz Git - u-boot.git/commit
spl: Make use of CONFIG_IS_ENABLED(OS_BOOT) in SPL/TPL common code paths
authorTom Rini <trini@konsulko.com>
Sun, 31 Oct 2021 03:03:48 +0000 (23:03 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 5 Nov 2021 15:23:29 +0000 (11:23 -0400)
commit7115007ccf161ac668e91e899c2f55c050bb93da
treea7f02e9b9263540673647fcee8b80e986cd76c21
parent2ad74301a0a8542ff7672df2ab45d27e6286e0e2
spl: Make use of CONFIG_IS_ENABLED(OS_BOOT) in SPL/TPL common code paths

When building a system that has both TPL and SPL_OS_BOOT, code which
tests for CONFIG_SPL_OS_BOOT will be built and enabled in TPL, which is
not correct.  While there is no CONFIG_TPL_OS_BOOT symbol at this time
(and likely will not ever be) we can use CONFIG_IS_ENABLED(OS_BOOT) in
these common paths to ensure we only compile these parts in the SPL
case.

Signed-off-by: Tom Rini <trini@konsulko.com>
12 files changed:
arch/arm/lib/spl.c
common/spl/spl.c
common/spl/spl_ext.c
common/spl/spl_fat.c
common/spl/spl_mmc.c
common/spl/spl_nand.c
common/spl/spl_nor.c
common/spl/spl_sata.c
common/spl/spl_spi.c
common/spl/spl_ubi.c
common/spl/spl_usb.c
common/spl/spl_xip.c