diff options
author | Tom Rini <trini@konsulko.com> | 2016-04-13 12:53:11 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-04-13 12:53:11 -0400 |
commit | 541c9be880d601cb0230dc7452c398167ed1eaac (patch) | |
tree | 0686261e2d2e4589c651d165026d4e678390915a /arch/arm/Kconfig | |
parent | 3f8085e94ae3e8a2996e2f517ecdb608a4b4c09e (diff) | |
parent | 58ed7f66939cbfb6e48656b3925aefd9f180a1a3 (diff) | |
download | talos-obmc-uboot-541c9be880d601cb0230dc7452c398167ed1eaac.tar.gz talos-obmc-uboot-541c9be880d601cb0230dc7452c398167ed1eaac.zip |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2b899b89b2..d1c3157b79 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -580,6 +580,7 @@ config ARCH_ZYNQ select SPL_OF_CONTROL if SPL select DM select DM_ETH + select DM_GPIO select SPL_DM if SPL select DM_MMC select DM_SPI @@ -592,8 +593,6 @@ config ARCH_ZYNQMP select ARM64 select DM select OF_CONTROL - select DM_ETH - select DM_MMC select DM_SERIAL config TEGRA |