[U-Boot] [RFC PATCH v2 07/19] ARM: nomadik: move SoC sources to mach-nomadik

[Masahiro Yamada]

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

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
Cc: Nomadik Linux Team <STN_WMM_nomadik_linux at list.st.com>
Cc: Alessandro Rubini <rubini at unipv.it>
---

 arch/arm/Kconfig                                          | 2 +-
 arch/arm/Makefile                                         | 1 +
 arch/arm/cpu/arm926ejs/Makefile                           | 1 -
 arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/Kconfig  | 0
 arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/Makefile | 0
 arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/gpio.c   | 0
 arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/reset.S  | 0
 arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/timer.c  | 0
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/Kconfig (100%)
 rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/Makefile (100%)
 rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/gpio.c (100%)
 rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/reset.S (100%)
 rename arch/arm/{cpu/arm926ejs/nomadik => mach-nomadik}/timer.c (100%)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dba6518..1bac511 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -728,7 +728,7 @@ source "arch/arm/cpu/armv7/keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
-source "arch/arm/cpu/arm926ejs/nomadik/Kconfig"
+source "arch/arm/mach-nomadik/Kconfig"
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e09de51..32d039c 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -9,6 +9,7 @@ machine-$(CONFIG_ARCH_DAVINCI)		+= davinci
 # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
 machine-$(CONFIG_KIRKWOOD)		+= kirkwood
 # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
+machine-$(CONFIG_ARCH_NOMADIK)		+= nomadik
 machine-$(CONFIG_TEGRA)			+= tegra
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index 0b43a90..ed0cf0f 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_ARCH_NOMADIK) += nomadik/
 obj-$(CONFIG_ORION5X) += orion5x/
 obj-$(CONFIG_PANTHEON) += pantheon/
 obj-$(if $(filter spear,$(SOC)),y) += spear/
diff --git a/arch/arm/cpu/arm926ejs/nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
similarity index 100%
rename from arch/arm/cpu/arm926ejs/nomadik/Kconfig
rename to arch/arm/mach-nomadik/Kconfig
diff --git a/arch/arm/cpu/arm926ejs/nomadik/Makefile b/arch/arm/mach-nomadik/Makefile
similarity index 100%
rename from arch/arm/cpu/arm926ejs/nomadik/Makefile
rename to arch/arm/mach-nomadik/Makefile
diff --git a/arch/arm/cpu/arm926ejs/nomadik/gpio.c b/arch/arm/mach-nomadik/gpio.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/nomadik/gpio.c
rename to arch/arm/mach-nomadik/gpio.c
diff --git a/arch/arm/cpu/arm926ejs/nomadik/reset.S b/arch/arm/mach-nomadik/reset.S
similarity index 100%
rename from arch/arm/cpu/arm926ejs/nomadik/reset.S
rename to arch/arm/mach-nomadik/reset.S
diff --git a/arch/arm/cpu/arm926ejs/nomadik/timer.c b/arch/arm/mach-nomadik/timer.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/nomadik/timer.c
rename to arch/arm/mach-nomadik/timer.c
-- 
1.9.1