summaryrefslogtreecommitdiff
path: root/arch/arm/config.mk
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-24 20:41:00 -0400
committerTom Rini <trini@konsulko.com>2021-08-31 17:46:37 -0400
commit148b8bb4b6bd9402d3e5b9173d8a2b65b587b81d (patch)
tree586c9873afc1ca3e5fb98085ed4becc9f1455e34 /arch/arm/config.mk
parent0c2729edadeaa1253397afcab1aef4687b7c64c9 (diff)
imx: Finish migration of IMX_CONFIG to Kconfig
- Provide a default Kconfig value of the default script - Largely continue to define this via the board Kconfig file - For the boards that select a script based on defconfig rather than TARGET, keep this within the defconfig. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/config.mk')
-rw-r--r--arch/arm/config.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 16c63e1266..b684d8b416 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -158,7 +158,8 @@ ifdef CONFIG_EFI_LOADER
OBJCOPYFLAGS += -j .efi_runtime -j .efi_runtime_rel
endif
-ifneq ($(CONFIG_IMX_CONFIG),)
+ifdef CONFIG_MACH_IMX
+ifneq ($(CONFIG_IMX_CONFIG),"")
ifdef CONFIG_SPL
ifndef CONFIG_SPL_BUILD
INPUTS-y += SPL
@@ -174,6 +175,7 @@ ifneq ($(CONFIG_VF610),)
INPUTS-y += u-boot.vyb
endif
endif
+endif
EFI_LDS := elf_arm_efi.lds
EFI_CRT0 := crt0_arm_efi.o