]> git.sur5r.net Git - u-boot/commitdiff
arch: Make board selection choices optional
authorJoe Hershberger <joe.hershberger@ni.com>
Tue, 12 May 2015 19:46:23 +0000 (14:46 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 12 May 2015 22:10:02 +0000 (18:10 -0400)
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>
54 files changed:
arch/arc/Kconfig
arch/arm/Kconfig
arch/arm/cpu/armv7/exynos/Kconfig
arch/arm/cpu/armv7/mx5/Kconfig
arch/arm/cpu/armv7/mx6/Kconfig
arch/arm/cpu/armv7/omap3/Kconfig
arch/arm/cpu/armv7/omap4/Kconfig
arch/arm/cpu/armv7/omap5/Kconfig
arch/arm/cpu/armv7/rmobile/Kconfig
arch/arm/cpu/armv7/s5pc1xx/Kconfig
arch/arm/mach-at91/Kconfig
arch/arm/mach-bcm283x/Kconfig
arch/arm/mach-davinci/Kconfig
arch/arm/mach-integrator/Kconfig
arch/arm/mach-keystone/Kconfig
arch/arm/mach-kirkwood/Kconfig
arch/arm/mach-nomadik/Kconfig
arch/arm/mach-orion5x/Kconfig
arch/arm/mach-socfpga/Kconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/tegra114/Kconfig
arch/arm/mach-tegra/tegra124/Kconfig
arch/arm/mach-tegra/tegra20/Kconfig
arch/arm/mach-tegra/tegra30/Kconfig
arch/arm/mach-uniphier/Kconfig
arch/arm/mach-zynq/Kconfig
arch/avr32/Kconfig
arch/blackfin/Kconfig
arch/m68k/Kconfig
arch/microblaze/Kconfig
arch/mips/Kconfig
arch/nds32/Kconfig
arch/nios2/Kconfig
arch/openrisc/Kconfig
arch/powerpc/Kconfig
arch/powerpc/cpu/mpc512x/Kconfig
arch/powerpc/cpu/mpc5xx/Kconfig
arch/powerpc/cpu/mpc5xxx/Kconfig
arch/powerpc/cpu/mpc8260/Kconfig
arch/powerpc/cpu/mpc83xx/Kconfig
arch/powerpc/cpu/mpc85xx/Kconfig
arch/powerpc/cpu/mpc86xx/Kconfig
arch/powerpc/cpu/mpc8xx/Kconfig
arch/powerpc/cpu/ppc4xx/Kconfig
arch/sh/Kconfig
arch/sparc/Kconfig
board/amcc/canyonlands/Kconfig
board/coreboot/Kconfig
board/dbau1x00/Kconfig
board/google/Kconfig
board/intel/Kconfig
board/micronas/vct/Kconfig
board/seco/Kconfig
board/sunxi/Kconfig

index c044ad4de61d67abe7c33a58b98110adcb243009..85fddd2f878ff4616d8ae114d475e6617d388055 100644 (file)
@@ -132,6 +132,7 @@ config ARC_CACHE_LINE_SHIFT
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_DUMMY
        bool "Dummy target"
index cee31265abc17a8a8d0fc5ffcaf7d28ec2017fed..1c7cf7f6d4bcd6becf56e5647ce8f23d7783a484 100644 (file)
@@ -64,6 +64,7 @@ config SEMIHOSTING
 
 choice
        prompt "Target select"
+       optional
 
 config ARCH_AT91
        bool "Atmel AT91"
index f6084ac4769f00fe690f8543caa88698d170ea39..c61442578d565e7e5f67b9b6a08532778c26bc8d 100644 (file)
@@ -2,6 +2,7 @@ if ARCH_EXYNOS
 
 choice
        prompt "EXYNOS board select"
+       optional
 
 config TARGET_SMDKV310
        select SUPPORT_SPL
index 2d6c0ce29ddd2be4ea834536507921f8fa0279d7..9f250c6b1e6fba5e4400765c5a2fe6fc8f6e7d4e 100644 (file)
@@ -12,6 +12,7 @@ config MX53
 
 choice
        prompt "MX5 board select"
+       optional
 
 config TARGET_USBARMORY
        bool "Support USB armory"
index 076ba520c664b3ec7971ef8966ea9d015ad6e1b1..1282be3418c332a2ab166e0d9bd52ec11ac8008c 100644 (file)
@@ -27,6 +27,7 @@ config MX6SX
 
 choice
        prompt "MX6 board select"
+       optional
 
 config TARGET_SECOMX6
        bool "Support secomx6 boards"
index cc82c5000e76edaf5544274c288a8f8807bc8357..b32a6b0e5f59b001ff7aab532c30bf241e6bb6bf 100644 (file)
@@ -2,6 +2,7 @@ if OMAP34XX
 
 choice
        prompt "OMAP3 board select"
+       optional
 
 config TARGET_AM3517_EVM
        bool "AM3517 EVM"
index eccf897258d503e248a1141e966584a48fee0b2a..df27ea10a2f4c413dee34f6129870c0b1075cad6 100644 (file)
@@ -2,6 +2,7 @@ if OMAP44XX
 
 choice
        prompt "OMAP4 board select"
+       optional
 
 config TARGET_DUOVERO
        bool "OMAP4430 Gumstix Duovero"
index aca862d2b28ac523704d615f31d14d6b75b9182d..20c3bd963bc67fc322de7fc5778157ca1a26f9cf 100644 (file)
@@ -2,6 +2,7 @@ if OMAP54XX
 
 choice
        prompt "OMAP5 board select"
+       optional
 
 config TARGET_CM_T54
        bool "CompuLab CM-T54"
index 57dcceccc7cea3390a898e4b2298bb4fd882340c..ae23078395e8af71317f43399401cb72d03f2d3f 100644 (file)
@@ -2,6 +2,7 @@ if RMOBILE
 
 choice
        prompt "Renesus ARM SoCs board select"
+       optional
 
 config TARGET_ARMADILLO_800EVA
        bool "armadillo 800 eva board"
index bc738138328020020bad3a04ff8aea2d179b1dd2..04acdaad79ce4d4320e8f757f0a3cee89815b8c0 100644 (file)
@@ -2,6 +2,7 @@ if ARCH_S5PC1XX
 
 choice
        prompt "S5PC1XX board select"
+       optional
 
 config TARGET_S5P_GONI
        bool "S5P Goni board"
index b660a5b9ebcf9123f6aa65337421c75dc03ec284..7dfa520007d4a7cd0f471b28a9e30305b628be05 100644 (file)
@@ -2,6 +2,7 @@ if ARCH_AT91
 
 choice
        prompt "Atmel AT91 board select"
+       optional
 
 config TARGET_AT91RM9200EK
        bool "Atmel AT91RM9200 evaluation kit"
index c740180e68da8de01bf63fc3a37f3850894d9c36..99779df728079c74a554cb64022889b52cb145cc 100644 (file)
@@ -3,6 +3,7 @@ menu "Broadcom BCM283X family"
 
 choice
        prompt "Broadcom BCM283X board select"
+       optional
 
 config TARGET_RPI
        bool "Raspberry Pi"
index 3ef55d3eaf53bc620d6e42e200b7891483a35b62..e6cb390d1722eab86cfcb3e45874749148b93b26 100644 (file)
@@ -2,6 +2,7 @@ if ARCH_DAVINCI
 
 choice
        prompt "DaVinci board select"
+       optional
 
 config TARGET_ENBW_CMC
        bool "EnBW CMC board"
index 8ffc5441fc69786a6b65ab346ff27744ed75482f..c54d69db0e4276a3e4236f24668fa87da20fe153 100644 (file)
@@ -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"
index 134ae87fe1ef79aa28c10267969caccecece4b3c..67f1a33241790e93f4c3959d68addbe2e0b9d57a 100644 (file)
@@ -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"
index 45c6687d0bddbfc69fe9eaaf485c02b5ee1bdfff..1261885dad775b680a2795336b31d83cf8e29297 100644 (file)
@@ -2,6 +2,7 @@ if KIRKWOOD
 
 choice
        prompt "Marvell Kirkwood board select"
+       optional
 
 config TARGET_OPENRD
        bool "Marvell OpenRD Board"
index 265f33646919c9c041a402fe435c16a0756dc7cb..ba72a4105d92326699ba9abc527d4495ef5dc54d 100644 (file)
@@ -2,6 +2,7 @@ if ARCH_NOMADIK
 
 choice
        prompt "Nomadik board select"
+       optional
 
 config NOMADIK_NHK8815
        bool "ST 8815 Nomadik Hardware Kit"
index 291c511ba85e7794c4ee4a4d2ad7722b560c3aa1..7644b8dc854b3ac5086bfc7cce41c8f95b6528ca 100644 (file)
@@ -2,6 +2,7 @@ if ORION5X
 
 choice
        prompt "Marvell Orion board select"
+       optional
 
 config TARGET_EDMINIV2
        bool "LaCie Ethernet Disk mini V2"
index 204efca12b161abf3d3c93590ae19432497860ab..e46c3489959c57ed39f701fd4db7201fc8fdb3d3 100644 (file)
@@ -2,6 +2,7 @@ if ARCH_SOCFPGA
 
 choice
        prompt "Altera SOCFPGA board select"
+       optional
 
 config TARGET_SOCFPGA_ARRIA5
        bool "Altera SOCFPGA Arria V"
index 8bab594f49e794ebfc3c6e2fba7b62524007f231..9b4287193523cd400dc4cd3ff176ad9ca442625c 100644 (file)
@@ -2,6 +2,7 @@ if TEGRA
 
 choice
        prompt "Tegra SoC select"
+       optional
 
 config TEGRA20
        bool "Tegra20 family"
index 31012bc7702930c82fcaf4a00845e809a7dc9b6e..1047b9227f71a106e822c38fb80090b0c159f961 100644 (file)
@@ -2,6 +2,7 @@ if TEGRA114
 
 choice
        prompt "Tegra114 board select"
+       optional
 
 config TARGET_DALMORE
        bool "NVIDIA Tegra114 Dalmore evaluation board"
index 88f627c9326cd432d3948bd06d4404e2fe34c670..36bb636db4cdacbd058f2d8a84cbdd26d6dc22fd 100644 (file)
@@ -2,6 +2,7 @@ if TEGRA124
 
 choice
        prompt "Tegra124 board select"
+       optional
 
 config TARGET_JETSON_TK1
        bool "NVIDIA Tegra124 Jetson TK1 board"
index 7f09f819cc0e03dd32d54e0ef10170baaedda3d5..1bb8dff5b2332b6dea59e726723e8ff6355f7fd1 100644 (file)
@@ -2,6 +2,7 @@ if TEGRA20
 
 choice
        prompt "Tegra20 board select"
+       optional
 
 config TARGET_HARMONY
        bool "NVIDIA Tegra20 Harmony evaluation board"
index 3abdc7ba17392a702a5c30a3fc6ade7beaba3e52..e78331e4cb3af51f39c932080808c5d52335e7ac 100644 (file)
@@ -2,6 +2,7 @@ if TEGRA30
 
 choice
        prompt "Tegra30 board select"
+       optional
 
 config TARGET_APALIS_T30
        bool "Toradex Apalis T30 board"
index 288e6aba79502575a036848b7172b6a94a892dfe..2d27c49673bb14fcf5f4508ccefa56bd56c415d2 100644 (file)
@@ -9,6 +9,7 @@ config UNIPHIER_SMP
 
 choice
        prompt "UniPhier SoC select"
+       optional
 
 config MACH_PH1_PRO4
        bool "PH1-Pro4"
index 1046ece7845258abe93adf6bc17f66a715c6ab1c..483c3a07fa86c16675af5e8f6183da6649cb7713 100644 (file)
@@ -2,6 +2,7 @@ if ARCH_ZYNQ
 
 choice
        prompt "Xilinx Zynq board select"
+       optional
 
 config TARGET_ZYNQ_ZED
        bool "Zynq ZedBoard"
index 66de2ad7ef1d0f6510ff4b1b5931f66e26db78e5..c69654c9934a8d47d6976b8a0707150eb554c12b 100644 (file)
@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_ATNGW100
        bool "Support atngw100"
index 31913fe29f4ecad9cc12d84f91618696f061b082..0a2fb4d4aa68f447c427c1a83c1540ce8bc60650 100644 (file)
@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_BCT_BRETTL2
        bool "Support bct-brettl2"
index 69cb0f73eb6b738463ebf1fc908f20ed1d373d7b..26509b73c64773ae5716a744b8b9e39631e2a89a 100644 (file)
@@ -114,6 +114,7 @@ config M548x
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_M52277EVB
        bool "Support M52277EVB"
index 6f419f050dd5c9da2df93a24ac8b5f90176d0eff..077b2a7d5ec1dd357bb8ccbfb88df93019efce5d 100644 (file)
@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_MICROBLAZE_GENERIC
        bool "Support microblaze-generic"
index b0a8a4357a4bf3bdaba9df4099300b2f34b3ad53..feb2f68474c0300e17f61e64188bfd2b115cb3c9 100644 (file)
@@ -13,6 +13,7 @@ config USE_PRIVATE_LIBGCC
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_QEMU_MIPS
        bool "Support qemu-mips"
index 81b0a0158f75eafaca07f828354d0a33ea86d344..98b02826297b851b1e9768d5a306ea0413083e11 100644 (file)
@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_ADP_AG101
        bool "Support adp-ag101"
index b3be7b56c3417721b85706d1be696b372a1a9e82..8ae7f6edd3715bb7f05d6a0048ae723ad1d6e42c 100644 (file)
@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_NIOS2_GENERIC
        bool "Support nios2-generic"
index 4d62b4c977497e9636ab731e7ac108353ed4423b..11014d1e32ce7089c48dafaa8619d7310ab35d2e 100644 (file)
@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_OPENRISC_GENERIC
        bool "Support openrisc-generic"
index 8e5a3e2074d31d8c7a386f071a78a0630deb4f2c..3b3f4463ba4ab34c2c5b60ecdbcb6244ce8afc37 100644 (file)
@@ -6,6 +6,7 @@ config SYS_ARCH
 
 choice
        prompt "CPU select"
+       optional
 
 config MPC512X
        bool "MPC512X"
index a0f0ede6f3d9a63945567523a2ba5162b96d2582..53450aeababfb72bad33d3b0f5f941608ea94fd7 100644 (file)
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_PDM360NG
        bool "Support pdm360ng"
index aad4a7cdd86c799d51d8bb9fd19b22b8ede8e6e5..5275447cf6c657d806acf180d6552c541296cda6 100644 (file)
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_CMI_MPC5XX
        bool "Support cmi_mpc5xx"
index eec9d7deac8952228e87752a437addb08a9b885d..5d4922870b75378a02dedcfb16427dbe44c264c8 100644 (file)
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_A3M071
        bool "Support a3m071"
index 55941c830b0da6868c2115a1b5291ab0b10eb345..e93732d058dc6ab2431231677373025b7d3fa503 100644 (file)
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_KM82XX
        bool "Support km82xx"
index 88a3bd6814aea83c0f86493d7dfa4db676069596..3fb901f2a1f3058f6451beb1f17c06b762a2790a 100644 (file)
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_MPC8308_P1M
        bool "Support mpc8308_p1m"
index aff5fdb5146f884dd6a02b72bc2b3254e5061453..3e8d0b1badd3bebc6e4c620b64d1feb37d0bea32 100644 (file)
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_SBC8548
        bool "Support sbc8548"
index 14e8b1aa66a3b25ff8fcdde22c8fa67e03754435..fe1859d206bc99e5875b6eef841d4de8c44cef65 100644 (file)
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_SBC8641D
        bool "Support sbc8641d"
index e8bcbe98a140d4e09e6bccee78aeb7c5fc0eb277..79cee35fb1277d4038df81ebf74db1e1bff00a70 100644 (file)
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_TQM823L
        bool "Support TQM823L"
index 4d5954a2459c919fa1aa2ece352d30f32056bb38..10b86e058ae38dcec3a4e55900d18a77a2bd61c3 100644 (file)
@@ -6,6 +6,7 @@ config SYS_CPU
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_CSB272
        bool "Support csb272"
index 2128f232647df2c0088d4f59436ea710b59c496b..2f7a2fe073bf25361cea0818a1c64c7a93e13205 100644 (file)
@@ -29,6 +29,7 @@ config SH_32BIT
 
 choice
        prompt "Target select"
+       optional
 
 config TARGET_RSK7203
        bool "RSK+ 7203"
index 2df09b2e50e3e18c5dacb9ce09f32f092c5ac54c..04dc08f41f3072b85739054cdaf7c633fa757806 100644 (file)
@@ -14,6 +14,7 @@ config LEON3
 
 choice
        prompt "Board select"
+       optional
 
 config TARGET_GRSIM_LEON2
        bool "GRSIM simulating a LEON2 board"
index ef66ad49091cc3ffaf562927085d6a5c26896d0b..a655dbc31f7d809482a1868d2176fba478046dff 100644 (file)
@@ -11,6 +11,7 @@ config SYS_CONFIG_NAME
 
 choice BOARD_TYPE
        prompt "Select which board to build for"
+       optional
 
 config CANYONLANDS
        bool "Glacier"
index dc9b70f65db621c9028bc75f13e116bc5e242bd0..ede60654cdfaece947401fd34f04c325b061b7d2 100644 (file)
@@ -8,6 +8,7 @@ if VENDOR_COREBOOT
 
 choice
        prompt "Mainboard model"
+       optional
 
 config TARGET_COREBOOT
        bool "coreboot"
index 1286e4509f42f56ee4a65a8b5dc653aaaf00b4f9..b813adb840d1ab3a3e3a0101911a7b93b91325a3 100644 (file)
@@ -13,6 +13,7 @@ menu "dbau1x00 board options"
 
 choice
        prompt "Select au1x00 SoC type"
+       optional
 
 config DBAU1100
        bool "Select AU1100"
index 302f68e75e733a13487728e1fb7d6d8a189f5c1f..e9559c9080db0ade7534e50d3307351151658185 100644 (file)
@@ -8,6 +8,7 @@ if VENDOR_GOOGLE
 
 choice
        prompt "Mainboard model"
+       optional
 
 config TARGET_CHROMEBOOK_LINK
        bool "Chromebook link"
index 7fe21b983a4a4a3dd97160ed6b6ec1576d44ba02..3d9ecf06930bb641fc10651df73dc3203ff213ea 100644 (file)
@@ -8,6 +8,7 @@ if VENDOR_INTEL
 
 choice
        prompt "Mainboard model"
+       optional
 
 config TARGET_CROWNBAY
        bool "Crown Bay"
index 288a1aeb7058fb495fb4cecb42c22757ace7717a..c518079efaca962caa1e08c74db2d9ced4f5b05e 100644 (file)
@@ -13,6 +13,7 @@ menu "vct board options"
 
 choice
        prompt "Board variant"
+       optional
 
 config VCT_PLATINUM
        bool "Enable VCT_PLATINUM"
index dcb1ac81e02adf94b1f1ffbee4ab0fa2c2f62b01..af1669733f199f5cb8cd3881fce680294e2bbb25 100644 (file)
@@ -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"
index a60d0288fb67adfc0b88fed5f18496925f252685..c60c81d8c5eea0e7111ea960deb152c2d39f18d4 100644 (file)
@@ -18,6 +18,7 @@ config SUNXI_GEN_SUN6I
 
 choice
        prompt "Sunxi SoC Variant"
+       optional
 
 config MACH_SUN4I
        bool "sun4i (Allwinner A10)"