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/Kconfig | |
parent | 1692515e51a190b2ad1e2c54fdaa15fbb8387ba7 (diff) | |
parent | 5ca269a4df21a7e326eb3b3f7788177d064fe782 (diff) | |
download | talos-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/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2167e29f6a..00be305c39 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -649,7 +649,7 @@ config TARGET_COLIBRI_VF bool "Support Colibri VF50/61" select CPU_V7 -config ZYNQ +config ARCH_ZYNQ bool "Xilinx Zynq Platform" select CPU_V7 select SUPPORT_SPL @@ -837,7 +837,7 @@ source "arch/arm/mach-uniphier/Kconfig" source "arch/arm/mach-versatile/Kconfig" -source "arch/arm/cpu/armv7/zynq/Kconfig" +source "arch/arm/mach-zynq/Kconfig" source "arch/arm/cpu/armv7/Kconfig" |