aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2020-05-06 08:02:39 -0400
committerTom Rini <trini@konsulko.com>2020-05-15 14:47:35 -0400
commitb48f72a86b3758e05227fa1fc607ea2c0c365f93 (patch)
tree4ed848a68fd0ee1e53d99a49408145720b9db018
parentb16a331697820d1f36ee8ccb793ae12eb501ad42 (diff)
downloadu-boot-b48f72a86b3758e05227fa1fc607ea2c0c365f93.zip
u-boot-b48f72a86b3758e05227fa1fc607ea2c0c365f93.tar.gz
u-boot-b48f72a86b3758e05227fa1fc607ea2c0c365f93.tar.bz2
arm: orion5x: finish moving SoC to mach-orion5x
The SPL linker script had been left in arch/$(ARCH)/cpu/$(CPU)/$(SOC); therefore move it to the already-established arch/$(ARCH)/mach-$(SOC) location. Signed-off-by: Trevor Woerner <twoerner@gmail.com>
-rw-r--r--arch/arm/mach-orion5x/u-boot-spl.lds (renamed from arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds)0
-rw-r--r--configs/edminiv2_defconfig2
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds b/arch/arm/mach-orion5x/u-boot-spl.lds
index a537fe0..a537fe0 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds
+++ b/arch/arm/mach-orion5x/u-boot-spl.lds
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index d06f83d..9a9d9c5 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_CPU_INIT=y
CONFIG_ARCH_ORION5X=y
-CONFIG_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/mach-orion5x/u-boot-spl.lds"
CONFIG_SYS_TEXT_BASE=0x00800000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y