summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-08-01 16:39:54 +0900
committerMichal Simek <michal.simek@xilinx.com>2015-08-19 11:27:21 +0200
commitff560a13056a565a4e9ce1761bd04276a3cace88 (patch)
tree652767f3310a9c7d1fe07170c839eb8f560cd011
parent84696ff57b3070e659c45f0ac10c6c7fd9f49056 (diff)
downloadu-boot-imx-ff560a13056a565a4e9ce1761bd04276a3cace88.zip
u-boot-imx-ff560a13056a565a4e9ce1761bd04276a3cace88.tar.gz
u-boot-imx-ff560a13056a565a4e9ce1761bd04276a3cace88.tar.bz2
ARM: zynq: drop "optional" from board select in favor of ZC702
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>
-rw-r--r--arch/arm/mach-zynq/Kconfig2
-rw-r--r--configs/zynq_zc702_defconfig1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 1de5b07..7a1aec4 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 5dde452..c7faee7 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