arm: armada-xp: Move SoC headers to mach-mvebu/include/mach

Move arch/arm/include/asm/arch-armada-xp/*
     -> arch/arm/mach-mvebu/include/mach/*

Additionally the SYS_SOC is renamed from "armada-xp" to "mvebu". With this
change all these files can better be shared with other, newer Mavell
MVEBU SoC's. Like the upcoming Armada 38x support.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com>
Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 268ec0cb31f1c270fdcf091f74d82de203dc2903..4ae0c5ae15d3a8fceaa1c65afbdb149a2ca78d86 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -48,7 +48,7 @@ libs-y += arch/arm/imx-common/
 endif
 endif
 
-ifneq (,$(filter $(SOC), armada-xp kirkwood))
+ifneq (,$(filter $(SOC), mvebu kirkwood))
 libs-y += arch/arm/mvebu-common/
 endif
 

diff --git a/arch/arm/include/asm/arch-armada-xp/config.h b/arch/arm/mach-mvebu/include/mach/config.h
similarity index 100%
rename from arch/arm/include/asm/arch-armada-xp/config.h
rename to arch/arm/mach-mvebu/include/mach/config.h

diff --git a/arch/arm/include/asm/arch-armada-xp/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h
similarity index 100%
rename from arch/arm/include/asm/arch-armada-xp/cpu.h
rename to arch/arm/mach-mvebu/include/mach/cpu.h

diff --git a/arch/arm/include/asm/arch-armada-xp/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
similarity index 100%
rename from arch/arm/include/asm/arch-armada-xp/soc.h
rename to arch/arm/mach-mvebu/include/mach/soc.h

diff --git a/board/Marvell/db-mv784mp-gp/Kconfig b/board/Marvell/db-mv784mp-gp/Kconfig
index 98aa10ade0be58523537a43dd34e13452e2851ea..d0b426e8d92be0e4f1504d1d23d9c81e4ae6be6e 100644 (file)
--- a/board/Marvell/db-mv784mp-gp/Kconfig
+++ b/board/Marvell/db-mv784mp-gp/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "Marvell"
 
 config SYS_SOC
-       default "armada-xp"
+       default "mvebu"
 
 config SYS_CONFIG_NAME
        default "db-mv784mp-gp"

diff --git a/board/maxbcm/Kconfig b/board/maxbcm/Kconfig
index d833ca0e2518ec3bdfa5982a8827e4cbbbf5c601..e86aa16247c0772ec0e6a5651be6480ccdb7969f 100644 (file)
--- a/board/maxbcm/Kconfig
+++ b/board/maxbcm/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
        default "maxbcm"
 
 config SYS_SOC
-       default "armada-xp"
+       default "mvebu"
 
 config SYS_CONFIG_NAME
        default "maxbcm"