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>
2020-03-01 13:07:19 +01:00 · 2020-03-01 13:07:19 +01:00 · 7671bce33b
parent 3e576739c9
commit 7671bce33b
43 changed files with 13 additions and 43 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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