diff options
author | Tom Rini <trini@konsulko.com> | 2020-03-11 18:11:13 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-03-16 18:54:18 -0400 |
commit | 38fec8de5f4bf04f0824fda99ac482c0e64157c4 (patch) | |
tree | d4cc82c818cc8aa16b7ea05a2815c09228420849 | |
parent | 23830e98f5ad74343fc6c6182cd8d99507ab4e36 (diff) |
edminiv2: Move CONFIG_SPL_LDSCRIPT to defconfig
As there is only one machine under mach-orion5x, having a Kconfig entry
for SPL_LDSCRIPT is not helpful, move this to the defconfig file.
Suggested-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
-rw-r--r-- | arch/arm/mach-orion5x/Kconfig | 3 | ||||
-rw-r--r-- | configs/edminiv2_defconfig | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index 2984a3edda..7644b8dc85 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig @@ -15,7 +15,4 @@ config SYS_SOC source "board/LaCie/edminiv2/Kconfig" -config SPL_LDSCRIPT - default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X - endif diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index 2bbd6a783b..b9a68a9263 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ORION5X=y +CONFIG_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds" CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y |