ARM: orion5x: move SoC sources to mach-orion5x

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

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 820e82f200d44edf8b313a34f1cd5413acf8e232..e64a54766fda3752a125e1140757b52422931bf7 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -831,7 +831,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 12997b8ec9445d6ffbcd551252ad79c82906c567..850f45c613f2138d89f1749b1b2f887b92aa25ea 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -47,6 +47,8 @@ machine-$(CONFIG_ARCH_DAVINCI)                += davinci
 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
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))

diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index b6af22c3edf2528a2f65b976790911094763162f..9204d312f1bf1d96c9eaca4ab4964caaaa660865 100644 (file)
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -19,4 +19,5 @@ obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
 obj-$(CONFIG_SOC_MX25) += mx25/
 obj-$(CONFIG_SOC_MX27) += mx27/
 obj-$(if $(filter mxs,$(SOC)),y) += mxs/
+obj-$(CONFIG_PANTHEON) += pantheon/
 obj-$(if $(filter spear,$(SOC)),y) += spear/