From: Masahiro Yamada yamada.masahiro@socionext.com
One disadvantage of commit a26cd04920dc (arch: Make board selection choices optional) is that Kconfig could create such an insane .config file that no board is selected.
Rip off the "optional" again in favor of ZC702 as the default target.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com Signed-off-by: Michal Simek michal.simek@xilinx.com ---
Changes in v2: - Make ZC702 default instead of zedboard
arch/arm/mach-zynq/Kconfig | 2 +- configs/zynq_zc702_defconfig | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 1de5b0710a61..7a1aec45e79a 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -10,7 +10,7 @@ config ZYNQ_CUSTOM_INIT
choice prompt "Xilinx Zynq board select" - optional + default TARGET_ZYNQ_ZC702
config TARGET_ZYNQ_ZED bool "Zynq ZedBoard" diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 5dde452cc39b..c7faee78da9a 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_ZYNQ=y -CONFIG_TARGET_ZYNQ_ZC702=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702" # CONFIG_SYS_MALLOC_F is not set CONFIG_SPL=y