[U-Boot] [PATCH v3 06/19] ARM: kirkwood: move SOC sources to mach-kirkwood

[Masahiro Yamada]

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

Note:
 Perhaps, can we merge arch/arm/mach-kirkwood and
 arch/arm/mvebu-common into arch/arm/mach-mvebu, like Linux?

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
Acked-by: Stefan Roese <sr at denx.de>
Cc: Prafulla Wadaskar <prafulla at marvell.com>
Cc: Luka Perkov <luka.perkov at sartura.hr>
---

Changes in v3: None

 MAINTAINERS                                                 | 2 +-
 arch/arm/Kconfig                                            | 2 +-
 arch/arm/Makefile                                           | 2 ++
 arch/arm/cpu/arm926ejs/Makefile                             | 1 -
 arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Kconfig  | 0
 arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Makefile | 0
 arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cache.c  | 0
 arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cpu.c    | 0
 arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/mpp.c    | 0
 9 files changed, 4 insertions(+), 3 deletions(-)
 rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Kconfig (100%)
 rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/Makefile (100%)
 rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cache.c (100%)
 rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/cpu.c (100%)
 rename arch/arm/{cpu/arm926ejs/kirkwood => mach-kirkwood}/mpp.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 63085fc..e4edf45 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -99,7 +99,7 @@ M:	Prafulla Wadaskar <prafulla at marvell.com>
 M:	Luka Perkov <luka.perkov at sartura.hr>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-marvell.git
-F:	arch/arm/cpu/arm926ejs/kirkwood/
+F:	arch/arm/mach-kirkwood/
 F:	arch/arm/include/asm/arch-kirkwood/
 
 ARM MARVELL PXA
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 887c0d5..dba6518 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -726,7 +726,7 @@ source "arch/arm/cpu/armv7/highbank/Kconfig"
 
 source "arch/arm/cpu/armv7/keystone/Kconfig"
 
-source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
+source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/cpu/arm926ejs/nomadik/Kconfig"
 
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e321057..e09de51 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -6,6 +6,8 @@
 # by CONFIG_* macro name.
 machine-$(CONFIG_ARCH_AT91)		+= at91
 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_TEGRA)			+= tegra
 
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index 27b4353..0b43a90 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_KIRKWOOD) += kirkwood/
 obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
 obj-$(CONFIG_MB86R0x) += mb86r0x/
 obj-$(CONFIG_MX25) += mx25/
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
similarity index 100%
rename from arch/arm/cpu/arm926ejs/kirkwood/Kconfig
rename to arch/arm/mach-kirkwood/Kconfig
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
similarity index 100%
rename from arch/arm/cpu/arm926ejs/kirkwood/Makefile
rename to arch/arm/mach-kirkwood/Makefile
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cache.c b/arch/arm/mach-kirkwood/cache.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/kirkwood/cache.c
rename to arch/arm/mach-kirkwood/cache.c
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/kirkwood/cpu.c
rename to arch/arm/mach-kirkwood/cpu.c
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
similarity index 100%
rename from arch/arm/cpu/arm926ejs/kirkwood/mpp.c
rename to arch/arm/mach-kirkwood/mpp.c
-- 
1.9.1