ARM: kirkwood: move SOC sources to mach-kirkwood

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@jp.panasonic.com>
Acked-by: Stefan Roese <sr@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Luka Perkov <luka.perkov@sartura.hr>

diff --git a/MAINTAINERS b/MAINTAINERS
index 26d0d2747996a80368d4cb52294834be7a5e2397..ac5e211c709d27988c03f66a91774e685296cf35 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -99,6 +99,7 @@ M:    Luka Perkov <luka.perkov@sartura.hr>
 S:     Maintained
 T:     git git://git.denx.de/u-boot-marvell.git
 F:     arch/arm/mach-kirkwood/
+F:     arch/arm/include/asm/arch-kirkwood/
 
 ARM MARVELL PXA
 M:     Marek Vasut <marex@denx.de>

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index dd122d71acc01dcde6111c6e616272108a5106d1..e587583fae91c6949703f01563d60d473377e0d9 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -42,6 +42,9 @@ PLATFORM_CPPFLAGS += $(arch-y) $(tune-y)
 # Machine directory name.  This list is sorted alphanumerically
 # 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