[PATCH 4/5] arm: orion5x: finish moving SoC to mach-orion5x

Trevor Woerner
2020-04-06T05:58:58Z

The SPL linker script had been left in arch/$(ARCH)/cpu/$(CPU)/$(SOC) so move
it to the already-established arch/$(ARCH)/mach-$(SOC) location.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
arch/arm/mach-orion5x/Kconfig | 2 +-
arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/u-boot-spl.lds | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/u-boot-spl.lds (100%)

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 23c13e22f5..5980e095ce 100644
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -16,6 +16,6 @@ config SYS_SOC
source "board/LaCie/edminiv2/Kconfig"

config SPL_LDSCRIPT
- default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ARCH_ORION5X
+ default "arch/arm/mach-orion5x/u-boot-spl.lds"

endif
diff --git a/arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds b/arch/arm/mach-orion5x/u-boot-spl.lds
similarity index 100%
rename from arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds
rename to arch/arm/mach-orion5x/u-boot-spl.lds
--
2.25.0.114.g5b0ca878e0