| Message ID | 1429936196-13647-3-git-send-email-sr@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Stefan Roese |
| Headers | show |
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7bd53c5..32c152d 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -85,7 +85,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 98aa10a..d0b426e 100644 --- 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 d833ca0..e86aa16 100644 --- 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"
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> --- Changes in v3: None Changes in v2: None arch/arm/Makefile | 2 +- .../{include/asm/arch-armada-xp => mach-mvebu/include/mach}/config.h | 0 arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/cpu.h | 0 arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/soc.h | 0 board/Marvell/db-mv784mp-gp/Kconfig | 2 +- board/maxbcm/Kconfig | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/config.h (100%) rename arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/cpu.h (100%) rename arch/arm/{include/asm/arch-armada-xp => mach-mvebu/include/mach}/soc.h (100%)