diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2020-03-01 13:07:19 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-03-03 10:15:22 +0000 |
| commit | 7671bce33bf85d7b04afc6f6698ad41f11923213 (patch) | |
| tree | 1b6648614d8b1e53c1cb4bcb833987881bd5c706 /src | |
| parent | 3e576739c9d998a679b95c878838f58a491f5fb0 (diff) | |
mb/*/Kconfig: Factor out MAINBOARD_VENDOR
Only some mainboard vendors have a prompt for this option. Let's be fair
and give this ability to everyone.
Change-Id: I03eec7c13d18b42e3c56fb1a43dc665d5dbd1145
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39179
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src')
43 files changed, 13 insertions, 43 deletions
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index 95459ffd8e..77fcba16e6 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -10,6 +10,9 @@ endchoice source "src/mainboard/*/Kconfig" +config MAINBOARD_VENDOR + string "Mainboard vendor name" + config BOARD_ROMSIZE_KB_64 bool config BOARD_ROMSIZE_KB_128 diff --git a/src/mainboard/adlink/Kconfig b/src/mainboard/adlink/Kconfig index f71d6a98e4..5890a29c34 100644 --- a/src/mainboard/adlink/Kconfig +++ b/src/mainboard/adlink/Kconfig @@ -4,7 +4,6 @@ comment "see under vendor LiPPERT" # any further boards will then be ADLINK config MAINBOARD_VENDOR - string default "ADLINK" endif # VENDOR_ADLINK diff --git a/src/mainboard/amd/Kconfig b/src/mainboard/amd/Kconfig index 664ebe103e..2e40199e43 100644 --- a/src/mainboard/amd/Kconfig +++ b/src/mainboard/amd/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/amd/*/Kconfig" config MAINBOARD_VENDOR - string default "AMD" endif # VENDOR_AMD diff --git a/src/mainboard/aopen/Kconfig b/src/mainboard/aopen/Kconfig index 2208e62ec0..754bab0a50 100644 --- a/src/mainboard/aopen/Kconfig +++ b/src/mainboard/aopen/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/aopen/*/Kconfig" config MAINBOARD_VENDOR - string default "AOpen" endif # VENDOR_AOPEN diff --git a/src/mainboard/apple/Kconfig b/src/mainboard/apple/Kconfig index 0f5e96434b..4801833722 100644 --- a/src/mainboard/apple/Kconfig +++ b/src/mainboard/apple/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/apple/*/Kconfig" config MAINBOARD_VENDOR - string default "Apple" endif # VENDOR_APPLE diff --git a/src/mainboard/asrock/Kconfig b/src/mainboard/asrock/Kconfig index 7c4b012e96..f47e3e5dcd 100644 --- a/src/mainboard/asrock/Kconfig +++ b/src/mainboard/asrock/Kconfig @@ -12,6 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_ASROCK choice @@ -24,7 +25,6 @@ endchoice source "src/mainboard/asrock/*/Kconfig" config MAINBOARD_VENDOR - string default "ASROCK" endif # VENDOR_ASROCK diff --git a/src/mainboard/asus/Kconfig b/src/mainboard/asus/Kconfig index 4c0215fba4..f910588a2f 100644 --- a/src/mainboard/asus/Kconfig +++ b/src/mainboard/asus/Kconfig @@ -12,6 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_ASUS choice @@ -24,7 +25,6 @@ endchoice source "src/mainboard/asus/*/Kconfig" config MAINBOARD_VENDOR - string default "ASUS" endif # VENDOR_ASUS diff --git a/src/mainboard/bap/Kconfig b/src/mainboard/bap/Kconfig index a638509026..c21cf85269 100644 --- a/src/mainboard/bap/Kconfig +++ b/src/mainboard/bap/Kconfig @@ -29,7 +29,6 @@ endchoice source "src/mainboard/bap/*/Kconfig" config MAINBOARD_VENDOR - string default "BAP" endif # VENDOR_BAP diff --git a/src/mainboard/biostar/Kconfig b/src/mainboard/biostar/Kconfig index 43896a3f1f..0f28af33c2 100644 --- a/src/mainboard/biostar/Kconfig +++ b/src/mainboard/biostar/Kconfig @@ -13,6 +13,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_BIOSTAR choice @@ -26,7 +27,6 @@ source "src/mainboard/biostar/*/Kconfig" config MAINBOARD_VENDOR - string default "Biostar" endif # VENDOR_BIOSTAR diff --git a/src/mainboard/cavium/Kconfig b/src/mainboard/cavium/Kconfig index ec0a791119..ac16393c7f 100644 --- a/src/mainboard/cavium/Kconfig +++ b/src/mainboard/cavium/Kconfig @@ -12,6 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_CAVIUM choice @@ -24,7 +25,6 @@ endchoice source "src/mainboard/cavium/*/Kconfig" config MAINBOARD_VENDOR - string "Mainboard Vendor" default "Cavium" endif # VENDOR_CAVIUM diff --git a/src/mainboard/compulab/Kconfig b/src/mainboard/compulab/Kconfig index 813026c7ed..9501be7f2b 100644 --- a/src/mainboard/compulab/Kconfig +++ b/src/mainboard/compulab/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/compulab/*/Kconfig" config MAINBOARD_VENDOR - string default "CompuLab" endif # VENDOR_COMPULAB diff --git a/src/mainboard/elmex/Kconfig b/src/mainboard/elmex/Kconfig index 54217ea217..28f264dd13 100644 --- a/src/mainboard/elmex/Kconfig +++ b/src/mainboard/elmex/Kconfig @@ -13,7 +13,6 @@ endchoice source "src/mainboard/elmex/*/Kconfig" config MAINBOARD_VENDOR - string default "ELMEX" endif # VENDOR_ELMEX diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 759b1de091..60aa99477a 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -16,7 +16,6 @@ config BOARD_EMULATION_QEMU_X86 source "src/mainboard/emulation/*/Kconfig" config MAINBOARD_VENDOR - string default "Emulation" endif # VENDOR_EMULATION diff --git a/src/mainboard/facebook/Kconfig b/src/mainboard/facebook/Kconfig index 7e99f01ac7..17366e96bf 100644 --- a/src/mainboard/facebook/Kconfig +++ b/src/mainboard/facebook/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/facebook/*/Kconfig" config MAINBOARD_VENDOR - string default "Facebook" endif # VENDOR_FACEBOOK diff --git a/src/mainboard/foxconn/Kconfig b/src/mainboard/foxconn/Kconfig index 056805ccbf..30994f0e6b 100644 --- a/src/mainboard/foxconn/Kconfig +++ b/src/mainboard/foxconn/Kconfig @@ -12,6 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_FOXCONN choice @@ -24,7 +25,6 @@ endchoice source "src/mainboard/foxconn/*/Kconfig" config MAINBOARD_VENDOR - string default "Foxconn" endif # VENDOR_FOXCONN diff --git a/src/mainboard/getac/Kconfig b/src/mainboard/getac/Kconfig index c3a78be6d2..2d597b5832 100644 --- a/src/mainboard/getac/Kconfig +++ b/src/mainboard/getac/Kconfig @@ -12,6 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_GETAC choice @@ -24,7 +25,6 @@ endchoice source "src/mainboard/getac/*/Kconfig" config MAINBOARD_VENDOR - string default "Getac" endif # VENDOR_GETAC diff --git a/src/mainboard/gigabyte/Kconfig b/src/mainboard/gigabyte/Kconfig index 3edf78bb01..dcb57c6b12 100644 --- a/src/mainboard/gigabyte/Kconfig +++ b/src/mainboard/gigabyte/Kconfig @@ -12,6 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_GIGABYTE choice @@ -24,7 +25,6 @@ endchoice source "src/mainboard/gigabyte/*/Kconfig" config MAINBOARD_VENDOR - string default "GIGABYTE" endif # VENDOR_GIGABYTE diff --git a/src/mainboard/gizmosphere/Kconfig b/src/mainboard/gizmosphere/Kconfig index 6022bf698b..d2b335a23a 100644 --- a/src/mainboard/gizmosphere/Kconfig +++ b/src/mainboard/gizmosphere/Kconfig @@ -25,7 +25,6 @@ endchoice source "src/mainboard/gizmosphere/*/Kconfig" config MAINBOARD_VENDOR - string default "GizmoSphere" endif # VENDOR_GIZMOSPHERE diff --git a/src/mainboard/google/Kconfig b/src/mainboard/google/Kconfig index 6a2540d75d..702ba13c55 100644 --- a/src/mainboard/google/Kconfig +++ b/src/mainboard/google/Kconfig @@ -12,6 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_GOOGLE choice @@ -24,7 +25,6 @@ endchoice source "src/mainboard/google/*/Kconfig" config MAINBOARD_VENDOR - string "Mainboard Vendor" default "Google" endif # VENDOR_GOOGLE diff --git a/src/mainboard/hp/Kconfig b/src/mainboard/hp/Kconfig index 9d768ae647..73e6649d43 100644 --- a/src/mainboard/hp/Kconfig +++ b/src/mainboard/hp/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/hp/*/Kconfig" config MAINBOARD_VENDOR - string default "HP" endif # VENDOR_HP diff --git a/src/mainboard/ibase/Kconfig b/src/mainboard/ibase/Kconfig index 2c33d58caa..5b519b7f50 100644 --- a/src/mainboard/ibase/Kconfig +++ b/src/mainboard/ibase/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/ibase/*/Kconfig" config MAINBOARD_VENDOR - string default "iBase" endif # VENDOR_IBASE diff --git a/src/mainboard/intel/Kconfig b/src/mainboard/intel/Kconfig index 9f5e5af9c2..53c5cd168b 100644 --- a/src/mainboard/intel/Kconfig +++ b/src/mainboard/intel/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/intel/*/Kconfig" config MAINBOARD_VENDOR - string default "Intel" endif # VENDOR_INTEL diff --git a/src/mainboard/jetway/Kconfig b/src/mainboard/jetway/Kconfig index 530700d816..36a064c2e0 100644 --- a/src/mainboard/jetway/Kconfig +++ b/src/mainboard/jetway/Kconfig @@ -13,7 +13,6 @@ endchoice source "src/mainboard/jetway/*/Kconfig" config MAINBOARD_VENDOR - string default "Jetway" endif # VENDOR_JETWAY diff --git a/src/mainboard/kontron/Kconfig b/src/mainboard/kontron/Kconfig index 82d1c4fe30..34af38de5d 100644 --- a/src/mainboard/kontron/Kconfig +++ b/src/mainboard/kontron/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/kontron/*/Kconfig" config MAINBOARD_VENDOR - string default "Kontron" endif # VENDOR_KONTRON diff --git a/src/mainboard/lenovo/Kconfig b/src/mainboard/lenovo/Kconfig index ea1ead13e0..467c20abc8 100644 --- a/src/mainboard/lenovo/Kconfig +++ b/src/mainboard/lenovo/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/lenovo/*/Kconfig" config MAINBOARD_VENDOR - string default "LENOVO" config MAINBOARD_FAMILY diff --git a/src/mainboard/lippert/Kconfig b/src/mainboard/lippert/Kconfig index e45fc3e6a2..f5213b6e72 100644 --- a/src/mainboard/lippert/Kconfig +++ b/src/mainboard/lippert/Kconfig @@ -15,7 +15,6 @@ endchoice source "src/mainboard/lippert/*/Kconfig" config MAINBOARD_VENDOR - string default "LiPPERT" endif # VENDOR_LIPPERT diff --git a/src/mainboard/msi/Kconfig b/src/mainboard/msi/Kconfig index 0b9228a41f..bd5ab69cd9 100644 --- a/src/mainboard/msi/Kconfig +++ b/src/mainboard/msi/Kconfig @@ -12,6 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_MSI choice @@ -24,7 +25,6 @@ endchoice source "src/mainboard/msi/*/Kconfig" config MAINBOARD_VENDOR - string default "MSI" endif # VENDOR_MSI diff --git a/src/mainboard/opencellular/Kconfig b/src/mainboard/opencellular/Kconfig index 2df6ba3afe..f82e923829 100644 --- a/src/mainboard/opencellular/Kconfig +++ b/src/mainboard/opencellular/Kconfig @@ -12,6 +12,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## + if VENDOR_OPENCELLULAR choice @@ -24,7 +25,6 @@ endchoice source "src/mainboard/opencellular/*/Kconfig" config MAINBOARD_VENDOR - string default "OpenCellular" endif # VENDOR_OPENCELLULAR diff --git a/src/mainboard/packardbell/Kconfig b/src/mainboard/packardbell/Kconfig index 7fe8d24a88..9d898922a7 100644 --- a/src/mainboard/packardbell/Kconfig +++ b/src/mainboard/packardbell/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/packardbell/*/Kconfig" config MAINBOARD_VENDOR - string default "Packard Bell" endif # VENDOR_PACKARDBELL diff --git a/src/mainboard/pcengines/Kconfig b/src/mainboard/pcengines/Kconfig index e173054c07..b4d8a9a7c8 100644 --- a/src/mainboard/pcengines/Kconfig +++ b/src/mainboard/pcengines/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/pcengines/*/Kconfig" config MAINBOARD_VENDOR - string default "PC Engines" endif # VENDOR_PCENGINES diff --git a/src/mainboard/portwell/Kconfig b/src/mainboard/portwell/Kconfig index 78e5037c30..17912842c7 100644 --- a/src/mainboard/portwell/Kconfig +++ b/src/mainboard/portwell/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/portwell/*/Kconfig" config MAINBOARD_VENDOR - string default "Portwell" endif # VENDOR_PORTWELL diff --git a/src/mainboard/purism/Kconfig b/src/mainboard/purism/Kconfig index ff6eb414e8..a3022d4591 100644 --- a/src/mainboard/purism/Kconfig +++ b/src/mainboard/purism/Kconfig @@ -25,7 +25,6 @@ endchoice source "src/mainboard/purism/*/Kconfig" config MAINBOARD_VENDOR - string "Mainboard Vendor" default "Purism" endif # VENDOR_PURISM diff --git a/src/mainboard/razer/Kconfig b/src/mainboard/razer/Kconfig index bae422eaaa..9d96888c7f 100644 --- a/src/mainboard/razer/Kconfig +++ b/src/mainboard/razer/Kconfig @@ -1,4 +1,3 @@ - if VENDOR_RAZER choice @@ -11,7 +10,6 @@ endchoice source "src/mainboard/razer/*/Kconfig" config MAINBOARD_VENDOR - string "Mainboard Vendor" default "RAZER" endif diff --git a/src/mainboard/roda/Kconfig b/src/mainboard/roda/Kconfig index 8a0107ab04..bc8ebc0af3 100644 --- a/src/mainboard/roda/Kconfig +++ b/src/mainboard/roda/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/roda/*/Kconfig" config MAINBOARD_VENDOR - string default "Roda" endif # VENDOR_RODA diff --git a/src/mainboard/samsung/Kconfig b/src/mainboard/samsung/Kconfig index 06e22d991b..119b63744b 100644 --- a/src/mainboard/samsung/Kconfig +++ b/src/mainboard/samsung/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/samsung/*/Kconfig" config MAINBOARD_VENDOR - string default "SAMSUNG" endif # VENDOR_SAMSUNG diff --git a/src/mainboard/sapphire/Kconfig b/src/mainboard/sapphire/Kconfig index 130c1f4f22..5bb6a5ca4c 100644 --- a/src/mainboard/sapphire/Kconfig +++ b/src/mainboard/sapphire/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/sapphire/*/Kconfig" config MAINBOARD_VENDOR - string default "Sapphire" endif # VENDOR_SAPPHIRE diff --git a/src/mainboard/scaleway/Kconfig b/src/mainboard/scaleway/Kconfig index 2af3e29c36..4635376d1e 100644 --- a/src/mainboard/scaleway/Kconfig +++ b/src/mainboard/scaleway/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/scaleway/*/Kconfig" config MAINBOARD_VENDOR - string default "Scaleway" endif # VENDOR_SCALEWAY diff --git a/src/mainboard/siemens/Kconfig b/src/mainboard/siemens/Kconfig index 9b7c597db3..203b3d01bb 100644 --- a/src/mainboard/siemens/Kconfig +++ b/src/mainboard/siemens/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/siemens/*/Kconfig" config MAINBOARD_VENDOR - string default "Siemens" endif # VENDOR_SIEMENS diff --git a/src/mainboard/sifive/Kconfig b/src/mainboard/sifive/Kconfig index 1527705df1..5731b3eda4 100644 --- a/src/mainboard/sifive/Kconfig +++ b/src/mainboard/sifive/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/sifive/*/Kconfig" config MAINBOARD_VENDOR - string default "SiFive" endif # VENDOR_SIFIVE diff --git a/src/mainboard/supermicro/Kconfig b/src/mainboard/supermicro/Kconfig index 2ee9372fc2..b06d20b7d8 100644 --- a/src/mainboard/supermicro/Kconfig +++ b/src/mainboard/supermicro/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/supermicro/*/Kconfig" config MAINBOARD_VENDOR - string default "Supermicro" endif # VENDOR_SUPERMICRO diff --git a/src/mainboard/system76/Kconfig b/src/mainboard/system76/Kconfig index 62034a4222..785d117ad5 100644 --- a/src/mainboard/system76/Kconfig +++ b/src/mainboard/system76/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/system76/*/Kconfig" config MAINBOARD_VENDOR - string default "System76" endif diff --git a/src/mainboard/ti/Kconfig b/src/mainboard/ti/Kconfig index 05b283b9f3..46a3746d65 100644 --- a/src/mainboard/ti/Kconfig +++ b/src/mainboard/ti/Kconfig @@ -26,7 +26,6 @@ endchoice source "src/mainboard/ti/*/Kconfig" config MAINBOARD_VENDOR - string default "TI" endif # VENDOR_TI diff --git a/src/mainboard/up/Kconfig b/src/mainboard/up/Kconfig index 04e290c0ae..aa8eda66b5 100644 --- a/src/mainboard/up/Kconfig +++ b/src/mainboard/up/Kconfig @@ -10,7 +10,6 @@ endchoice source "src/mainboard/up/*/Kconfig" config MAINBOARD_VENDOR - string default "UP" endif |