summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-04-25 06:29:45 +0200
committerLuka Perkov <luka.perkov@sartura.hr>2015-05-05 14:28:29 +0200
commit8cb78722306351c5d61ce4da18c284ef59c0caef (patch)
tree7cfc10b9c1e089a48392765650f3131b41ab2eb2 /arch
parent350b50eea31ac740e71f5d59b9a6a04b316c6d8d (diff)
downloadtalos-obmc-uboot-8cb78722306351c5d61ce4da18c284ef59c0caef.tar.gz
talos-obmc-uboot-8cb78722306351c5d61ce4da18c284ef59c0caef.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/mach-mvebu/include/mach/config.h (renamed from arch/arm/include/asm/arch-armada-xp/config.h)0
-rw-r--r--arch/arm/mach-mvebu/include/mach/cpu.h (renamed from arch/arm/include/asm/arch-armada-xp/cpu.h)0
-rw-r--r--arch/arm/mach-mvebu/include/mach/soc.h (renamed from arch/arm/include/asm/arch-armada-xp/soc.h)0
4 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2a4f84b84a..63ed3214f6 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -86,7 +86,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
index f9fd424609..f9fd424609 100644
--- a/arch/arm/include/asm/arch-armada-xp/config.h
+++ b/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
index 4f5ff96d84..4f5ff96d84 100644
--- a/arch/arm/include/asm/arch-armada-xp/cpu.h
+++ b/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
index 963e7ac5b7..963e7ac5b7 100644
--- a/arch/arm/include/asm/arch-armada-xp/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
OpenPOWER on IntegriCloud