Merge tag 'xilinx-for-v2017.03' of git://www.denx.de/git/u-boot-microblaze

[u-boot] / Kconfig

diff --git a/Kconfig b/Kconfig
index e09b9c3b0351971a8a82ce6ebfe195c7c0307e92..1fa791c1cc469865a0eca3b3df9bf793e2f97729 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -61,6 +61,7 @@ config DISTRO_DEFAULTS
        select CMD_BOOTZ if ARM && !ARM64
        select CMD_BOOTI if ARM64
        select CMD_DHCP
+       select CMD_PXE
        select CMD_EXT2
        select CMD_EXT4
        select CMD_FAT
@@ -247,7 +248,8 @@ config SYS_EXTRA_OPTIONS
 
 config SYS_TEXT_BASE
        depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP || \
-               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS
+               (M68K && !TARGET_ASTRO_MCF5373L) || MICROBLAZE || MIPS || \
+               ARCH_ZYNQ
        depends on !EFI_APP
        hex "Text Base"
        help
@@ -298,9 +300,8 @@ config SYS_CLK_FREQ
        help
          TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
 
-config ARCH_FIXUP_FDT
-       bool "Enable arch_fixup_fdt() call"
-       depends on ARM || MIPS
+config ARCH_FIXUP_FDT_MEMORY
+       bool "Enable arch_fixup_memory_banks() call"
        default y
        help
          Enable FDT memory map syncup before OS boot. This feature can be