diff options
| author | Tom Rini <[email protected]> | 2023-05-11 13:02:03 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-05-11 13:02:03 -0400 |
| commit | eaa9efafffaf87e3414db5d21face5e2dad105e4 (patch) | |
| tree | 4b6fc541bf21bcd0dc2afa9b832963393e2bf22b /arch | |
| parent | 11910550b65e6072b9542d462c0aa93f4ca81836 (diff) | |
| parent | 1781ec67f43ae6fcaec628831b09a587f5cab174 (diff) | |
Merge branch '2023-05-11-CONFIG_IS_ENABLED-vs-IS_ENABLED-cleanups' into next
- Bring in some of the clean-ups to use IS_ENABLED rather than
CONFIG_IS_ENABLED to make the code less error-prone.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/qemu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 906f538259a..00d6ad85c56 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -54,7 +54,7 @@ obj-$(CONFIG_IMX_RDC) += rdc-sema.o ifneq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_IMX_BOOTAUX) += imx_bootaux.o endif -obj-$(CONFIG_SATA) += sata.o +obj-$(CONFIG_$(SPL_)SATA) += sata.o obj-$(CONFIG_IMX_HAB) += hab.o obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o endif diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index e54082df7f9..274978c023b 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -97,7 +97,7 @@ static void qemu_chipset_init(void) } } -#if !CONFIG_IS_ENABLED(SPL_X86_32BIT_INIT) +#if CONFIG_IS_ENABLED(X86_32BIT_INIT) int arch_cpu_init(void) { post_code(POST_CPU_INIT); |