Browse Source

arch: Make board selection choices optional

By making the board selections optional, every defconfig will include
the board selection when running savedefconfig so if a new board is
added to the top of the list of choices the former top's defconfig will
still be correct.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Cc: Tom Rini <trini@konsulko.com>
Joe Hershberger 9 years ago
parent
commit
a26cd04920
54 changed files with 56 additions and 0 deletions
  1. 1 0
      arch/arc/Kconfig
  2. 1 0
      arch/arm/Kconfig
  3. 1 0
      arch/arm/cpu/armv7/exynos/Kconfig
  4. 1 0
      arch/arm/cpu/armv7/mx5/Kconfig
  5. 1 0
      arch/arm/cpu/armv7/mx6/Kconfig
  6. 1 0
      arch/arm/cpu/armv7/omap3/Kconfig
  7. 1 0
      arch/arm/cpu/armv7/omap4/Kconfig
  8. 1 0
      arch/arm/cpu/armv7/omap5/Kconfig
  9. 1 0
      arch/arm/cpu/armv7/rmobile/Kconfig
  10. 1 0
      arch/arm/cpu/armv7/s5pc1xx/Kconfig
  11. 1 0
      arch/arm/mach-at91/Kconfig
  12. 1 0
      arch/arm/mach-bcm283x/Kconfig
  13. 1 0
      arch/arm/mach-davinci/Kconfig
  14. 2 0
      arch/arm/mach-integrator/Kconfig
  15. 1 0
      arch/arm/mach-keystone/Kconfig
  16. 1 0
      arch/arm/mach-kirkwood/Kconfig
  17. 1 0
      arch/arm/mach-nomadik/Kconfig
  18. 1 0
      arch/arm/mach-orion5x/Kconfig
  19. 1 0
      arch/arm/mach-socfpga/Kconfig
  20. 1 0
      arch/arm/mach-tegra/Kconfig
  21. 1 0
      arch/arm/mach-tegra/tegra114/Kconfig
  22. 1 0
      arch/arm/mach-tegra/tegra124/Kconfig
  23. 1 0
      arch/arm/mach-tegra/tegra20/Kconfig
  24. 1 0
      arch/arm/mach-tegra/tegra30/Kconfig
  25. 1 0
      arch/arm/mach-uniphier/Kconfig
  26. 1 0
      arch/arm/mach-zynq/Kconfig
  27. 1 0
      arch/avr32/Kconfig
  28. 1 0
      arch/blackfin/Kconfig
  29. 1 0
      arch/m68k/Kconfig
  30. 1 0
      arch/microblaze/Kconfig
  31. 1 0
      arch/mips/Kconfig
  32. 1 0
      arch/nds32/Kconfig
  33. 1 0
      arch/nios2/Kconfig
  34. 1 0
      arch/openrisc/Kconfig
  35. 1 0
      arch/powerpc/Kconfig
  36. 1 0
      arch/powerpc/cpu/mpc512x/Kconfig
  37. 1 0
      arch/powerpc/cpu/mpc5xx/Kconfig
  38. 1 0
      arch/powerpc/cpu/mpc5xxx/Kconfig
  39. 1 0
      arch/powerpc/cpu/mpc8260/Kconfig
  40. 1 0
      arch/powerpc/cpu/mpc83xx/Kconfig
  41. 1 0
      arch/powerpc/cpu/mpc85xx/Kconfig
  42. 1 0
      arch/powerpc/cpu/mpc86xx/Kconfig
  43. 1 0
      arch/powerpc/cpu/mpc8xx/Kconfig
  44. 1 0
      arch/powerpc/cpu/ppc4xx/Kconfig
  45. 1 0
      arch/sh/Kconfig
  46. 1 0
      arch/sparc/Kconfig
  47. 1 0
      board/amcc/canyonlands/Kconfig
  48. 1 0
      board/coreboot/Kconfig
  49. 1 0
      board/dbau1x00/Kconfig
  50. 1 0
      board/google/Kconfig
  51. 1 0
      board/intel/Kconfig
  52. 1 0
      board/micronas/vct/Kconfig
  53. 2 0
      board/seco/Kconfig
  54. 1 0
      board/sunxi/Kconfig

+ 1 - 0
arch/arc/Kconfig

@@ -132,6 +132,7 @@ config ARC_CACHE_LINE_SHIFT
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_DUMMY
 	bool "Dummy target"

+ 1 - 0
arch/arm/Kconfig

@@ -64,6 +64,7 @@ config SEMIHOSTING
 
 choice
 	prompt "Target select"
+	optional
 
 config ARCH_AT91
 	bool "Atmel AT91"

+ 1 - 0
arch/arm/cpu/armv7/exynos/Kconfig

@@ -2,6 +2,7 @@ if ARCH_EXYNOS
 
 choice
 	prompt "EXYNOS board select"
+	optional
 
 config TARGET_SMDKV310
 	select SUPPORT_SPL

+ 1 - 0
arch/arm/cpu/armv7/mx5/Kconfig

@@ -12,6 +12,7 @@ config MX53
 
 choice
 	prompt "MX5 board select"
+	optional
 
 config TARGET_USBARMORY
 	bool "Support USB armory"

+ 1 - 0
arch/arm/cpu/armv7/mx6/Kconfig

@@ -27,6 +27,7 @@ config MX6SX
 
 choice
 	prompt "MX6 board select"
+	optional
 
 config TARGET_SECOMX6
 	bool "Support secomx6 boards"

+ 1 - 0
arch/arm/cpu/armv7/omap3/Kconfig

@@ -2,6 +2,7 @@ if OMAP34XX
 
 choice
 	prompt "OMAP3 board select"
+	optional
 
 config TARGET_AM3517_EVM
 	bool "AM3517 EVM"

+ 1 - 0
arch/arm/cpu/armv7/omap4/Kconfig

@@ -2,6 +2,7 @@ if OMAP44XX
 
 choice
 	prompt "OMAP4 board select"
+	optional
 
 config TARGET_DUOVERO
 	bool "OMAP4430 Gumstix Duovero"

+ 1 - 0
arch/arm/cpu/armv7/omap5/Kconfig

@@ -2,6 +2,7 @@ if OMAP54XX
 
 choice
 	prompt "OMAP5 board select"
+	optional
 
 config TARGET_CM_T54
 	bool "CompuLab CM-T54"

+ 1 - 0
arch/arm/cpu/armv7/rmobile/Kconfig

@@ -2,6 +2,7 @@ if RMOBILE
 
 choice
 	prompt "Renesus ARM SoCs board select"
+	optional
 
 config TARGET_ARMADILLO_800EVA
 	bool "armadillo 800 eva board"

+ 1 - 0
arch/arm/cpu/armv7/s5pc1xx/Kconfig

@@ -2,6 +2,7 @@ if ARCH_S5PC1XX
 
 choice
 	prompt "S5PC1XX board select"
+	optional
 
 config TARGET_S5P_GONI
 	bool "S5P Goni board"

+ 1 - 0
arch/arm/mach-at91/Kconfig

@@ -2,6 +2,7 @@ if ARCH_AT91
 
 choice
 	prompt "Atmel AT91 board select"
+	optional
 
 config TARGET_AT91RM9200EK
 	bool "Atmel AT91RM9200 evaluation kit"

+ 1 - 0
arch/arm/mach-bcm283x/Kconfig

@@ -3,6 +3,7 @@ menu "Broadcom BCM283X family"
 
 choice
 	prompt "Broadcom BCM283X board select"
+	optional
 
 config TARGET_RPI
 	bool "Raspberry Pi"

+ 1 - 0
arch/arm/mach-davinci/Kconfig

@@ -2,6 +2,7 @@ if ARCH_DAVINCI
 
 choice
 	prompt "DaVinci board select"
+	optional
 
 config TARGET_ENBW_CMC
 	bool "EnBW CMC board"

+ 2 - 0
arch/arm/mach-integrator/Kconfig

@@ -3,6 +3,7 @@ menu "Integrator Options"
 
 choice
 	prompt "Integrator platform select"
+	optional
 
 config ARCH_INTEGRATOR_AP
 	bool "Support Integrator/AP platform"
@@ -18,6 +19,7 @@ config ARCH_CINTEGRATOR
 
 choice
 	prompt "Integrator core module select"
+	optional
 
 config CM720T
 	bool "Core Module for ARM720T"

+ 1 - 0
arch/arm/mach-keystone/Kconfig

@@ -2,6 +2,7 @@ if ARCH_KEYSTONE
 
 choice
 	prompt "TI Keystone board select"
+	optional
 
 config TARGET_K2HK_EVM
 	bool "TI Keystone 2 Kepler/Hawking EVM"

+ 1 - 0
arch/arm/mach-kirkwood/Kconfig

@@ -2,6 +2,7 @@ if KIRKWOOD
 
 choice
 	prompt "Marvell Kirkwood board select"
+	optional
 
 config TARGET_OPENRD
 	bool "Marvell OpenRD Board"

+ 1 - 0
arch/arm/mach-nomadik/Kconfig

@@ -2,6 +2,7 @@ if ARCH_NOMADIK
 
 choice
 	prompt "Nomadik board select"
+	optional
 
 config NOMADIK_NHK8815
 	bool "ST 8815 Nomadik Hardware Kit"

+ 1 - 0
arch/arm/mach-orion5x/Kconfig

@@ -2,6 +2,7 @@ if ORION5X
 
 choice
 	prompt "Marvell Orion board select"
+	optional
 
 config TARGET_EDMINIV2
 	bool "LaCie Ethernet Disk mini V2"

+ 1 - 0
arch/arm/mach-socfpga/Kconfig

@@ -2,6 +2,7 @@ if ARCH_SOCFPGA
 
 choice
 	prompt "Altera SOCFPGA board select"
+	optional
 
 config TARGET_SOCFPGA_ARRIA5
 	bool "Altera SOCFPGA Arria V"

+ 1 - 0
arch/arm/mach-tegra/Kconfig

@@ -2,6 +2,7 @@ if TEGRA
 
 choice
 	prompt "Tegra SoC select"
+	optional
 
 config TEGRA20
 	bool "Tegra20 family"

+ 1 - 0
arch/arm/mach-tegra/tegra114/Kconfig

@@ -2,6 +2,7 @@ if TEGRA114
 
 choice
 	prompt "Tegra114 board select"
+	optional
 
 config TARGET_DALMORE
 	bool "NVIDIA Tegra114 Dalmore evaluation board"

+ 1 - 0
arch/arm/mach-tegra/tegra124/Kconfig

@@ -2,6 +2,7 @@ if TEGRA124
 
 choice
 	prompt "Tegra124 board select"
+	optional
 
 config TARGET_JETSON_TK1
 	bool "NVIDIA Tegra124 Jetson TK1 board"

+ 1 - 0
arch/arm/mach-tegra/tegra20/Kconfig

@@ -2,6 +2,7 @@ if TEGRA20
 
 choice
 	prompt "Tegra20 board select"
+	optional
 
 config TARGET_HARMONY
 	bool "NVIDIA Tegra20 Harmony evaluation board"

+ 1 - 0
arch/arm/mach-tegra/tegra30/Kconfig

@@ -2,6 +2,7 @@ if TEGRA30
 
 choice
 	prompt "Tegra30 board select"
+	optional
 
 config TARGET_APALIS_T30
 	bool "Toradex Apalis T30 board"

+ 1 - 0
arch/arm/mach-uniphier/Kconfig

@@ -9,6 +9,7 @@ config UNIPHIER_SMP
 
 choice
 	prompt "UniPhier SoC select"
+	optional
 
 config MACH_PH1_PRO4
 	bool "PH1-Pro4"

+ 1 - 0
arch/arm/mach-zynq/Kconfig

@@ -2,6 +2,7 @@ if ARCH_ZYNQ
 
 choice
 	prompt "Xilinx Zynq board select"
+	optional
 
 config TARGET_ZYNQ_ZED
 	bool "Zynq ZedBoard"

+ 1 - 0
arch/avr32/Kconfig

@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_ATNGW100
 	bool "Support atngw100"

+ 1 - 0
arch/blackfin/Kconfig

@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_BCT_BRETTL2
 	bool "Support bct-brettl2"

+ 1 - 0
arch/m68k/Kconfig

@@ -114,6 +114,7 @@ config M548x
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_M52277EVB
 	bool "Support M52277EVB"

+ 1 - 0
arch/microblaze/Kconfig

@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_MICROBLAZE_GENERIC
 	bool "Support microblaze-generic"

+ 1 - 0
arch/mips/Kconfig

@@ -13,6 +13,7 @@ config USE_PRIVATE_LIBGCC
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_QEMU_MIPS
 	bool "Support qemu-mips"

+ 1 - 0
arch/nds32/Kconfig

@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_ADP_AG101
 	bool "Support adp-ag101"

+ 1 - 0
arch/nios2/Kconfig

@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_NIOS2_GENERIC
 	bool "Support nios2-generic"

+ 1 - 0
arch/openrisc/Kconfig

@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_OPENRISC_GENERIC
 	bool "Support openrisc-generic"

+ 1 - 0
arch/powerpc/Kconfig

@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
 	prompt "CPU select"
+	optional
 
 config MPC512X
 	bool "MPC512X"

+ 1 - 0
arch/powerpc/cpu/mpc512x/Kconfig

@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_PDM360NG
 	bool "Support pdm360ng"

+ 1 - 0
arch/powerpc/cpu/mpc5xx/Kconfig

@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_CMI_MPC5XX
 	bool "Support cmi_mpc5xx"

+ 1 - 0
arch/powerpc/cpu/mpc5xxx/Kconfig

@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_A3M071
 	bool "Support a3m071"

+ 1 - 0
arch/powerpc/cpu/mpc8260/Kconfig

@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_KM82XX
 	bool "Support km82xx"

+ 1 - 0
arch/powerpc/cpu/mpc83xx/Kconfig

@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_MPC8308_P1M
 	bool "Support mpc8308_p1m"

+ 1 - 0
arch/powerpc/cpu/mpc85xx/Kconfig

@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_SBC8548
 	bool "Support sbc8548"

+ 1 - 0
arch/powerpc/cpu/mpc86xx/Kconfig

@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_SBC8641D
 	bool "Support sbc8641d"

+ 1 - 0
arch/powerpc/cpu/mpc8xx/Kconfig

@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_TQM823L
 	bool "Support TQM823L"

+ 1 - 0
arch/powerpc/cpu/ppc4xx/Kconfig

@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_CSB272
 	bool "Support csb272"

+ 1 - 0
arch/sh/Kconfig

@@ -29,6 +29,7 @@ config SH_32BIT
 
 choice
 	prompt "Target select"
+	optional
 
 config TARGET_RSK7203
 	bool "RSK+ 7203"

+ 1 - 0
arch/sparc/Kconfig

@@ -14,6 +14,7 @@ config LEON3
 
 choice
 	prompt "Board select"
+	optional
 
 config TARGET_GRSIM_LEON2
 	bool "GRSIM simulating a LEON2 board"

+ 1 - 0
board/amcc/canyonlands/Kconfig

@@ -11,6 +11,7 @@ config SYS_CONFIG_NAME
 
 choice BOARD_TYPE
 	prompt "Select which board to build for"
+	optional
 
 config CANYONLANDS
 	bool "Glacier"

+ 1 - 0
board/coreboot/Kconfig

@@ -8,6 +8,7 @@ if VENDOR_COREBOOT
 
 choice
 	prompt "Mainboard model"
+	optional
 
 config TARGET_COREBOOT
 	bool "coreboot"

+ 1 - 0
board/dbau1x00/Kconfig

@@ -13,6 +13,7 @@ menu "dbau1x00 board options"
 
 choice
 	prompt "Select au1x00 SoC type"
+	optional
 
 config DBAU1100
 	bool "Select AU1100"

+ 1 - 0
board/google/Kconfig

@@ -8,6 +8,7 @@ if VENDOR_GOOGLE
 
 choice
 	prompt "Mainboard model"
+	optional
 
 config TARGET_CHROMEBOOK_LINK
 	bool "Chromebook link"

+ 1 - 0
board/intel/Kconfig

@@ -8,6 +8,7 @@ if VENDOR_INTEL
 
 choice
 	prompt "Mainboard model"
+	optional
 
 config TARGET_CROWNBAY
 	bool "Crown Bay"

+ 1 - 0
board/micronas/vct/Kconfig

@@ -13,6 +13,7 @@ menu "vct board options"
 
 choice
 	prompt "Board variant"
+	optional
 
 config VCT_PLATINUM
 	bool "Enable VCT_PLATINUM"

+ 2 - 0
board/seco/Kconfig

@@ -2,6 +2,7 @@ if TARGET_SECOMX6
 
 choice
 	prompt "SECO i.MX6 Board variant"
+	optional
 
 config SECOMX6_Q7
 	bool "Q7"
@@ -16,6 +17,7 @@ endchoice
 
 choice
 	prompt "SECO i.MX6 SoC variant"
+	optional
 
 config SECOMX6Q
 	bool "i.MX6Q"

+ 1 - 0
board/sunxi/Kconfig

@@ -18,6 +18,7 @@ config SUNXI_GEN_SUN6I
 
 choice
 	prompt "Sunxi SoC Variant"
+	optional
 
 config MACH_SUN4I
 	bool "sun4i (Allwinner A10)"