From 620118403e1521b4c883848a84d2fb68e3fa1aa0 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Fri, 20 Feb 2015 17:04:03 +0900
Subject: [PATCH] ARM: at91: collect SoC sources into mach-at91
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
This commit moves source files as follows:
arch/arm/cpu/arm920t/at91/* -> arch/arm/mach-at91/arm920t/*
arch/arm/cpu/arm926ejs/at91/* -> arch/arm/mach-at91/arm926ejs/*
arch/arm/cpu/armv7/at91/* -> arch/arm/mach-at91/armv7/*
arch/arm/cpu/at91-common/* -> arch/arm/mach-at91/*
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Andreas BieÃmann <andreas.devel@googlemail.co>
---
MAINTAINERS | 3 +--
arch/arm/Makefile | 1 +
arch/arm/cpu/Makefile | 1 -
arch/arm/cpu/arm920t/Makefile | 1 -
arch/arm/cpu/arm926ejs/Makefile | 1 -
arch/arm/cpu/arm926ejs/at91/config.mk | 2 --
arch/arm/cpu/armv7/Makefile | 1 -
arch/arm/cpu/armv7/at91/config.mk | 8 --------
arch/arm/{cpu/at91-common => mach-at91}/Makefile | 14 ++++----------
.../arm920t/at91 => mach-at91/arm920t}/Makefile | 0
.../arm920t}/at91rm9200_devices.c | 0
.../arm920t/at91 => mach-at91/arm920t}/clock.c | 0
.../{cpu/arm920t/at91 => mach-at91/arm920t}/cpu.c | 0
.../at91 => mach-at91/arm920t}/lowlevel_init.S | 0
.../arm920t/at91 => mach-at91/arm920t}/reset.c | 0
.../arm920t/at91 => mach-at91/arm920t}/timer.c | 0
.../at91 => mach-at91/arm926ejs}/Makefile | 0
.../arm926ejs}/at91sam9260_devices.c | 0
.../arm926ejs}/at91sam9261_devices.c | 0
.../arm926ejs}/at91sam9263_devices.c | 0
.../arm926ejs}/at91sam9m10g45_devices.c | 0
.../arm926ejs}/at91sam9n12_devices.c | 0
.../arm926ejs}/at91sam9rl_devices.c | 0
.../arm926ejs}/at91sam9x5_devices.c | 0
.../arm926ejs/at91 => mach-at91/arm926ejs}/clock.c | 0
.../arm926ejs/at91 => mach-at91/arm926ejs}/cpu.c | 0
.../at91 => mach-at91/arm926ejs}/eflash.c | 0
.../arm926ejs/at91 => mach-at91/arm926ejs}/led.c | 0
.../at91 => mach-at91/arm926ejs}/lowlevel_init.S | 0
.../arm926ejs/at91 => mach-at91/arm926ejs}/reset.c | 0
.../arm926ejs/at91 => mach-at91/arm926ejs}/timer.c | 0
.../{cpu/armv7/at91 => mach-at91/armv7}/Makefile | 0
.../{cpu/armv7/at91 => mach-at91/armv7}/clock.c | 0
arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/cpu.c | 0
.../{cpu/armv7/at91 => mach-at91/armv7}/reset.c | 0
.../at91 => mach-at91/armv7}/sama5d3_devices.c | 0
.../at91 => mach-at91/armv7}/sama5d4_devices.c | 0
.../{cpu/armv7/at91 => mach-at91/armv7}/timer.c | 0
arch/arm/mach-at91/config.mk | 9 +++++++++
arch/arm/{cpu/at91-common => mach-at91}/mpddrc.c | 0
arch/arm/{cpu/at91-common => mach-at91}/phy.c | 0
arch/arm/{cpu/at91-common => mach-at91}/sdram.c | 0
arch/arm/{cpu/at91-common => mach-at91}/spl.c | 0
arch/arm/{cpu/at91-common => mach-at91}/spl_at91.c | 0
.../arm/{cpu/at91-common => mach-at91}/spl_atmel.c | 0
.../{cpu/at91-common => mach-at91}/u-boot-spl.lds | 0
include/configs/sama5d3_xplained.h | 2 +-
include/configs/sama5d3xek.h | 2 +-
48 files changed, 17 insertions(+), 28 deletions(-)
delete mode 100644 arch/arm/cpu/arm926ejs/at91/config.mk
delete mode 100644 arch/arm/cpu/armv7/at91/config.mk
rename arch/arm/{cpu/at91-common => mach-at91}/Makefile (58%)
rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/Makefile (100%)
rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/at91rm9200_devices.c (100%)
rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/clock.c (100%)
rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/cpu.c (100%)
rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/lowlevel_init.S (100%)
rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/reset.c (100%)
rename arch/arm/{cpu/arm920t/at91 => mach-at91/arm920t}/timer.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/Makefile (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9260_devices.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9261_devices.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9263_devices.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9m10g45_devices.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9n12_devices.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9rl_devices.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/at91sam9x5_devices.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/clock.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/cpu.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/eflash.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/led.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/lowlevel_init.S (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/reset.c (100%)
rename arch/arm/{cpu/arm926ejs/at91 => mach-at91/arm926ejs}/timer.c (100%)
rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/Makefile (100%)
rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/clock.c (100%)
rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/cpu.c (100%)
rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/reset.c (100%)
rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/sama5d3_devices.c (100%)
rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/sama5d4_devices.c (100%)
rename arch/arm/{cpu/armv7/at91 => mach-at91/armv7}/timer.c (100%)
create mode 100644 arch/arm/mach-at91/config.mk
rename arch/arm/{cpu/at91-common => mach-at91}/mpddrc.c (100%)
rename arch/arm/{cpu/at91-common => mach-at91}/phy.c (100%)
rename arch/arm/{cpu/at91-common => mach-at91}/sdram.c (100%)
rename arch/arm/{cpu/at91-common => mach-at91}/spl.c (100%)
rename arch/arm/{cpu/at91-common => mach-at91}/spl_at91.c (100%)
rename arch/arm/{cpu/at91-common => mach-at91}/spl_atmel.c (100%)
rename arch/arm/{cpu/at91-common => mach-at91}/u-boot-spl.lds (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 74a56ecf4f..a558bd4fcb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -76,8 +76,7 @@ ARM ATMEL AT91
M: Andreas BieÃmann <andreas.devel@googlemail.com>
S: Maintained
T: git git://git.denx.de/u-boot-atmel.git
-F: arch/arm/cpu/armv7/at91/
-F: arch/arm/cpu/at91-common/
+F: arch/arm/mach-at91/
F: arch/arm/include/asm/arch-at91/
ARM FREESCALE IMX
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5da2c231e9..f4e9af6598 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -4,6 +4,7 @@
# Machine directory name. This list is sorted alphanumerically
# by CONFIG_* macro name.
+machine-$(CONFIG_ARCH_AT91) += at91
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile
index 35d8d387bd..ba4f3900f7 100644
--- a/arch/arm/cpu/Makefile
+++ b/arch/arm/cpu/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_AT91FAMILY) += at91-common/
obj-$(CONFIG_TEGRA20) += tegra20-common/
obj-$(CONFIG_TEGRA30) += tegra30-common/
obj-$(CONFIG_TEGRA114) += tegra114-common/
diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile
index a72e5de99e..a16838b479 100644
--- a/arch/arm/cpu/arm920t/Makefile
+++ b/arch/arm/cpu/arm920t/Makefile
@@ -11,7 +11,6 @@ obj-y += cpu.o
obj-$(CONFIG_USE_IRQ) += interrupts.o
obj-$(if $(filter a320,$(SOC)),y) += a320/
-obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(CONFIG_EP93XX) += ep93xx/
obj-$(CONFIG_IMX) += imx/
obj-$(CONFIG_KS8695) += ks8695/
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index adcea9f683..f41357aaeb 100644
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -15,7 +15,6 @@ endif
endif
obj-$(CONFIG_ARMADA100) += armada100/
-obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(CONFIG_ARCH_DAVINCI) += davinci/
obj-$(CONFIG_KIRKWOOD) += kirkwood/
obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
diff --git a/arch/arm/cpu/arm926ejs/at91/config.mk b/arch/arm/cpu/arm926ejs/at91/config.mk
deleted file mode 100644
index 370630d4de..0000000000
--- a/arch/arm/cpu/arm926ejs/at91/config.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-PF_CPPFLAGS_TUNE := $(call cc-option,-mtune=arm926ejs,)
-PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_TUNE)
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index 409e6f5651..6dbca26ceb 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -40,7 +40,6 @@ endif
obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/
-obj-$(CONFIG_AT91FAMILY) += at91/
obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
diff --git a/arch/arm/cpu/armv7/at91/config.mk b/arch/arm/cpu/armv7/at91/config.mk
deleted file mode 100644
index db6030880f..0000000000
--- a/arch/arm/cpu/armv7/at91/config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (C) 2014, Andreas BieÃmann <andreas.devel@googlemail.com>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-ifndef CONFIG_SPL_BUILD
-ALL-y += u-boot.img
-endif
diff --git a/arch/arm/cpu/at91-common/Makefile b/arch/arm/mach-at91/Makefile
similarity index 58%
rename from arch/arm/cpu/at91-common/Makefile
rename to arch/arm/mach-at91/Makefile
index 03614d4140..e596ba6ce8 100644
--- a/arch/arm/cpu/at91-common/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -1,13 +1,3 @@
-#
-# (C) Copyright 2000-2008
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2013 Atmel Corporation
-# Bo Shen <voice.shen@atmel.com>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
obj-$(CONFIG_AT91_WANTS_COMMON_PHY) += phy.o
ifneq ($(CONFIG_SPL_BUILD),)
obj-$(CONFIG_AT91SAM9G20) += sdram.o spl_at91.o
@@ -16,3 +6,7 @@ obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o
obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o
obj-y += spl.o
endif
+
+obj-$(CONFIG_CPU_ARM920T) += arm920t/
+obj-$(CONFIG_CPU_ARM926EJS) += arm926ejs/
+obj-$(CONFIG_CPU_V7) += armv7/
diff --git a/arch/arm/cpu/arm920t/at91/Makefile b/arch/arm/mach-at91/arm920t/Makefile
similarity index 100%
rename from arch/arm/cpu/arm920t/at91/Makefile
rename to arch/arm/mach-at91/arm920t/Makefile
diff --git a/arch/arm/cpu/arm920t/at91/at91rm9200_devices.c b/arch/arm/mach-at91/arm920t/at91rm9200_devices.c
similarity index 100%
rename from arch/arm/cpu/arm920t/at91/at91rm9200_devices.c
rename to arch/arm/mach-at91/arm920t/at91rm9200_devices.c
diff --git a/arch/arm/cpu/arm920t/at91/clock.c b/arch/arm/mach-at91/arm920t/clock.c
similarity index 100%
rename from arch/arm/cpu/arm920t/at91/clock.c
rename to arch/arm/mach-at91/arm920t/clock.c
diff --git a/arch/arm/cpu/arm920t/at91/cpu.c b/arch/arm/mach-at91/arm920t/cpu.c
similarity index 100%
rename from arch/arm/cpu/arm920t/at91/cpu.c
rename to arch/arm/mach-at91/arm920t/cpu.c
diff --git a/arch/arm/cpu/arm920t/at91/lowlevel_init.S b/arch/arm/mach-at91/arm920t/lowlevel_init.S
similarity index 100%
rename from arch/arm/cpu/arm920t/at91/lowlevel_init.S
rename to arch/arm/mach-at91/arm920t/lowlevel_init.S
diff --git a/arch/arm/cpu/arm920t/at91/reset.c b/arch/arm/mach-at91/arm920t/reset.c
similarity index 100%
rename from arch/arm/cpu/arm920t/at91/reset.c
rename to arch/arm/mach-at91/arm920t/reset.c
diff --git a/arch/arm/cpu/arm920t/at91/timer.c b/arch/arm/mach-at91/arm920t/timer.c
similarity index 100%
rename from arch/arm/cpu/arm920t/at91/timer.c
rename to arch/arm/mach-at91/arm920t/timer.c
diff --git a/arch/arm/cpu/arm926ejs/at91/Makefile b/arch/arm/mach-at91/arm926ejs/Makefile
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/Makefile
rename to arch/arm/mach-at91/arm926ejs/Makefile
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
rename to arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/at91sam9261_devices.c
rename to arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c
rename to arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c
rename to arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c
rename to arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/at91sam9rl_devices.c
rename to arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
rename to arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c
diff --git a/arch/arm/cpu/arm926ejs/at91/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/clock.c
rename to arch/arm/mach-at91/arm926ejs/clock.c
diff --git a/arch/arm/cpu/arm926ejs/at91/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/cpu.c
rename to arch/arm/mach-at91/arm926ejs/cpu.c
diff --git a/arch/arm/cpu/arm926ejs/at91/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/eflash.c
rename to arch/arm/mach-at91/arm926ejs/eflash.c
diff --git a/arch/arm/cpu/arm926ejs/at91/led.c b/arch/arm/mach-at91/arm926ejs/led.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/led.c
rename to arch/arm/mach-at91/arm926ejs/led.c
diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/mach-at91/arm926ejs/lowlevel_init.S
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
rename to arch/arm/mach-at91/arm926ejs/lowlevel_init.S
diff --git a/arch/arm/cpu/arm926ejs/at91/reset.c b/arch/arm/mach-at91/arm926ejs/reset.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/reset.c
rename to arch/arm/mach-at91/arm926ejs/reset.c
diff --git a/arch/arm/cpu/arm926ejs/at91/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/at91/timer.c
rename to arch/arm/mach-at91/arm926ejs/timer.c
diff --git a/arch/arm/cpu/armv7/at91/Makefile b/arch/arm/mach-at91/armv7/Makefile
similarity index 100%
rename from arch/arm/cpu/armv7/at91/Makefile
rename to arch/arm/mach-at91/armv7/Makefile
diff --git a/arch/arm/cpu/armv7/at91/clock.c b/arch/arm/mach-at91/armv7/clock.c
similarity index 100%
rename from arch/arm/cpu/armv7/at91/clock.c
rename to arch/arm/mach-at91/armv7/clock.c
diff --git a/arch/arm/cpu/armv7/at91/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
similarity index 100%
rename from arch/arm/cpu/armv7/at91/cpu.c
rename to arch/arm/mach-at91/armv7/cpu.c
diff --git a/arch/arm/cpu/armv7/at91/reset.c b/arch/arm/mach-at91/armv7/reset.c
similarity index 100%
rename from arch/arm/cpu/armv7/at91/reset.c
rename to arch/arm/mach-at91/armv7/reset.c
diff --git a/arch/arm/cpu/armv7/at91/sama5d3_devices.c b/arch/arm/mach-at91/armv7/sama5d3_devices.c
similarity index 100%
rename from arch/arm/cpu/armv7/at91/sama5d3_devices.c
rename to arch/arm/mach-at91/armv7/sama5d3_devices.c
diff --git a/arch/arm/cpu/armv7/at91/sama5d4_devices.c b/arch/arm/mach-at91/armv7/sama5d4_devices.c
similarity index 100%
rename from arch/arm/cpu/armv7/at91/sama5d4_devices.c
rename to arch/arm/mach-at91/armv7/sama5d4_devices.c
diff --git a/arch/arm/cpu/armv7/at91/timer.c b/arch/arm/mach-at91/armv7/timer.c
similarity index 100%
rename from arch/arm/cpu/armv7/at91/timer.c
rename to arch/arm/mach-at91/armv7/timer.c
diff --git a/arch/arm/mach-at91/config.mk b/arch/arm/mach-at91/config.mk
new file mode 100644
index 0000000000..7168abbd58
--- /dev/null
+++ b/arch/arm/mach-at91/config.mk
@@ -0,0 +1,9 @@
+ifeq ($(CONFIG_CPU_ARM926EJS),y)
+PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,)
+endif
+
+ifeq ($(CONFIG_CPU_V7),y)
+ifndef CONFIG_SPL_BUILD
+ALL-y += u-boot.img
+endif
+endif
diff --git a/arch/arm/cpu/at91-common/mpddrc.c b/arch/arm/mach-at91/mpddrc.c
similarity index 100%
rename from arch/arm/cpu/at91-common/mpddrc.c
rename to arch/arm/mach-at91/mpddrc.c
diff --git a/arch/arm/cpu/at91-common/phy.c b/arch/arm/mach-at91/phy.c
similarity index 100%
rename from arch/arm/cpu/at91-common/phy.c
rename to arch/arm/mach-at91/phy.c
diff --git a/arch/arm/cpu/at91-common/sdram.c b/arch/arm/mach-at91/sdram.c
similarity index 100%
rename from arch/arm/cpu/at91-common/sdram.c
rename to arch/arm/mach-at91/sdram.c
diff --git a/arch/arm/cpu/at91-common/spl.c b/arch/arm/mach-at91/spl.c
similarity index 100%
rename from arch/arm/cpu/at91-common/spl.c
rename to arch/arm/mach-at91/spl.c
diff --git a/arch/arm/cpu/at91-common/spl_at91.c b/arch/arm/mach-at91/spl_at91.c
similarity index 100%
rename from arch/arm/cpu/at91-common/spl_at91.c
rename to arch/arm/mach-at91/spl_at91.c
diff --git a/arch/arm/cpu/at91-common/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
similarity index 100%
rename from arch/arm/cpu/at91-common/spl_atmel.c
rename to arch/arm/mach-at91/spl_atmel.c
diff --git a/arch/arm/cpu/at91-common/u-boot-spl.lds b/arch/arm/mach-at91/u-boot-spl.lds
similarity index 100%
rename from arch/arm/cpu/at91-common/u-boot-spl.lds
rename to arch/arm/mach-at91/u-boot-spl.lds
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 5a0ab284ab..5dab61d56d 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -227,7 +227,7 @@
#define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_MMC
-#define CONFIG_SPL_LDSCRIPT arch/arm/cpu/at91-common/u-boot-spl.lds
+#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/u-boot-spl.lds
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index cccc1edbb8..bd288beaeb 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -274,7 +274,7 @@
#define CONFIG_SYS_MONITOR_LEN (512 << 10)
#ifdef CONFIG_SYS_USE_MMC
-#define CONFIG_SPL_LDSCRIPT arch/arm/cpu/at91-common/u-boot-spl.lds
+#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/u-boot-spl.lds
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x400
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x200
--
2.39.5