summaryrefslogtreecommitdiff
path: root/common/spl/spl_fat.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-10-31 06:03:48 +0300
committerTom Rini <trini@konsulko.com>2021-11-05 18:23:29 +0300
commit7115007ccf161ac668e91e899c2f55c050bb93da (patch)
treea7f02e9b9263540673647fcee8b80e986cd76c21 /common/spl/spl_fat.c
parent2ad74301a0a8542ff7672df2ab45d27e6286e0e2 (diff)
downloadu-boot-7115007ccf161ac668e91e899c2f55c050bb93da.tar.xz
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_fat.c')
-rw-r--r--common/spl/spl_fat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index c2eb097365..576c2e876a 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -112,7 +112,7 @@ end:
return (err <= 0);
}
-#ifdef CONFIG_SPL_OS_BOOT
+#if CONFIG_IS_ENABLED(OS_BOOT)
int spl_load_image_fat_os(struct spl_image_info *spl_image,
struct blk_desc *block_dev, int partition)
{