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_usb.c | |
| parent | 2ad74301a0a8542ff7672df2ab45d27e6286e0e2 (diff) | |
| download | u-boot-7115007ccf161ac668e91e899c2f55c050bb93da.tar.gz u-boot-7115007ccf161ac668e91e899c2f55c050bb93da.tar.bz2 u-boot-7115007ccf161ac668e91e899c2f55c050bb93da.zip | |
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_usb.c')
| -rw-r--r-- | common/spl/spl_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 3648de3492..67d503026c 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -47,7 +47,7 @@ int spl_usb_load(struct spl_image_info *spl_image, debug("boot mode - FAT\n"); -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) if (spl_start_uboot() || spl_load_image_fat_os(spl_image, stor_dev, partition)) #endif |