diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-25 03:41:00 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-01 00:46:37 +0300 |
| commit | 148b8bb4b6bd9402d3e5b9173d8a2b65b587b81d (patch) | |
| tree | 586c9873afc1ca3e5fb98085ed4becc9f1455e34 /arch | |
| parent | 0c2729edadeaa1253397afcab1aef4687b7c64c9 (diff) | |
| download | u-boot-148b8bb4b6bd9402d3e5b9173d8a2b65b587b81d.tar.xz | |
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')
| -rw-r--r-- | arch/arm/config.mk | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 |
2 files changed, 6 insertions, 2 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 diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index c5923e333c..dd4f027f36 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -5,7 +5,9 @@ config HAS_CAAM bool config IMX_CONFIG - string + string "DCD script to use" + depends on MACH_IMX + default "arch/arm/mach-imx/spl_sd.cfg" config ROM_UNIFIED_SECTIONS bool |