SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e84d6d366e10cfacf4ab916499d1ddd1173d7d42..94810212d64ef47693f32407e213294cf9634641 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -1,6 +1,4 @@
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
+# SPDX-License-Identifier: GPL-2.0+
 
 ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
 CONFIG_CPU_V7=
@@ -9,16 +7,25 @@ endif
 
 # This selects which instruction set is used.
 arch-$(CONFIG_CPU_ARM720T)     =-march=armv4
-arch-$(CONFIG_CPU_ARM920T)     =-march=armv4
+arch-$(CONFIG_CPU_ARM920T)     =-march=armv4t
 arch-$(CONFIG_CPU_ARM926EJS)   =-march=armv5te
-arch-$(CONFIG_CPU_ARM946ES)    =-march=armv4
+arch-$(CONFIG_CPU_ARM946ES)    =-march=armv5te
 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_CPU_V7)          =$(call cc-option, -march=armv7-a, \
+                                $(call cc-option, -march=armv7, -march=armv5))
 arch-$(CONFIG_ARM64)           =-march=armv8-a
 
+# On Tegra systems we must build SPL for the armv4 core on the device
+# but otherwise we can use the value in CONFIG_SYS_ARM_ARCH
+ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TEGRA),yy)
+arch-y += -D__LINUX_ARM_ARCH__=4
+else
+arch-y += -D__LINUX_ARM_ARCH__=$(CONFIG_SYS_ARM_ARCH)
+endif
+
 # Evaluate arch cc-option calls now
 arch-y := $(arch-y)
 
@@ -41,6 +48,7 @@ PLATFORM_CPPFLAGS += $(arch-y) $(tune-y)
 
 # Machine directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.
+machine-$(CONFIG_ARCH_ASPEED)          += aspeed
 machine-$(CONFIG_ARCH_AT91)            += at91
 machine-$(CONFIG_ARCH_BCM283X)         += bcm283x
 machine-$(CONFIG_ARCH_DAVINCI)         += davinci
@@ -49,15 +57,22 @@ 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
+machine-$(CONFIG_ARCH_MESON)           += meson
+machine-$(CONFIG_ARCH_MVEBU)           += mvebu
 # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
-machine-$(CONFIG_ARCH_NOMADIK)         += nomadik
 # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
 machine-$(CONFIG_ORION5X)              += orion5x
+machine-$(CONFIG_ARCH_OMAP2PLUS)       += omap2
+machine-$(CONFIG_ARCH_S5PC1XX)         += s5pc1xx
+machine-$(CONFIG_ARCH_SUNXI)           += sunxi
+machine-$(CONFIG_ARCH_SNAPDRAGON)      += snapdragon
 machine-$(CONFIG_ARCH_SOCFPGA)         += socfpga
+machine-$(CONFIG_ARCH_RMOBILE)         += rmobile
+machine-$(CONFIG_ARCH_ROCKCHIP)                += rockchip
+machine-$(CONFIG_STM32)                        += stm32
+machine-$(CONFIG_ARCH_STM32MP)         += stm32mp
 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))
@@ -79,12 +94,12 @@ libs-y += arch/arm/cpu/
 libs-y += arch/arm/lib/
 
 ifeq ($(CONFIG_SPL_BUILD),y)
-ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
-libs-y += arch/arm/imx-common/
+ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35 mx8m))
+libs-y += arch/arm/mach-imx/
 endif
 else
-ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610))
-libs-y += arch/arm/imx-common/
+ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs mx8m vf610))
+libs-y += arch/arm/mach-imx/
 endif
 endif