summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-04-29 06:46:33 -0400
committerTom Rini <trini@konsulko.com>2015-04-29 06:46:33 -0400
commitace97d26176a3ebc9ec07738450de93eea35975c (patch)
tree7de5b3cdc2f269ae1426540ae9f74b420423f132 /arch/arm/Makefile
parent1692515e51a190b2ad1e2c54fdaa15fbb8387ba7 (diff)
parent5ca269a4df21a7e326eb3b3f7788177d064fe782 (diff)
downloadtalos-obmc-uboot-ace97d26176a3ebc9ec07738450de93eea35975c.tar.gz
talos-obmc-uboot-ace97d26176a3ebc9ec07738450de93eea35975c.zip
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index bd4749c55e..2a5620ddce 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -55,6 +55,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))
OpenPOWER on IntegriCloud