diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-30 23:03:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-05 11:23:29 -0400 |
| commit | 7115007ccf161ac668e91e899c2f55c050bb93da (patch) | |
| tree | a7f02e9b9263540673647fcee8b80e986cd76c21 /common/spl/spl_spi.c | |
| parent | 2ad74301a0a8542ff7672df2ab45d27e6286e0e2 (diff) | |
| download | u-boot-7115007ccf161ac668e91e899c2f55c050bb93da.zip u-boot-7115007ccf161ac668e91e899c2f55c050bb93da.tar.gz u-boot-7115007ccf161ac668e91e899c2f55c050bb93da.tar.bz2 | |
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>
Diffstat (limited to 'common/spl/spl_spi.c')
| -rw-r--r-- | common/spl/spl_spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 46ee405..4e20a23 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -18,7 +18,7 @@ #include <asm/global_data.h> #include <dm/ofnode.h> -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) /* * Load the kernel, check for a valid header we can parse, and if found load * the kernel and then device tree. @@ -107,7 +107,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, payload_offs); } -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) #endif { |