diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-05 10:32:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-05 10:32:08 -0400 |
| commit | 1131d4e22cf8f13d0dabaad7f1b84d9baffdfbd6 (patch) | |
| tree | 89f46db2de98f59883ba6e4390f91af1599e9956 /arch/arm/Makefile | |
| parent | ff7e9cfc338ecd6db5ed7d6ff8fb7a2889b0131c (diff) | |
| parent | 2083db7a75792d317a8e726e8be72abea8941d03 (diff) | |
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2a5620ddce..8ff94a3c0b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -48,6 +48,7 @@ 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 @@ -85,8 +86,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 |