Move arch/arm/cpu/arm926ejs/versatile/* -> arch/arm/mach-versatile/*
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 + arch/arm/cpu/arm926ejs/Makefile | 1 - arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/Kconfig | 0 arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/Makefile | 0 arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/reset.S | 0 arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/timer.c | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/Kconfig (100%) rename arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/Makefile (100%) rename arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/reset.S (100%) rename arch/arm/{cpu/arm926ejs/versatile => mach-versatile}/timer.c (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ffd6f66..1530dd8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -714,7 +714,7 @@ source "arch/arm/mach-tegra/Kconfig"
source "arch/arm/mach-uniphier/Kconfig"
-source "arch/arm/cpu/arm926ejs/versatile/Kconfig" +source "arch/arm/mach-versatile/Kconfig"
source "arch/arm/cpu/armv7/zynq/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a707f02..11a16d8 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -15,6 +15,7 @@ machine-$(CONFIG_ARCH_NOMADIK) += nomadik machine-$(CONFIG_ORION5X) += orion5x machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier +machine-$(CONFIG_ARCH_VERSATILE) += versatile
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 3cb741d..f5944cc 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -22,4 +22,3 @@ obj-$(CONFIG_MX27) += mx27/ obj-$(if $(filter mxs,$(SOC)),y) += mxs/ obj-$(CONFIG_PANTHEON) += pantheon/ obj-$(if $(filter spear,$(SOC)),y) += spear/ -obj-$(CONFIG_ARCH_VERSATILE) += versatile/ diff --git a/arch/arm/cpu/arm926ejs/versatile/Kconfig b/arch/arm/mach-versatile/Kconfig similarity index 100% rename from arch/arm/cpu/arm926ejs/versatile/Kconfig rename to arch/arm/mach-versatile/Kconfig diff --git a/arch/arm/cpu/arm926ejs/versatile/Makefile b/arch/arm/mach-versatile/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/versatile/Makefile rename to arch/arm/mach-versatile/Makefile diff --git a/arch/arm/cpu/arm926ejs/versatile/reset.S b/arch/arm/mach-versatile/reset.S similarity index 100% rename from arch/arm/cpu/arm926ejs/versatile/reset.S rename to arch/arm/mach-versatile/reset.S diff --git a/arch/arm/cpu/arm926ejs/versatile/timer.c b/arch/arm/mach-versatile/timer.c similarity index 100% rename from arch/arm/cpu/arm926ejs/versatile/timer.c rename to arch/arm/mach-versatile/timer.c