From 350b50eea31ac740e71f5d59b9a6a04b316c6d8d Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Sat, 25 Apr 2015 06:29:44 +0200 Subject: [PATCH] arm: armada-xp: Move SoC sources to mach-mvebu Move arch/arm/cpu/armv7armada-xp/* -> arch/arm/mach-mvebu/* Since this platform will be extended to support other Marvell SoC's as well, lets rename it directly to mvebu. This will be used by the upcoming Armada 38x suport (A38x). Signed-off-by: Stefan Roese Cc: Masahiro Yamada Tested-by: Kevin Smith Tested-by: Dirk Eibach --- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/Makefile | 0 arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/cpu.c | 0 arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/lowlevel_spl.S | 0 arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/spl.c | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/Makefile (100%) rename arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/cpu.c (100%) rename arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/lowlevel_spl.S (100%) rename arch/arm/{cpu/armv7/armada-xp => mach-mvebu}/spl.c (100%) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2a5620ddce..2a4f84b84a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -48,6 +48,7 @@ machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_KEYSTONE) += keystone # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD machine-$(CONFIG_KIRKWOOD) += kirkwood +machine-$(CONFIG_ARMADA_XP) += mvebu # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA machine-$(CONFIG_ARCH_NOMADIK) += nomadik # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index fcccd0c9ba..d335845d93 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -38,7 +38,6 @@ obj-y += s5p-common/ endif obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/ -obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/ obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/ obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/ diff --git a/arch/arm/cpu/armv7/armada-xp/Makefile b/arch/arm/mach-mvebu/Makefile similarity index 100% rename from arch/arm/cpu/armv7/armada-xp/Makefile rename to arch/arm/mach-mvebu/Makefile diff --git a/arch/arm/cpu/armv7/armada-xp/cpu.c b/arch/arm/mach-mvebu/cpu.c similarity index 100% rename from arch/arm/cpu/armv7/armada-xp/cpu.c rename to arch/arm/mach-mvebu/cpu.c diff --git a/arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S b/arch/arm/mach-mvebu/lowlevel_spl.S similarity index 100% rename from arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S rename to arch/arm/mach-mvebu/lowlevel_spl.S diff --git a/arch/arm/cpu/armv7/armada-xp/spl.c b/arch/arm/mach-mvebu/spl.c similarity index 100% rename from arch/arm/cpu/armv7/armada-xp/spl.c rename to arch/arm/mach-mvebu/spl.c -- 2.30.2