X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2FMakefile;h=ab0e9ce67369bc2982f9ae02b9dda579d1743862;hb=8ed20d65010d46fd58121ea9ee9c913abc3d8e13;hp=2a4f84b84afc48f4cc7cbb3705cc4c774454069f;hpb=350b50eea31ac740e71f5d59b9a6a04b316c6d8d;p=u-boot diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2a4f84b84a..ab0e9ce673 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -53,6 +53,7 @@ machine-$(CONFIG_ARMADA_XP) += mvebu machine-$(CONFIG_ARCH_NOMADIK) += nomadik # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x +machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_VERSATILE) += versatile @@ -77,7 +78,7 @@ libs-y += arch/arm/cpu/ libs-y += arch/arm/lib/ ifeq ($(CONFIG_SPL_BUILD),y) -ifneq (,$(CONFIG_MX23)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35)) +ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35)) libs-y += arch/arm/imx-common/ endif else @@ -86,8 +87,8 @@ libs-y += arch/arm/imx-common/ endif endif -ifneq (,$(filter $(SOC), armada-xp kirkwood)) -libs-y += arch/arm/mvebu-common/ +ifneq (,$(filter $(SOC), kirkwood)) +libs-y += arch/arm/mach-mvebu/ endif # deprecated