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 /arch/arm/lib/spl.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 'arch/arm/lib/spl.c')
| -rw-r--r-- | arch/arm/lib/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index 4f9b84ba34..b13897495d 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -50,7 +50,7 @@ void __weak board_init_f(ulong dummy) * This function jumps to an image with argument. Normally an FDT or ATAGS * image. */ -#ifdef CONFIG_SPL_OS_BOOT +#if CONFIG_IS_ENABLED(OS_BOOT) #ifdef CONFIG_ARM64 void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) { |