[U-Boot] [RFC PATCH 10/21] ARM: orion5x: move SoC sources to mach-orion5x

[Masahiro Yamada]

Move
arch/arm/cpu/arm926ejs/orion5x/* -> arch/arm/mach-orion5x/*

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot at aribaud.net>
---

 arch/arm/Kconfig                                                 | 2 +-
 arch/arm/Makefile                                                | 2 ++
 arch/arm/cpu/arm926ejs/Makefile                                  | 1 -
 arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/Kconfig         | 0
 arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/Makefile        | 0
 arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/cpu.c           | 0
 arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/dram.c          | 0
 arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/lowlevel_init.S | 0
 arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/timer.c         | 0
 9 files changed, 3 insertions(+), 2 deletions(-)
 rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/Kconfig (100%)
 rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/Makefile (100%)
 rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/cpu.c (100%)
 rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/dram.c (100%)
 rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/lowlevel_init.S (100%)
 rename arch/arm/{cpu/arm926ejs/orion5x => mach-orion5x}/timer.c (100%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index de56ddf..ffd6f66 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -704,7 +704,7 @@ source "arch/arm/cpu/armv7/omap4/Kconfig"
 
 source "arch/arm/cpu/armv7/omap5/Kconfig"
 
-source "arch/arm/cpu/arm926ejs/orion5x/Kconfig"
+source "arch/arm/mach-orion5x/Kconfig"
 
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 7592e20..a707f02 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -11,6 +11,8 @@ machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank
 machine-$(CONFIG_KIRKWOOD)		+= kirkwood
 # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
 machine-$(CONFIG_ARCH_NOMADIK)		+= nomadik
+# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
+machine-$(CONFIG_ORION5X)		+= orion5x
 machine-$(CONFIG_TEGRA)			+= tegra
 machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
 
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index ed0cf0f..3cb741d 100644
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_MB86R0x) += mb86r0x/
 obj-$(CONFIG_MX25) += mx25/
 obj-$(CONFIG_MX27) += mx27/
 obj-$(if $(filter mxs,$(SOC)),y) += mxs/
-obj-$(CONFIG_ORION5X) += orion5x/
 obj-$(CONFIG_PANTHEON) += pantheon/
 obj-$(if $(filter spear,$(SOC)),y) += spear/
 obj-$(CONFIG_ARCH_VERSATILE) += versatile/
diff --git a/arch/arm/cpu/arm926ejs/orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
similarity index 100%
rename from arch/arm/cpu/arm926ejs/orion5x/Kconfig
rename to arch/arm/mach-orion5x/Kconfig
diff --git a/arch/arm/cpu/arm926ejs/orion5x/Makefile b/arch/arm/mach-orion5x/Makefile
similarity index 100%
rename from arch/arm/cpu/arm926ejs/orion5x/Makefile
rename to arch/arm/mach-orion5x/Makefile
diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/orion5x/cpu.c
rename to arch/arm/mach-orion5x/cpu.c
diff --git a/arch/arm/cpu/arm926ejs/orion5x/dram.c b/arch/arm/mach-orion5x/dram.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/orion5x/dram.c
rename to arch/arm/mach-orion5x/dram.c
diff --git a/arch/arm/cpu/arm926ejs/orion5x/lowlevel_init.S b/arch/arm/mach-orion5x/lowlevel_init.S
similarity index 100%
rename from arch/arm/cpu/arm926ejs/orion5x/lowlevel_init.S
rename to arch/arm/mach-orion5x/lowlevel_init.S
diff --git a/arch/arm/cpu/arm926ejs/orion5x/timer.c b/arch/arm/mach-orion5x/timer.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/orion5x/timer.c
rename to arch/arm/mach-orion5x/timer.c
-- 
1.9.1