Skip to contentSkip to conversation

ARM: zynq: drop "optional" from board select in favor of ZC702

PATCH New Michal Simek 2 participants 2 messages Aug 4, 2015 – Aug 12, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: zynq: drop "optional" from board select in favor of ZC702

From: Masahiro Yamada <[email protected]>

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.

---

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(-)
arch/arm/mach-zynq/Kconfig +1 -1
index 1de5b0710a61..7a1aec45e79a 100644
@@ -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"
configs/zynq_zc702_defconfig +0 -1
index 5dde452cc39b..c7faee78da9a 100644
@@ -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
Signature · 1 line
2.3.5
Applied
#1 lore raw

PATCH v2 1/1 ARM: zynq: drop "optional" from board select in favor of ZC702

Quoted 39 lines · Michal Simek

From: Masahiro Yamada <[email protected]>

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.

---

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(-)
arch/arm/mach-zynq/Kconfig +1 -1
index 1de5b0710a61..7a1aec45e79a 100644
@@ -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"
configs/zynq_zc702_defconfig +0 -0
index 5dde452cc39b..c7faee78da9a 100644

configs/zynq_zc702_defconfig line 5

Quoted 6 lines
configs/zynq_zc702_defconfig +0 -1
@@ -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

Applied.

Thanks,
Michal

Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150812/ed6de40f/attachment.sig>