Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39179 )
Change subject: mb/*/Kconfig: Factor out MAINBOARD_VENDOR ......................................................................
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 --- M src/mainboard/Kconfig M src/mainboard/adlink/Kconfig M src/mainboard/amd/Kconfig M src/mainboard/aopen/Kconfig M src/mainboard/apple/Kconfig M src/mainboard/asrock/Kconfig M src/mainboard/asus/Kconfig M src/mainboard/bap/Kconfig M src/mainboard/biostar/Kconfig M src/mainboard/cavium/Kconfig M src/mainboard/compulab/Kconfig M src/mainboard/elmex/Kconfig M src/mainboard/emulation/Kconfig M src/mainboard/facebook/Kconfig M src/mainboard/foxconn/Kconfig M src/mainboard/getac/Kconfig M src/mainboard/gigabyte/Kconfig M src/mainboard/gizmosphere/Kconfig M src/mainboard/google/Kconfig M src/mainboard/hp/Kconfig M src/mainboard/ibase/Kconfig M src/mainboard/intel/Kconfig M src/mainboard/jetway/Kconfig M src/mainboard/kontron/Kconfig M src/mainboard/lenovo/Kconfig M src/mainboard/lippert/Kconfig M src/mainboard/msi/Kconfig M src/mainboard/opencellular/Kconfig M src/mainboard/packardbell/Kconfig M src/mainboard/pcengines/Kconfig M src/mainboard/portwell/Kconfig M src/mainboard/purism/Kconfig M src/mainboard/razer/Kconfig M src/mainboard/roda/Kconfig M src/mainboard/samsung/Kconfig M src/mainboard/sapphire/Kconfig M src/mainboard/scaleway/Kconfig M src/mainboard/siemens/Kconfig M src/mainboard/sifive/Kconfig M src/mainboard/supermicro/Kconfig M src/mainboard/system76/Kconfig M src/mainboard/ti/Kconfig M src/mainboard/up/Kconfig 43 files changed, 13 insertions(+), 43 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/39179/1
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index df80e64..ea680ad 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -10,6 +10,9 @@
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 f71d6a9..5890a29 100644 --- a/src/mainboard/adlink/Kconfig +++ b/src/mainboard/adlink/Kconfig @@ -4,7 +4,6 @@ # 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 664ebe1..2e40199 100644 --- a/src/mainboard/amd/Kconfig +++ b/src/mainboard/amd/Kconfig @@ -10,7 +10,6 @@ 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 2208e62..754bab0 100644 --- a/src/mainboard/aopen/Kconfig +++ b/src/mainboard/aopen/Kconfig @@ -10,7 +10,6 @@ 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 0f5e964..4801833 100644 --- a/src/mainboard/apple/Kconfig +++ b/src/mainboard/apple/Kconfig @@ -10,7 +10,6 @@ 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 7c4b012..f47e3e5 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 @@ 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 4c0215f..f910588 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 @@ 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 a638509..c21cf85 100644 --- a/src/mainboard/bap/Kconfig +++ b/src/mainboard/bap/Kconfig @@ -29,7 +29,6 @@ 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 43896a3..0f28af33 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 @@
config MAINBOARD_VENDOR - string default "Biostar"
endif # VENDOR_BIOSTAR diff --git a/src/mainboard/cavium/Kconfig b/src/mainboard/cavium/Kconfig index ec0a791..ac16393 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 @@ 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 813026c..9501be7 100644 --- a/src/mainboard/compulab/Kconfig +++ b/src/mainboard/compulab/Kconfig @@ -10,7 +10,6 @@ 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 54217ea..28f264d 100644 --- a/src/mainboard/elmex/Kconfig +++ b/src/mainboard/elmex/Kconfig @@ -13,7 +13,6 @@ 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 759b1de..60aa994 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -16,7 +16,6 @@ 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 7e99f01..17366e9 100644 --- a/src/mainboard/facebook/Kconfig +++ b/src/mainboard/facebook/Kconfig @@ -10,7 +10,6 @@ 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 056805c..30994f0 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 @@ 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 c3a78be..2d597b5 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 @@ 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 3edf78b..dcb57c6 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 @@ 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 6022bf6..d2b335a 100644 --- a/src/mainboard/gizmosphere/Kconfig +++ b/src/mainboard/gizmosphere/Kconfig @@ -25,7 +25,6 @@ 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 6a2540d..702ba13 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 @@ 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 9d768ae..73e6649 100644 --- a/src/mainboard/hp/Kconfig +++ b/src/mainboard/hp/Kconfig @@ -10,7 +10,6 @@ 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 2c33d58..5b519b7 100644 --- a/src/mainboard/ibase/Kconfig +++ b/src/mainboard/ibase/Kconfig @@ -10,7 +10,6 @@ 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 9f5e5af..53c5cd1 100644 --- a/src/mainboard/intel/Kconfig +++ b/src/mainboard/intel/Kconfig @@ -10,7 +10,6 @@ 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 530700d..36a064c 100644 --- a/src/mainboard/jetway/Kconfig +++ b/src/mainboard/jetway/Kconfig @@ -13,7 +13,6 @@ 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 82d1c4f..34af38d 100644 --- a/src/mainboard/kontron/Kconfig +++ b/src/mainboard/kontron/Kconfig @@ -10,7 +10,6 @@ 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 ea1ead1..467c20a 100644 --- a/src/mainboard/lenovo/Kconfig +++ b/src/mainboard/lenovo/Kconfig @@ -10,7 +10,6 @@ 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 e45fc3e..f5213b6 100644 --- a/src/mainboard/lippert/Kconfig +++ b/src/mainboard/lippert/Kconfig @@ -15,7 +15,6 @@ 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 0b9228a..bd5ab69 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 @@ 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 2df6ba3..f82e923 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 @@ 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 7fe8d24..9d89892 100644 --- a/src/mainboard/packardbell/Kconfig +++ b/src/mainboard/packardbell/Kconfig @@ -10,7 +10,6 @@ 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 e173054..b4d8a9a 100644 --- a/src/mainboard/pcengines/Kconfig +++ b/src/mainboard/pcengines/Kconfig @@ -10,7 +10,6 @@ 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 78e5037..1791284 100644 --- a/src/mainboard/portwell/Kconfig +++ b/src/mainboard/portwell/Kconfig @@ -10,7 +10,6 @@ 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 ff6eb41..a3022d4 100644 --- a/src/mainboard/purism/Kconfig +++ b/src/mainboard/purism/Kconfig @@ -25,7 +25,6 @@ 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 bae422e..9d96888 100644 --- a/src/mainboard/razer/Kconfig +++ b/src/mainboard/razer/Kconfig @@ -1,4 +1,3 @@ - if VENDOR_RAZER
choice @@ -11,7 +10,6 @@ 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 8a0107a..bc8ebc0 100644 --- a/src/mainboard/roda/Kconfig +++ b/src/mainboard/roda/Kconfig @@ -10,7 +10,6 @@ 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 06e22d9..119b637 100644 --- a/src/mainboard/samsung/Kconfig +++ b/src/mainboard/samsung/Kconfig @@ -10,7 +10,6 @@ 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 130c1f4..5bb6a5c 100644 --- a/src/mainboard/sapphire/Kconfig +++ b/src/mainboard/sapphire/Kconfig @@ -10,7 +10,6 @@ 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 2af3e29..4635376 100644 --- a/src/mainboard/scaleway/Kconfig +++ b/src/mainboard/scaleway/Kconfig @@ -10,7 +10,6 @@ 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 9b7c597..203b3d0 100644 --- a/src/mainboard/siemens/Kconfig +++ b/src/mainboard/siemens/Kconfig @@ -10,7 +10,6 @@ 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 1527705..5731b3e 100644 --- a/src/mainboard/sifive/Kconfig +++ b/src/mainboard/sifive/Kconfig @@ -10,7 +10,6 @@ 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 2ee9372..b06d20b 100644 --- a/src/mainboard/supermicro/Kconfig +++ b/src/mainboard/supermicro/Kconfig @@ -10,7 +10,6 @@ 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 62034a4..785d117 100644 --- a/src/mainboard/system76/Kconfig +++ b/src/mainboard/system76/Kconfig @@ -10,7 +10,6 @@ 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 05b283b..46a3746 100644 --- a/src/mainboard/ti/Kconfig +++ b/src/mainboard/ti/Kconfig @@ -26,7 +26,6 @@ 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 04e290c..aa8eda6 100644 --- a/src/mainboard/up/Kconfig +++ b/src/mainboard/up/Kconfig @@ -10,7 +10,6 @@ source "src/mainboard/up/*/Kconfig"
config MAINBOARD_VENDOR - string default "UP"
endif
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39179 )
Change subject: mb/*/Kconfig: Factor out MAINBOARD_VENDOR ......................................................................
Patch Set 1:
I don't mind the unification. But first, should we discuss why it should have a prompt? I assumed that this is tied to the code, and only SMBIOS data etc. can be overridden.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39179 )
Change subject: mb/*/Kconfig: Factor out MAINBOARD_VENDOR ......................................................................
Patch Set 1:
Patch Set 1:
I don't mind the unification. But first, should we discuss why it should have a prompt? I assumed that this is tied to the code, and only SMBIOS data etc. can be overridden.
I don't really mind, as long as this gets merged someday. After all, adding or removing the prompt is now a single line change :P
I think the prompt got there for stuff like Google boards: their coreboot "vendor" is Google, but the boards themselves are manufactured by someone else (Compal, Wistron, Quanta, Pegatron...) for yet another somebody else (Acer, Asus, Dell, HP...). The ability to override the vendor string probably comes from that, I guess.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39179 )
Change subject: mb/*/Kconfig: Factor out MAINBOARD_VENDOR ......................................................................
Patch Set 1: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/39179/1/src/mainboard/Kconfig File src/mainboard/Kconfig:
https://review.coreboot.org/c/coreboot/+/39179/1/src/mainboard/Kconfig@14 PS1, Line 14: Mainboard vendor name why change the string?
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39179 )
Change subject: mb/*/Kconfig: Factor out MAINBOARD_VENDOR ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39179/1/src/mainboard/Kconfig File src/mainboard/Kconfig:
https://review.coreboot.org/c/coreboot/+/39179/1/src/mainboard/Kconfig@14 PS1, Line 14: Mainboard vendor name
why change the string?
There's another thing called "Mainboard vendor" (the choice right above)
Mainboard vendor (Google) ---> Mainboard model (-> Auron_Paine (Acer C740 Chromebook)) ---> (Google) Mainboard Vendor (NEW)
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39179 )
Change subject: mb/*/Kconfig: Factor out MAINBOARD_VENDOR ......................................................................
Patch Set 1: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/39179/1/src/mainboard/Kconfig File src/mainboard/Kconfig:
https://review.coreboot.org/c/coreboot/+/39179/1/src/mainboard/Kconfig@14 PS1, Line 14: Mainboard vendor name
There's another thing called "Mainboard vendor" (the choice right above) […]
Ack, seems consistent
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39179 )
Change subject: mb/*/Kconfig: Factor out MAINBOARD_VENDOR ......................................................................
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 --- M src/mainboard/Kconfig M src/mainboard/adlink/Kconfig M src/mainboard/amd/Kconfig M src/mainboard/aopen/Kconfig M src/mainboard/apple/Kconfig M src/mainboard/asrock/Kconfig M src/mainboard/asus/Kconfig M src/mainboard/bap/Kconfig M src/mainboard/biostar/Kconfig M src/mainboard/cavium/Kconfig M src/mainboard/compulab/Kconfig M src/mainboard/elmex/Kconfig M src/mainboard/emulation/Kconfig M src/mainboard/facebook/Kconfig M src/mainboard/foxconn/Kconfig M src/mainboard/getac/Kconfig M src/mainboard/gigabyte/Kconfig M src/mainboard/gizmosphere/Kconfig M src/mainboard/google/Kconfig M src/mainboard/hp/Kconfig M src/mainboard/ibase/Kconfig M src/mainboard/intel/Kconfig M src/mainboard/jetway/Kconfig M src/mainboard/kontron/Kconfig M src/mainboard/lenovo/Kconfig M src/mainboard/lippert/Kconfig M src/mainboard/msi/Kconfig M src/mainboard/opencellular/Kconfig M src/mainboard/packardbell/Kconfig M src/mainboard/pcengines/Kconfig M src/mainboard/portwell/Kconfig M src/mainboard/purism/Kconfig M src/mainboard/razer/Kconfig M src/mainboard/roda/Kconfig M src/mainboard/samsung/Kconfig M src/mainboard/sapphire/Kconfig M src/mainboard/scaleway/Kconfig M src/mainboard/siemens/Kconfig M src/mainboard/sifive/Kconfig M src/mainboard/supermicro/Kconfig M src/mainboard/system76/Kconfig M src/mainboard/ti/Kconfig M src/mainboard/up/Kconfig 43 files changed, 13 insertions(+), 43 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig index 95459ff..77fcba1 100644 --- a/src/mainboard/Kconfig +++ b/src/mainboard/Kconfig @@ -10,6 +10,9 @@
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 f71d6a9..5890a29 100644 --- a/src/mainboard/adlink/Kconfig +++ b/src/mainboard/adlink/Kconfig @@ -4,7 +4,6 @@ # 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 664ebe10..2e40199 100644 --- a/src/mainboard/amd/Kconfig +++ b/src/mainboard/amd/Kconfig @@ -10,7 +10,6 @@ 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 2208e62..754bab0 100644 --- a/src/mainboard/aopen/Kconfig +++ b/src/mainboard/aopen/Kconfig @@ -10,7 +10,6 @@ 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 0f5e964..4801833 100644 --- a/src/mainboard/apple/Kconfig +++ b/src/mainboard/apple/Kconfig @@ -10,7 +10,6 @@ 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 7c4b012..f47e3e5 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 @@ 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 4c0215f..f910588 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 @@ 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 a638509..c21cf85 100644 --- a/src/mainboard/bap/Kconfig +++ b/src/mainboard/bap/Kconfig @@ -29,7 +29,6 @@ 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 43896a3..0f28af33 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 @@
config MAINBOARD_VENDOR - string default "Biostar"
endif # VENDOR_BIOSTAR diff --git a/src/mainboard/cavium/Kconfig b/src/mainboard/cavium/Kconfig index ec0a791..ac16393 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 @@ 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 813026c..9501be7 100644 --- a/src/mainboard/compulab/Kconfig +++ b/src/mainboard/compulab/Kconfig @@ -10,7 +10,6 @@ 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 54217ea..28f264d 100644 --- a/src/mainboard/elmex/Kconfig +++ b/src/mainboard/elmex/Kconfig @@ -13,7 +13,6 @@ 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 759b1de..60aa994 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -16,7 +16,6 @@ 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 7e99f01..17366e9 100644 --- a/src/mainboard/facebook/Kconfig +++ b/src/mainboard/facebook/Kconfig @@ -10,7 +10,6 @@ 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 056805c..30994f0 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 @@ 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 c3a78be..2d597b5 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 @@ 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 3edf78b..dcb57c6 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 @@ 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 6022bf6..d2b335a 100644 --- a/src/mainboard/gizmosphere/Kconfig +++ b/src/mainboard/gizmosphere/Kconfig @@ -25,7 +25,6 @@ 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 6a2540d..702ba13 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 @@ 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 9d768ae..73e6649 100644 --- a/src/mainboard/hp/Kconfig +++ b/src/mainboard/hp/Kconfig @@ -10,7 +10,6 @@ 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 2c33d58..5b519b7 100644 --- a/src/mainboard/ibase/Kconfig +++ b/src/mainboard/ibase/Kconfig @@ -10,7 +10,6 @@ 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 9f5e5af..53c5cd1 100644 --- a/src/mainboard/intel/Kconfig +++ b/src/mainboard/intel/Kconfig @@ -10,7 +10,6 @@ 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 530700d..36a064c 100644 --- a/src/mainboard/jetway/Kconfig +++ b/src/mainboard/jetway/Kconfig @@ -13,7 +13,6 @@ 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 82d1c4f..34af38d 100644 --- a/src/mainboard/kontron/Kconfig +++ b/src/mainboard/kontron/Kconfig @@ -10,7 +10,6 @@ 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 ea1ead1..467c20a 100644 --- a/src/mainboard/lenovo/Kconfig +++ b/src/mainboard/lenovo/Kconfig @@ -10,7 +10,6 @@ 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 e45fc3e..f5213b6 100644 --- a/src/mainboard/lippert/Kconfig +++ b/src/mainboard/lippert/Kconfig @@ -15,7 +15,6 @@ 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 0b9228a..bd5ab69 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 @@ 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 2df6ba3..f82e923 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 @@ 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 7fe8d24..9d89892 100644 --- a/src/mainboard/packardbell/Kconfig +++ b/src/mainboard/packardbell/Kconfig @@ -10,7 +10,6 @@ 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 e173054..b4d8a9a 100644 --- a/src/mainboard/pcengines/Kconfig +++ b/src/mainboard/pcengines/Kconfig @@ -10,7 +10,6 @@ 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 78e5037..1791284 100644 --- a/src/mainboard/portwell/Kconfig +++ b/src/mainboard/portwell/Kconfig @@ -10,7 +10,6 @@ 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 ff6eb41..a3022d4 100644 --- a/src/mainboard/purism/Kconfig +++ b/src/mainboard/purism/Kconfig @@ -25,7 +25,6 @@ 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 bae422e..9d96888 100644 --- a/src/mainboard/razer/Kconfig +++ b/src/mainboard/razer/Kconfig @@ -1,4 +1,3 @@ - if VENDOR_RAZER
choice @@ -11,7 +10,6 @@ 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 8a0107a..bc8ebc0 100644 --- a/src/mainboard/roda/Kconfig +++ b/src/mainboard/roda/Kconfig @@ -10,7 +10,6 @@ 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 06e22d9..119b637 100644 --- a/src/mainboard/samsung/Kconfig +++ b/src/mainboard/samsung/Kconfig @@ -10,7 +10,6 @@ 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 130c1f4..5bb6a5c 100644 --- a/src/mainboard/sapphire/Kconfig +++ b/src/mainboard/sapphire/Kconfig @@ -10,7 +10,6 @@ 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 2af3e29..4635376 100644 --- a/src/mainboard/scaleway/Kconfig +++ b/src/mainboard/scaleway/Kconfig @@ -10,7 +10,6 @@ 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 9b7c597..203b3d0 100644 --- a/src/mainboard/siemens/Kconfig +++ b/src/mainboard/siemens/Kconfig @@ -10,7 +10,6 @@ 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 1527705..5731b3e 100644 --- a/src/mainboard/sifive/Kconfig +++ b/src/mainboard/sifive/Kconfig @@ -10,7 +10,6 @@ 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 2ee9372..b06d20b 100644 --- a/src/mainboard/supermicro/Kconfig +++ b/src/mainboard/supermicro/Kconfig @@ -10,7 +10,6 @@ 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 62034a4..785d117 100644 --- a/src/mainboard/system76/Kconfig +++ b/src/mainboard/system76/Kconfig @@ -10,7 +10,6 @@ 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 05b283b..46a3746 100644 --- a/src/mainboard/ti/Kconfig +++ b/src/mainboard/ti/Kconfig @@ -26,7 +26,6 @@ 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 04e290c..aa8eda6 100644 --- a/src/mainboard/up/Kconfig +++ b/src/mainboard/up/Kconfig @@ -10,7 +10,6 @@ source "src/mainboard/up/*/Kconfig"
config MAINBOARD_VENDOR - string default "UP"
endif
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39179 )
Change subject: mb/*/Kconfig: Factor out MAINBOARD_VENDOR ......................................................................
Patch Set 2:
Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/1067 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/1066 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/1065
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
Angel Pons (Code Review)
-
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)