rockchip: misc: don't fail if eth_addr already set

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

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c38ef3cb698850197b04adc6a28521b0aee88f7d..60af7e31990a39335ba9e3f7ba3aed695f6897e0 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -12,8 +12,8 @@ arch-$(CONFIG_CPU_ARM926EJS)  =-march=armv5te
 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_ARM1136)     =-march=armv6
+arch-$(CONFIG_CPU_ARM1176)     =-march=armv6
 arch-$(CONFIG_CPU_V7A)         =$(call cc-option, -march=armv7-a, \
                                 $(call cc-option, -march=armv7))
 arch-$(CONFIG_CPU_V7M)         =-march=armv7-m
@@ -81,6 +81,7 @@ machine-$(CONFIG_ARCH_STM32MP)                += stm32mp
 machine-$(CONFIG_TEGRA)                        += tegra
 machine-$(CONFIG_ARCH_UNIPHIER)                += uniphier
 machine-$(CONFIG_ARCH_ZYNQ)            += zynq
+machine-$(CONFIG_ARCH_ZYNQMP)          += zynqmp
 machine-$(CONFIG_ARCH_VERSAL)          += versal
 machine-$(CONFIG_ARCH_ZYNQMP_R5)       += zynqmp-r5
 
@@ -103,11 +104,11 @@ 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 mx5 mx6 mx7 mx35 mx8m))
+ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35 imx8m imx8))
 libs-y += arch/arm/mach-imx/
 endif
 else
-ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs mx8m imx8 vf610))
+ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs imx8m imx8 vf610))
 libs-y += arch/arm/mach-imx/
 endif
 endif