From patchwork Wed May 6 12:02:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 245187 List-Id: U-Boot discussion From: twoerner at gmail.com (Trevor Woerner) Date: Wed, 6 May 2020 08:02:39 -0400 Subject: [PATCH v4 4/8] arm: orion5x: finish moving SoC to mach-orion5x In-Reply-To: <20200506120243.38876-1-twoerner@gmail.com> References: <20200506120243.38876-1-twoerner@gmail.com> Message-ID: <20200506120243.38876-5-twoerner@gmail.com> 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 --- Changes in v4: None Changes in v3: None Changes in v2: - Update patch to work on latest master; the location where the SPL linker script is specified has changed. arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/u-boot-spl.lds | 0 configs/edminiv2_defconfig | 2 +- 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/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 diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index d06f83db04..9a9d9c58d7 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