diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-29 06:46:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-29 06:46:33 -0400 |
| commit | ace97d26176a3ebc9ec07738450de93eea35975c (patch) | |
| tree | 7de5b3cdc2f269ae1426540ae9f74b420423f132 /arch/arm/cpu/armv7/Makefile | |
| parent | 1692515e51a190b2ad1e2c54fdaa15fbb8387ba7 (diff) | |
| parent | 5ca269a4df21a7e326eb3b3f7788177d064fe782 (diff) | |
| download | u-boot-imx-ace97d26176a3ebc9ec07738450de93eea35975c.zip u-boot-imx-ace97d26176a3ebc9ec07738450de93eea35975c.tar.gz u-boot-imx-ace97d26176a3ebc9ec07738450de93eea35975c.tar.bz2 | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/cpu/armv7/Makefile')
| -rw-r--r-- | arch/arm/cpu/armv7/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index e6249f1..fcccd0c 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -56,4 +56,3 @@ obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-$(CONFIG_U8500) += u8500/ obj-$(CONFIG_VF610) += vf610/ -obj-$(CONFIG_ZYNQ) += zynq/ |