1From ee11fed43e2bd029f71af1e72ab9bb5652f5fc54 Mon Sep 17 00:00:00 2001
2From: Alexey Brodkin <abrodkin@synopsys.com>
3Date: Wed, 29 Jul 2015 20:32:59 +0300
4Subject: [PATCH] Revert "arch: Make board selection choices optional"
5
6This reverts commit a26cd04920dc069fd6e91abb785426cf6c29f45f.
7
8Reverted commit caused an issue with "make oldconfig" - default prompt
9for target selection was set as No that lead to missing platform
10selection by automated scripts like that:
11------------------>8------------------
12"yes "" | make oldconfig" on defconfig
13------------------>8------------------
14
15And that lead to build failure:
16------------------>8------------------
17$ make
18scripts/kconfig/conf --silentoldconfig Kconfig
19  CHK     include/config.h
20  UPD     include/config.h
21  GEN     include/autoconf.mk
22In file included from ./include/common.h:18:0:
23include/config.h:5:22: fatal error: configs/.h: No such file or directory
24 #include <configs/.h>
25                      ^
26compilation terminated.
27scripts/Makefile.autoconf:72: recipe for target 'include/autoconf.mk' failed
28make[1]: *** [include/autoconf.mk] Error 1
29------------------>8------------------
30
31Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
32---
33 arch/arc/Kconfig                     | 1 -
34 arch/arm/Kconfig                     | 1 -
35 arch/arm/cpu/armv7/exynos/Kconfig    | 1 -
36 arch/arm/cpu/armv7/mx5/Kconfig       | 1 -
37 arch/arm/cpu/armv7/mx6/Kconfig       | 1 -
38 arch/arm/cpu/armv7/omap3/Kconfig     | 1 -
39 arch/arm/cpu/armv7/omap4/Kconfig     | 1 -
40 arch/arm/cpu/armv7/omap5/Kconfig     | 1 -
41 arch/arm/cpu/armv7/rmobile/Kconfig   | 1 -
42 arch/arm/cpu/armv7/s5pc1xx/Kconfig   | 1 -
43 arch/arm/mach-at91/Kconfig           | 1 -
44 arch/arm/mach-bcm283x/Kconfig        | 1 -
45 arch/arm/mach-davinci/Kconfig        | 1 -
46 arch/arm/mach-integrator/Kconfig     | 2 --
47 arch/arm/mach-keystone/Kconfig       | 1 -
48 arch/arm/mach-kirkwood/Kconfig       | 1 -
49 arch/arm/mach-nomadik/Kconfig        | 1 -
50 arch/arm/mach-orion5x/Kconfig        | 1 -
51 arch/arm/mach-socfpga/Kconfig        | 1 -
52 arch/arm/mach-tegra/Kconfig          | 1 -
53 arch/arm/mach-tegra/tegra114/Kconfig | 1 -
54 arch/arm/mach-tegra/tegra124/Kconfig | 1 -
55 arch/arm/mach-tegra/tegra20/Kconfig  | 1 -
56 arch/arm/mach-tegra/tegra30/Kconfig  | 1 -
57 arch/arm/mach-zynq/Kconfig           | 1 -
58 arch/avr32/Kconfig                   | 1 -
59 arch/blackfin/Kconfig                | 1 -
60 arch/m68k/Kconfig                    | 1 -
61 arch/microblaze/Kconfig              | 1 -
62 arch/mips/Kconfig                    | 1 -
63 arch/nds32/Kconfig                   | 1 -
64 arch/nios2/Kconfig                   | 1 -
65 arch/openrisc/Kconfig                | 1 -
66 arch/powerpc/Kconfig                 | 1 -
67 arch/powerpc/cpu/mpc512x/Kconfig     | 1 -
68 arch/powerpc/cpu/mpc5xx/Kconfig      | 1 -
69 arch/powerpc/cpu/mpc5xxx/Kconfig     | 1 -
70 arch/powerpc/cpu/mpc8260/Kconfig     | 1 -
71 arch/powerpc/cpu/mpc83xx/Kconfig     | 1 -
72 arch/powerpc/cpu/mpc85xx/Kconfig     | 1 -
73 arch/powerpc/cpu/mpc86xx/Kconfig     | 1 -
74 arch/powerpc/cpu/mpc8xx/Kconfig      | 1 -
75 arch/powerpc/cpu/ppc4xx/Kconfig      | 1 -
76 arch/sh/Kconfig                      | 1 -
77 arch/sparc/Kconfig                   | 1 -
78 board/amcc/canyonlands/Kconfig       | 1 -
79 board/coreboot/Kconfig               | 1 -
80 board/dbau1x00/Kconfig               | 1 -
81 board/google/Kconfig                 | 1 -
82 board/intel/Kconfig                  | 1 -
83 board/micronas/vct/Kconfig           | 1 -
84 board/seco/Kconfig                   | 2 --
85 board/sunxi/Kconfig                  | 1 -
86 53 files changed, 55 deletions(-)
87
88diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
89index 925e312..640cda8 100644
90--- a/arch/arc/Kconfig
91+++ b/arch/arc/Kconfig
92@@ -129,7 +129,6 @@ config ARC_CACHE_LINE_SHIFT
93
94 choice
95 	prompt "Target select"
96-	optional
97
98 config TARGET_TB100
99 	bool "Support tb100"
100diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
101index 9908b43..8eeb46c 100644
102--- a/arch/arm/Kconfig
103+++ b/arch/arm/Kconfig
104@@ -64,7 +64,6 @@ config SEMIHOSTING
105
106 choice
107 	prompt "Target select"
108-	optional
109
110 config ARCH_AT91
111 	bool "Atmel AT91"
112diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
113index 4a7d82f..f2fe748 100644
114--- a/arch/arm/cpu/armv7/exynos/Kconfig
115+++ b/arch/arm/cpu/armv7/exynos/Kconfig
116@@ -2,7 +2,6 @@ if ARCH_EXYNOS
117
118 choice
119 	prompt "EXYNOS board select"
120-	optional
121
122 config TARGET_SMDKV310
123 	select SUPPORT_SPL
124diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig
125index 9f250c6..2d6c0ce 100644
126--- a/arch/arm/cpu/armv7/mx5/Kconfig
127+++ b/arch/arm/cpu/armv7/mx5/Kconfig
128@@ -12,7 +12,6 @@ config MX53
129
130 choice
131 	prompt "MX5 board select"
132-	optional
133
134 config TARGET_USBARMORY
135 	bool "Support USB armory"
136diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
137index 10908c4..662596f 100644
138--- a/arch/arm/cpu/armv7/mx6/Kconfig
139+++ b/arch/arm/cpu/armv7/mx6/Kconfig
140@@ -27,7 +27,6 @@ config MX6SX
141
142 choice
143 	prompt "MX6 board select"
144-	optional
145
146 config TARGET_SECOMX6
147 	bool "Support secomx6 boards"
148diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig
149index b32a6b0..cc82c50 100644
150--- a/arch/arm/cpu/armv7/omap3/Kconfig
151+++ b/arch/arm/cpu/armv7/omap3/Kconfig
152@@ -2,7 +2,6 @@ if OMAP34XX
153
154 choice
155 	prompt "OMAP3 board select"
156-	optional
157
158 config TARGET_AM3517_EVM
159 	bool "AM3517 EVM"
160diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig
161index df27ea1..eccf897 100644
162--- a/arch/arm/cpu/armv7/omap4/Kconfig
163+++ b/arch/arm/cpu/armv7/omap4/Kconfig
164@@ -2,7 +2,6 @@ if OMAP44XX
165
166 choice
167 	prompt "OMAP4 board select"
168-	optional
169
170 config TARGET_DUOVERO
171 	bool "OMAP4430 Gumstix Duovero"
172diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig
173index 20c3bd9..aca862d 100644
174--- a/arch/arm/cpu/armv7/omap5/Kconfig
175+++ b/arch/arm/cpu/armv7/omap5/Kconfig
176@@ -2,7 +2,6 @@ if OMAP54XX
177
178 choice
179 	prompt "OMAP5 board select"
180-	optional
181
182 config TARGET_CM_T54
183 	bool "CompuLab CM-T54"
184diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig
185index ef56286..638b63d 100644
186--- a/arch/arm/cpu/armv7/rmobile/Kconfig
187+++ b/arch/arm/cpu/armv7/rmobile/Kconfig
188@@ -2,7 +2,6 @@ if RMOBILE
189
190 choice
191 	prompt "Renesus ARM SoCs board select"
192-	optional
193
194 config TARGET_ARMADILLO_800EVA
195 	bool "armadillo 800 eva board"
196diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
197index 792ef59..65cc9eb 100644
198--- a/arch/arm/cpu/armv7/s5pc1xx/Kconfig
199+++ b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
200@@ -2,7 +2,6 @@ if ARCH_S5PC1XX
201
202 choice
203 	prompt "S5PC1XX board select"
204-	optional
205
206 config TARGET_S5P_GONI
207 	bool "S5P Goni board"
208diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
209index bbf4228..5dc2cb2 100644
210--- a/arch/arm/mach-at91/Kconfig
211+++ b/arch/arm/mach-at91/Kconfig
212@@ -2,7 +2,6 @@ if ARCH_AT91
213
214 choice
215 	prompt "Atmel AT91 board select"
216-	optional
217
218 config TARGET_AT91RM9200EK
219 	bool "Atmel AT91RM9200 evaluation kit"
220diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
221index 2315a13..d40f505 100644
222--- a/arch/arm/mach-bcm283x/Kconfig
223+++ b/arch/arm/mach-bcm283x/Kconfig
224@@ -3,7 +3,6 @@ menu "Broadcom BCM283X family"
225
226 choice
227 	prompt "Broadcom BCM283X board select"
228-	optional
229
230 config TARGET_RPI
231 	bool "Raspberry Pi"
232diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
233index e6cb390..3ef55d3 100644
234--- a/arch/arm/mach-davinci/Kconfig
235+++ b/arch/arm/mach-davinci/Kconfig
236@@ -2,7 +2,6 @@ if ARCH_DAVINCI
237
238 choice
239 	prompt "DaVinci board select"
240-	optional
241
242 config TARGET_ENBW_CMC
243 	bool "EnBW CMC board"
244diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
245index c54d69d..8ffc544 100644
246--- a/arch/arm/mach-integrator/Kconfig
247+++ b/arch/arm/mach-integrator/Kconfig
248@@ -3,7 +3,6 @@ menu "Integrator Options"
249
250 choice
251 	prompt "Integrator platform select"
252-	optional
253
254 config ARCH_INTEGRATOR_AP
255 	bool "Support Integrator/AP platform"
256@@ -19,7 +18,6 @@ config ARCH_CINTEGRATOR
257
258 choice
259 	prompt "Integrator core module select"
260-	optional
261
262 config CM720T
263 	bool "Core Module for ARM720T"
264diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
265index 67f1a33..134ae87 100644
266--- a/arch/arm/mach-keystone/Kconfig
267+++ b/arch/arm/mach-keystone/Kconfig
268@@ -2,7 +2,6 @@ if ARCH_KEYSTONE
269
270 choice
271 	prompt "TI Keystone board select"
272-	optional
273
274 config TARGET_K2HK_EVM
275 	bool "TI Keystone 2 Kepler/Hawking EVM"
276diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
277index 1261885..45c6687 100644
278--- a/arch/arm/mach-kirkwood/Kconfig
279+++ b/arch/arm/mach-kirkwood/Kconfig
280@@ -2,7 +2,6 @@ if KIRKWOOD
281
282 choice
283 	prompt "Marvell Kirkwood board select"
284-	optional
285
286 config TARGET_OPENRD
287 	bool "Marvell OpenRD Board"
288diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
289index ba72a41..265f336 100644
290--- a/arch/arm/mach-nomadik/Kconfig
291+++ b/arch/arm/mach-nomadik/Kconfig
292@@ -2,7 +2,6 @@ if ARCH_NOMADIK
293
294 choice
295 	prompt "Nomadik board select"
296-	optional
297
298 config NOMADIK_NHK8815
299 	bool "ST 8815 Nomadik Hardware Kit"
300diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
301index 7644b8d..291c511 100644
302--- a/arch/arm/mach-orion5x/Kconfig
303+++ b/arch/arm/mach-orion5x/Kconfig
304@@ -2,7 +2,6 @@ if ORION5X
305
306 choice
307 	prompt "Marvell Orion board select"
308-	optional
309
310 config TARGET_EDMINIV2
311 	bool "LaCie Ethernet Disk mini V2"
312diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
313index e46c348..204efca 100644
314--- a/arch/arm/mach-socfpga/Kconfig
315+++ b/arch/arm/mach-socfpga/Kconfig
316@@ -2,7 +2,6 @@ if ARCH_SOCFPGA
317
318 choice
319 	prompt "Altera SOCFPGA board select"
320-	optional
321
322 config TARGET_SOCFPGA_ARRIA5
323 	bool "Altera SOCFPGA Arria V"
324diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
325index 54bd648..ef77c84 100644
326--- a/arch/arm/mach-tegra/Kconfig
327+++ b/arch/arm/mach-tegra/Kconfig
328@@ -2,7 +2,6 @@ if TEGRA
329
330 choice
331 	prompt "Tegra SoC select"
332-	optional
333
334 config TEGRA20
335 	bool "Tegra20 family"
336diff --git a/arch/arm/mach-tegra/tegra114/Kconfig b/arch/arm/mach-tegra/tegra114/Kconfig
337index 1047b92..31012bc 100644
338--- a/arch/arm/mach-tegra/tegra114/Kconfig
339+++ b/arch/arm/mach-tegra/tegra114/Kconfig
340@@ -2,7 +2,6 @@ if TEGRA114
341
342 choice
343 	prompt "Tegra114 board select"
344-	optional
345
346 config TARGET_DALMORE
347 	bool "NVIDIA Tegra114 Dalmore evaluation board"
348diff --git a/arch/arm/mach-tegra/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig
349index f3324ff..86c1301 100644
350--- a/arch/arm/mach-tegra/tegra124/Kconfig
351+++ b/arch/arm/mach-tegra/tegra124/Kconfig
352@@ -2,7 +2,6 @@ if TEGRA124
353
354 choice
355 	prompt "Tegra124 board select"
356-	optional
357
358 config TARGET_JETSON_TK1
359 	bool "NVIDIA Tegra124 Jetson TK1 board"
360diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig
361index 1bb8dff..7f09f81 100644
362--- a/arch/arm/mach-tegra/tegra20/Kconfig
363+++ b/arch/arm/mach-tegra/tegra20/Kconfig
364@@ -2,7 +2,6 @@ if TEGRA20
365
366 choice
367 	prompt "Tegra20 board select"
368-	optional
369
370 config TARGET_HARMONY
371 	bool "NVIDIA Tegra20 Harmony evaluation board"
372diff --git a/arch/arm/mach-tegra/tegra30/Kconfig b/arch/arm/mach-tegra/tegra30/Kconfig
373index e78331e..3abdc7b 100644
374--- a/arch/arm/mach-tegra/tegra30/Kconfig
375+++ b/arch/arm/mach-tegra/tegra30/Kconfig
376@@ -2,7 +2,6 @@ if TEGRA30
377
378 choice
379 	prompt "Tegra30 board select"
380-	optional
381
382 config TARGET_APALIS_T30
383 	bool "Toradex Apalis T30 board"
384diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
385index 1de5b07..6b0e295 100644
386--- a/arch/arm/mach-zynq/Kconfig
387+++ b/arch/arm/mach-zynq/Kconfig
388@@ -10,7 +10,6 @@ config ZYNQ_CUSTOM_INIT
389
390 choice
391 	prompt "Xilinx Zynq board select"
392-	optional
393
394 config TARGET_ZYNQ_ZED
395 	bool "Zynq ZedBoard"
396diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
397index eb33774..801b9cc 100644
398--- a/arch/avr32/Kconfig
399+++ b/arch/avr32/Kconfig
400@@ -6,7 +6,6 @@ config SYS_ARCH
401
402 choice
403 	prompt "Target select"
404-	optional
405
406 config TARGET_ATNGW100
407 	bool "Support atngw100"
408diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
409index 0a2fb4d..31913fe 100644
410--- a/arch/blackfin/Kconfig
411+++ b/arch/blackfin/Kconfig
412@@ -6,7 +6,6 @@ config SYS_ARCH
413
414 choice
415 	prompt "Target select"
416-	optional
417
418 config TARGET_BCT_BRETTL2
419 	bool "Support bct-brettl2"
420diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
421index 26509b7..69cb0f7 100644
422--- a/arch/m68k/Kconfig
423+++ b/arch/m68k/Kconfig
424@@ -114,7 +114,6 @@ config M548x
425
426 choice
427 	prompt "Target select"
428-	optional
429
430 config TARGET_M52277EVB
431 	bool "Support M52277EVB"
432diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
433index 077b2a7..6f419f0 100644
434--- a/arch/microblaze/Kconfig
435+++ b/arch/microblaze/Kconfig
436@@ -6,7 +6,6 @@ config SYS_ARCH
437
438 choice
439 	prompt "Target select"
440-	optional
441
442 config TARGET_MICROBLAZE_GENERIC
443 	bool "Support microblaze-generic"
444diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
445index 7f7e258..87b94ac 100644
446--- a/arch/mips/Kconfig
447+++ b/arch/mips/Kconfig
448@@ -10,7 +10,6 @@ config SYS_CPU
449
450 choice
451 	prompt "Target select"
452-	optional
453
454 config TARGET_QEMU_MIPS
455 	bool "Support qemu-mips"
456diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
457index 98b0282..81b0a01 100644
458--- a/arch/nds32/Kconfig
459+++ b/arch/nds32/Kconfig
460@@ -6,7 +6,6 @@ config SYS_ARCH
461
462 choice
463 	prompt "Target select"
464-	optional
465
466 config TARGET_ADP_AG101
467 	bool "Support adp-ag101"
468diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
469index 8ae7f6e..b3be7b5 100644
470--- a/arch/nios2/Kconfig
471+++ b/arch/nios2/Kconfig
472@@ -6,7 +6,6 @@ config SYS_ARCH
473
474 choice
475 	prompt "Target select"
476-	optional
477
478 config TARGET_NIOS2_GENERIC
479 	bool "Support nios2-generic"
480diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
481index 11014d1..4d62b4c 100644
482--- a/arch/openrisc/Kconfig
483+++ b/arch/openrisc/Kconfig
484@@ -6,7 +6,6 @@ config SYS_ARCH
485
486 choice
487 	prompt "Target select"
488-	optional
489
490 config TARGET_OPENRISC_GENERIC
491 	bool "Support openrisc-generic"
492diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
493index 3b3f446..8e5a3e2 100644
494--- a/arch/powerpc/Kconfig
495+++ b/arch/powerpc/Kconfig
496@@ -6,7 +6,6 @@ config SYS_ARCH
497
498 choice
499 	prompt "CPU select"
500-	optional
501
502 config MPC512X
503 	bool "MPC512X"
504diff --git a/arch/powerpc/cpu/mpc512x/Kconfig b/arch/powerpc/cpu/mpc512x/Kconfig
505index 53450ae..a0f0ede 100644
506--- a/arch/powerpc/cpu/mpc512x/Kconfig
507+++ b/arch/powerpc/cpu/mpc512x/Kconfig
508@@ -6,7 +6,6 @@ config SYS_CPU
509
510 choice
511 	prompt "Target select"
512-	optional
513
514 config TARGET_PDM360NG
515 	bool "Support pdm360ng"
516diff --git a/arch/powerpc/cpu/mpc5xx/Kconfig b/arch/powerpc/cpu/mpc5xx/Kconfig
517index 5275447..aad4a7c 100644
518--- a/arch/powerpc/cpu/mpc5xx/Kconfig
519+++ b/arch/powerpc/cpu/mpc5xx/Kconfig
520@@ -6,7 +6,6 @@ config SYS_CPU
521
522 choice
523 	prompt "Target select"
524-	optional
525
526 config TARGET_CMI_MPC5XX
527 	bool "Support cmi_mpc5xx"
528diff --git a/arch/powerpc/cpu/mpc5xxx/Kconfig b/arch/powerpc/cpu/mpc5xxx/Kconfig
529index 5d49228..eec9d7d 100644
530--- a/arch/powerpc/cpu/mpc5xxx/Kconfig
531+++ b/arch/powerpc/cpu/mpc5xxx/Kconfig
532@@ -6,7 +6,6 @@ config SYS_CPU
533
534 choice
535 	prompt "Target select"
536-	optional
537
538 config TARGET_A3M071
539 	bool "Support a3m071"
540diff --git a/arch/powerpc/cpu/mpc8260/Kconfig b/arch/powerpc/cpu/mpc8260/Kconfig
541index e93732d..55941c8 100644
542--- a/arch/powerpc/cpu/mpc8260/Kconfig
543+++ b/arch/powerpc/cpu/mpc8260/Kconfig
544@@ -6,7 +6,6 @@ config SYS_CPU
545
546 choice
547 	prompt "Target select"
548-	optional
549
550 config TARGET_KM82XX
551 	bool "Support km82xx"
552diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
553index 3fb901f..88a3bd6 100644
554--- a/arch/powerpc/cpu/mpc83xx/Kconfig
555+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
556@@ -6,7 +6,6 @@ config SYS_CPU
557
558 choice
559 	prompt "Target select"
560-	optional
561
562 config TARGET_MPC8308_P1M
563 	bool "Support mpc8308_p1m"
564diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
565index 3e8d0b1..aff5fdb 100644
566--- a/arch/powerpc/cpu/mpc85xx/Kconfig
567+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
568@@ -6,7 +6,6 @@ config SYS_CPU
569
570 choice
571 	prompt "Target select"
572-	optional
573
574 config TARGET_SBC8548
575 	bool "Support sbc8548"
576diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig
577index fe1859d..14e8b1a 100644
578--- a/arch/powerpc/cpu/mpc86xx/Kconfig
579+++ b/arch/powerpc/cpu/mpc86xx/Kconfig
580@@ -6,7 +6,6 @@ config SYS_CPU
581
582 choice
583 	prompt "Target select"
584-	optional
585
586 config TARGET_SBC8641D
587 	bool "Support sbc8641d"
588diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig
589index 79cee35..e8bcbe9 100644
590--- a/arch/powerpc/cpu/mpc8xx/Kconfig
591+++ b/arch/powerpc/cpu/mpc8xx/Kconfig
592@@ -6,7 +6,6 @@ config SYS_CPU
593
594 choice
595 	prompt "Target select"
596-	optional
597
598 config TARGET_TQM823L
599 	bool "Support TQM823L"
600diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
601index 10b86e0..4d5954a 100644
602--- a/arch/powerpc/cpu/ppc4xx/Kconfig
603+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
604@@ -6,7 +6,6 @@ config SYS_CPU
605
606 choice
607 	prompt "Target select"
608-	optional
609
610 config TARGET_CSB272
611 	bool "Support csb272"
612diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
613index 6ac22af..ff8f5b5 100644
614--- a/arch/sh/Kconfig
615+++ b/arch/sh/Kconfig
616@@ -29,7 +29,6 @@ config SH_32BIT
617
618 choice
619 	prompt "Target select"
620-	optional
621
622 config TARGET_RSK7203
623 	bool "RSK+ 7203"
624diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
625index 04dc08f..2df09b2 100644
626--- a/arch/sparc/Kconfig
627+++ b/arch/sparc/Kconfig
628@@ -14,7 +14,6 @@ config LEON3
629
630 choice
631 	prompt "Board select"
632-	optional
633
634 config TARGET_GRSIM_LEON2
635 	bool "GRSIM simulating a LEON2 board"
636diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
637index a655dbc..ef66ad4 100644
638--- a/board/amcc/canyonlands/Kconfig
639+++ b/board/amcc/canyonlands/Kconfig
640@@ -11,7 +11,6 @@ config SYS_CONFIG_NAME
641
642 choice BOARD_TYPE
643 	prompt "Select which board to build for"
644-	optional
645
646 config CANYONLANDS
647 	bool "Glacier"
648diff --git a/board/coreboot/Kconfig b/board/coreboot/Kconfig
649index ede6065..dc9b70f 100644
650--- a/board/coreboot/Kconfig
651+++ b/board/coreboot/Kconfig
652@@ -8,7 +8,6 @@ if VENDOR_COREBOOT
653
654 choice
655 	prompt "Mainboard model"
656-	optional
657
658 config TARGET_COREBOOT
659 	bool "coreboot"
660diff --git a/board/dbau1x00/Kconfig b/board/dbau1x00/Kconfig
661index b813adb..1286e45 100644
662--- a/board/dbau1x00/Kconfig
663+++ b/board/dbau1x00/Kconfig
664@@ -13,7 +13,6 @@ menu "dbau1x00 board options"
665
666 choice
667 	prompt "Select au1x00 SoC type"
668-	optional
669
670 config DBAU1100
671 	bool "Select AU1100"
672diff --git a/board/google/Kconfig b/board/google/Kconfig
673index e9559c9..302f68e 100644
674--- a/board/google/Kconfig
675+++ b/board/google/Kconfig
676@@ -8,7 +8,6 @@ if VENDOR_GOOGLE
677
678 choice
679 	prompt "Mainboard model"
680-	optional
681
682 config TARGET_CHROMEBOOK_LINK
683 	bool "Chromebook link"
684diff --git a/board/intel/Kconfig b/board/intel/Kconfig
685index 3d9ecf0..7fe21b9 100644
686--- a/board/intel/Kconfig
687+++ b/board/intel/Kconfig
688@@ -8,7 +8,6 @@ if VENDOR_INTEL
689
690 choice
691 	prompt "Mainboard model"
692-	optional
693
694 config TARGET_CROWNBAY
695 	bool "Crown Bay"
696diff --git a/board/micronas/vct/Kconfig b/board/micronas/vct/Kconfig
697index c518079..288a1ae 100644
698--- a/board/micronas/vct/Kconfig
699+++ b/board/micronas/vct/Kconfig
700@@ -13,7 +13,6 @@ menu "vct board options"
701
702 choice
703 	prompt "Board variant"
704-	optional
705
706 config VCT_PLATINUM
707 	bool "Enable VCT_PLATINUM"
708diff --git a/board/seco/Kconfig b/board/seco/Kconfig
709index af16697..dcb1ac8 100644
710--- a/board/seco/Kconfig
711+++ b/board/seco/Kconfig
712@@ -2,7 +2,6 @@ if TARGET_SECOMX6
713
714 choice
715 	prompt "SECO i.MX6 Board variant"
716-	optional
717
718 config SECOMX6_Q7
719 	bool "Q7"
720@@ -17,7 +16,6 @@ endchoice
721
722 choice
723 	prompt "SECO i.MX6 SoC variant"
724-	optional
725
726 config SECOMX6Q
727 	bool "i.MX6Q"
728diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
729index 2a1cd3c..808de26 100644
730--- a/board/sunxi/Kconfig
731+++ b/board/sunxi/Kconfig
732@@ -18,7 +18,6 @@ config SUNXI_GEN_SUN6I
733
734 choice
735 	prompt "Sunxi SoC Variant"
736-	optional
737
738 config MACH_SUN4I
739 	bool "sun4i (Allwinner A10)"
740--
7412.4.3
742
743