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

[karo-tx-uboot.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index ac3ee854208e37faba6c78c9af2087bb1841ad5a..4ae0c5ae15d3a8fceaa1c65afbdb149a2ca78d86 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -2,52 +2,15 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
-CONFIG_CPU_V7=
-CONFIG_CPU_ARM720T=y
-endif
-
-# This selects which instruction set is used.
-arch-$(CONFIG_CPU_ARM720T)     =-march=armv4
-arch-$(CONFIG_CPU_ARM920T)     =-march=armv4
-arch-$(CONFIG_CPU_ARM926EJS)   =-march=armv5te
-arch-$(CONFIG_CPU_ARM946ES)    =-march=armv4
-arch-$(CONFIG_CPU_SA1100)      =-march=armv4
-arch-$(CONFIG_CPU_PXA)         =
-arch-$(CONFIG_CPU_ARM1136)     =-march=armv5
-arch-$(CONFIG_CPU_ARM1176)     =-march=armv5t
-arch-$(CONFIG_CPU_V7)          =$(call cc-option, -march=armv7-a, -march=armv5)
-arch-$(CONFIG_ARM64)           =-march=armv8-a
-
-# Evaluate arch cc-option calls now
-arch-y := $(arch-y)
-
-# This selects how we optimise for the processor.
-tune-$(CONFIG_CPU_ARM720T)     =-mtune=arm7tdmi
-tune-$(CONFIG_CPU_ARM920T)     =
-tune-$(CONFIG_CPU_ARM926EJS)   =
-tune-$(CONFIG_CPU_ARM946ES)    =
-tune-$(CONFIG_CPU_SA1100)      =-mtune=strongarm1100
-tune-$(CONFIG_CPU_PXA)         =-mcpu=xscale
-tune-$(CONFIG_CPU_ARM1136)     =
-tune-$(CONFIG_CPU_ARM1176)     =
-tune-$(CONFIG_CPU_V7)          =
-tune-$(CONFIG_ARM64)           =
-
-# Evaluate tune cc-option calls now
-tune-y := $(tune-y)
-
-PLATFORM_CPPFLAGS += $(arch-y) $(tune-y)
-
 # Machine directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.
 machine-$(CONFIG_ARCH_AT91)            += at91
-machine-$(CONFIG_ARCH_BCM283X)         += bcm283x
 machine-$(CONFIG_ARCH_DAVINCI)         += davinci
 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
@@ -55,6 +18,7 @@ machine-$(CONFIG_ORION5X)             += orion5x
 machine-$(CONFIG_TEGRA)                        += tegra
 machine-$(CONFIG_ARCH_UNIPHIER)                += uniphier
 machine-$(CONFIG_ARCH_VERSATILE)       += versatile
+machine-$(CONFIG_ARCH_ZYNQ)            += zynq
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
 
@@ -84,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