Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32727
Change subject: mb/lenovo/*: Add MAINBOARD_FAMILY ......................................................................
mb/lenovo/*: Add MAINBOARD_FAMILY
The Kconfig MAINBOARD_FAMILY sets the family type of SMBIOS entry 1. Match what vendor firmware does and use the same value as in the version field.
Required for fwupd which uses the family field to generate a GUID.
Change-Id: I0033c42c5eac6b9d47d0acd16c67467b6d419534 Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M src/mainboard/lenovo/g505s/Kconfig M src/mainboard/lenovo/l520/Kconfig M src/mainboard/lenovo/s230u/Kconfig M src/mainboard/lenovo/t400/Kconfig M src/mainboard/lenovo/t420/Kconfig M src/mainboard/lenovo/t420s/Kconfig M src/mainboard/lenovo/t430/Kconfig M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t520/Kconfig M src/mainboard/lenovo/t530/Kconfig M src/mainboard/lenovo/t60/Kconfig M src/mainboard/lenovo/thinkcentre_a58/Kconfig M src/mainboard/lenovo/x131e/Kconfig M src/mainboard/lenovo/x1_carbon_gen1/Kconfig M src/mainboard/lenovo/x200/Kconfig M src/mainboard/lenovo/x220/Kconfig M src/mainboard/lenovo/x230/Kconfig M src/mainboard/lenovo/x60/Kconfig M src/mainboard/lenovo/z61t/Kconfig 19 files changed, 84 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/32727/1
diff --git a/src/mainboard/lenovo/g505s/Kconfig b/src/mainboard/lenovo/g505s/Kconfig index 883ef27..e6dbddd 100644 --- a/src/mainboard/lenovo/g505s/Kconfig +++ b/src/mainboard/lenovo/g505s/Kconfig @@ -39,6 +39,10 @@ string default "LENOVO G505S"
+config MAINBOARD_FAMILY + string + default "LENOVO G505S" + config HW_MEM_HOLE_SIZEK hex default 0x200000 diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig index 4495d79..8066bf3 100644 --- a/src/mainboard/lenovo/l520/Kconfig +++ b/src/mainboard/lenovo/l520/Kconfig @@ -26,6 +26,10 @@ string default "ThinkPad L520"
+config MAINBOARD_FAMILY + string + default "ThinkPad L520" + config VGA_BIOS_FILE string default "pci8086,0126.rom" diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig index 9200ad5..b388646 100644 --- a/src/mainboard/lenovo/s230u/Kconfig +++ b/src/mainboard/lenovo/s230u/Kconfig @@ -28,6 +28,10 @@ string default "ThinkPad S230U (Twist)"
+config MAINBOARD_FAMILY + string + default "ThinkPad S230U (Twist)" + config EC_BASE_ADDRESS hex default 0xff000000 diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig index 9f94051..db6c98a 100644 --- a/src/mainboard/lenovo/t400/Kconfig +++ b/src/mainboard/lenovo/t400/Kconfig @@ -37,6 +37,13 @@ default "ThinkPad R400" if BOARD_LENOVO_R400 default "ThinkPad W500" if BOARD_LENOVO_W500
+config MAINBOARD_FAMILY + string + default "ThinkPad T400" if BOARD_LENOVO_T400 + default "ThinkPad T500" if BOARD_LENOVO_T500 + default "ThinkPad R400" if BOARD_LENOVO_R400 + default "ThinkPad W500" if BOARD_LENOVO_W500 + config USBDEBUG_HCD_INDEX int default 2 diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index ce81907..fb4f0ee 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -36,6 +36,10 @@ string default "ThinkPad T420"
+config MAINBOARD_FAMILY + string + default "ThinkPad T420" + config MAX_CPUS int default 8 diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index c5efb55..c603753 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -35,6 +35,10 @@ string default "ThinkPad T420s"
+config MAINBOARD_FAMILY + string + default "ThinkPad T420s" + config MAX_CPUS int default 8 diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig index dbeaadb..3c2a473 100644 --- a/src/mainboard/lenovo/t430/Kconfig +++ b/src/mainboard/lenovo/t430/Kconfig @@ -34,6 +34,10 @@ string default "ThinkPad T430"
+config MAINBOARD_FAMILY + string + default "ThinkPad T430" + config VGA_BIOS_ID string default "8086,0166" diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index bad1837..9f69430 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -40,6 +40,11 @@ default "ThinkPad T430s" if BOARD_LENOVO_T430S default "ThinkPad T431s" if BOARD_LENOVO_T431S
+config MAINBOARD_FAMILY + string + default "ThinkPad T430s" if BOARD_LENOVO_T430S + default "ThinkPad T431s" if BOARD_LENOVO_T431S + config OVERRIDE_DEVICETREE string default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 06f296b..62a91a6 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -45,6 +45,11 @@ default "ThinkPad T520" if BOARD_LENOVO_T520 default "ThinkPad W520" if BOARD_LENOVO_W520
+config MAINBOARD_FAMILY + string + default "ThinkPad T520" if BOARD_LENOVO_T520 + default "ThinkPad W520" if BOARD_LENOVO_W520 + config MAX_CPUS int default 8 diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index b36460d..62a3ac8 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -45,6 +45,11 @@ default "ThinkPad T530" if BOARD_LENOVO_T530 default "ThinkPad W530" if BOARD_LENOVO_W530
+config MAINBOARD_FAMILY + string + default "ThinkPad T530" if BOARD_LENOVO_T530 + default "ThinkPad W530" if BOARD_LENOVO_W530 + config MAX_CPUS int default 8 diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index a6a88b3..2ef5ebf 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -33,6 +33,10 @@ string default "ThinkPad T60"
+config MAINBOARD_FAMILY + string + default "ThinkPad T60" + config MAX_CPUS int default 2 diff --git a/src/mainboard/lenovo/thinkcentre_a58/Kconfig b/src/mainboard/lenovo/thinkcentre_a58/Kconfig index fc1c6a7..1e31c89 100644 --- a/src/mainboard/lenovo/thinkcentre_a58/Kconfig +++ b/src/mainboard/lenovo/thinkcentre_a58/Kconfig @@ -43,6 +43,10 @@ string default "ThinkCentre A58"
+config MAINBOARD_FAMILY + string + default "ThinkCentre A58" + config MAX_CPUS int default 4 diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig index e7da8d0..a61c1bd 100644 --- a/src/mainboard/lenovo/x131e/Kconfig +++ b/src/mainboard/lenovo/x131e/Kconfig @@ -29,6 +29,10 @@ string default "ThinkPad X131e"
+config MAINBOARD_FAMILY + string + default "ThinkPad X131e" + config MAX_CPUS int default 4 diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig index 520853c..6c84ba6 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig +++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig @@ -34,6 +34,10 @@ string default "ThinkPad X1 carbon gen 1"
+config MAINBOARD_FAMILY + string + default "ThinkPad X1 Carbon gen 1" + config MAX_CPUS int default 8 diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig index 7b905bc..8b341cc 100644 --- a/src/mainboard/lenovo/x200/Kconfig +++ b/src/mainboard/lenovo/x200/Kconfig @@ -32,6 +32,10 @@ string default "ThinkPad X200"
+config MAINBOARD_FAMILY + string + default "ThinkPad X200" + config USBDEBUG_HCD_INDEX int default 2 diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 16f42e8..1861984 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -35,13 +35,18 @@ default "x220" if BOARD_LENOVO_X220 || BOARD_LENOVO_X220I default "x1" if BOARD_LENOVO_X1
- config MAINBOARD_PART_NUMBER string default "ThinkPad X220" if BOARD_LENOVO_X220 default "ThinkPad X220i" if BOARD_LENOVO_X220I default "ThinkPad X1" if BOARD_LENOVO_X1
+config MAINBOARD_FAMILY + string + default "ThinkPad X220" if BOARD_LENOVO_X220 + default "ThinkPad X220i" if BOARD_LENOVO_X220I + default "ThinkPad X1" if BOARD_LENOVO_X1 + config OVERRIDE_DEVICETREE string default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 5b34b83..2da651e 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -35,6 +35,10 @@ string default "ThinkPad X230"
+config MAINBOARD_FAMILY + string + default "ThinkPad X230" + config MAX_CPUS int default 8 diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 6db7f11..6ffe3b6 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -36,6 +36,10 @@ string default "ThinkPad X60"
+config MAINBOARD_FAMILY + string + default "ThinkPad X60" + config IRQ_SLOT_COUNT int default 18 diff --git a/src/mainboard/lenovo/z61t/Kconfig b/src/mainboard/lenovo/z61t/Kconfig index a223077..f0a20fd 100644 --- a/src/mainboard/lenovo/z61t/Kconfig +++ b/src/mainboard/lenovo/z61t/Kconfig @@ -33,6 +33,10 @@ string default "ThinkPad Z61t"
+config MAINBOARD_FAMILY + string + default "ThinkPad Z61t" + config MAX_CPUS int default 2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32727 )
Change subject: mb/lenovo/*: Add MAINBOARD_FAMILY ......................................................................
Patch Set 1:
How about a single entry that defaults to MAINBOARD_PART_NUMBER? We could also get rid of the `#ifdef` in `smbios.c` this way.
Hello Patrick Rudolph, Iru Cai (vimacs), Sven Schnelle, Arthur Heymans, Nico Rikken, build bot (Jenkins), Evgeny Zinoviev, Alexander Couzens, Marian Tietz, James, Philipp Deppenwiese, Marcello Sylvester Bauer,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32727
to look at the new patch set (#2).
Change subject: mb/lenovo/*: Add MAINBOARD_FAMILY ......................................................................
mb/lenovo/*: Add MAINBOARD_FAMILY
The Kconfig MAINBOARD_FAMILY sets the family field of SMBIOS entry 1. Match what vendor firmware does and use the same value as in the version field.
Required for fwupd which uses the family field to generate a GUID.
Change-Id: I0033c42c5eac6b9d47d0acd16c67467b6d419534 Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M src/mainboard/lenovo/Kconfig 1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/32727/2
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32727 )
Change subject: mb/lenovo/*: Add MAINBOARD_FAMILY ......................................................................
Patch Set 2:
Patch Set 1:
How about a single entry that defaults to MAINBOARD_PART_NUMBER? We could also get rid of the `#ifdef` in `smbios.c` this way.
Used a single Kconfig in src/mainboard/lenovo/Kconfig instead.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32727 )
Change subject: mb/lenovo/*: Add MAINBOARD_FAMILY ......................................................................
Patch Set 2: Code-Review+2
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32727 )
Change subject: mb/lenovo/*: Add MAINBOARD_FAMILY ......................................................................
Patch Set 2: Code-Review+1
Patrick Rudolph has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32727 )
Change subject: mb/lenovo/*: Add MAINBOARD_FAMILY ......................................................................
mb/lenovo/*: Add MAINBOARD_FAMILY
The Kconfig MAINBOARD_FAMILY sets the family field of SMBIOS entry 1. Match what vendor firmware does and use the same value as in the version field.
Required for fwupd which uses the family field to generate a GUID.
Change-Id: I0033c42c5eac6b9d47d0acd16c67467b6d419534 Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/32727 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net --- M src/mainboard/lenovo/Kconfig 1 file changed, 4 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve
diff --git a/src/mainboard/lenovo/Kconfig b/src/mainboard/lenovo/Kconfig index a57b462..ea1ead1 100644 --- a/src/mainboard/lenovo/Kconfig +++ b/src/mainboard/lenovo/Kconfig @@ -13,4 +13,8 @@ string default "LENOVO"
+config MAINBOARD_FAMILY + string + default MAINBOARD_PART_NUMBER + endif # VENDOR_LENOVO
Nico Rikken has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32727 )
Change subject: mb/lenovo/*: Add MAINBOARD_FAMILY ......................................................................
Patch Set 3: Code-Review+1
Just checking in from my W520 with firmware based on commit 556cc26337bc3b36b20f139b5627de441eba88ef (Mon Nov 11 14:28:32 2019 +0100). It seems to work flawlessly, so thanks for this work.
-
Nico Huber (Code Review) -
Nico Rikken (Code Review)
-
Patrick Rudolph (Code Review)
-
Paul Menzel (Code Review)