[PATCHv2 3/8] edminiv2: Move CONFIG_SPL_LDSCRIPT to defconfig

Tom Rini
2020-03-11T22:11:13Z

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>
---
arch/arm/mach-orion5x/Kconfig | 3 ---
configs/edminiv2_defconfig | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 2984a3edda21..7644b8dc854b 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 2bbd6a783b94..b9a68a9263aa 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
--
2.17.1