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_xip.c | |
| parent | 2ad74301a0a8542ff7672df2ab45d27e6286e0e2 (diff) | |
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_xip.c')
| -rw-r--r-- | common/spl/spl_xip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c index 8ce0a09ef3..ba4af38a3e 100644 --- a/common/spl/spl_xip.c +++ b/common/spl/spl_xip.c @@ -12,7 +12,7 @@ static int spl_xip(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (!spl_start_uboot()) { spl_image->arg = (void *)CONFIG_SYS_FDT_BASE; spl_image->name = "Linux"; |