diff options
| author | Masahiro Yamada <[email protected]> | 2015-08-01 16:39:54 +0900 |
|---|---|---|
| committer | Michal Simek <[email protected]> | 2015-08-19 11:27:21 +0200 |
| commit | ff560a13056a565a4e9ce1761bd04276a3cace88 (patch) | |
| tree | 652767f3310a9c7d1fe07170c839eb8f560cd011 | |
| parent | 84696ff57b3070e659c45f0ac10c6c7fd9f49056 (diff) | |
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 <[email protected]>
Signed-off-by: Michal Simek <[email protected]>
| -rw-r--r-- | arch/arm/mach-zynq/Kconfig | 2 | ||||
| -rw-r--r-- | configs/zynq_zc702_defconfig | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 1de5b0710a6..7a1aec45e79 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 5dde452cc39..c7faee78da9 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 |