[coreboot-gerrit] Patch set updated for coreboot: 761c1bb SMBIOS: Allow overriding default Manufacturer and Product names

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1556

-gerrit

commit 761c1bbc985a9fe751440dc57bc0a89abead5daf
Author: Peter Stuge <peter at stuge.se>
Date:   Thu Oct 4 21:18:13 2012 +0200

    SMBIOS: Allow overriding default Manufacturer and Product names
    
    The vendor and part name from coreboot is normally stored in these
    SMBIOS structure fields, but it can be useful to override them.
    
    On Lenovo ThinkPads an override is e.g. needed to convince the Linux
    thinkpad_acpi.c driver that it is actually running on a ThinkPad.
    
    Change-Id: I0dfe38b9f6f99b3376f1547412ecc97c2f7aff2b
    Signed-off-by: Peter Stuge <peter at stuge.se>
---
 src/arch/x86/boot/smbios.c |  6 +++---
 src/mainboard/Kconfig      | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c
index 308336a..073c7c5 100644
--- a/src/arch/x86/boot/smbios.c
+++ b/src/arch/x86/boot/smbios.c
@@ -192,8 +192,8 @@ static int smbios_write_type1(unsigned long *current, int handle)
 	t->type = SMBIOS_SYSTEM_INFORMATION;
 	t->handle = handle;
 	t->length = len - 2;
-	t->manufacturer = smbios_add_string(t->eos, CONFIG_MAINBOARD_VENDOR);
-	t->product_name = smbios_add_string(t->eos, CONFIG_MAINBOARD_PART_NUMBER);
+	t->manufacturer = smbios_add_string(t->eos, CONFIG_MAINBOARD_SMBIOS_MANUFACTURER);
+	t->product_name = smbios_add_string(t->eos, CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME);
 	t->serial_number = smbios_add_string(t->eos, smbios_mainboard_serial_number());
 	t->version = smbios_add_string(t->eos, smbios_mainboard_version());
 	len = t->length + smbios_string_table_len(t->eos);
@@ -210,7 +210,7 @@ static int smbios_write_type3(unsigned long *current, int handle)
 	t->type = SMBIOS_SYSTEM_ENCLOSURE;
 	t->handle = handle;
 	t->length = len - 2;
-	t->manufacturer = smbios_add_string(t->eos, CONFIG_MAINBOARD_VENDOR);
+	t->manufacturer = smbios_add_string(t->eos, CONFIG_MAINBOARD_SMBIOS_MANUFACTURER);
 	t->bootup_state = SMBIOS_STATE_SAFE;
 	t->power_supply_state = SMBIOS_STATE_SAFE;
 	t->thermal_state = SMBIOS_STATE_SAFE;
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index d6413c9..a8cf362 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -347,4 +347,19 @@ config MAINBOARD_VERSION
 	default "1.0"
 	help
 	  Define the used version number which will be used by SMBIOS tables.
+
+config MAINBOARD_SMBIOS_MANUFACTURER
+	string "SMBIOS Manufacturer"
+	depends on GENERATE_SMBIOS_TABLES
+	default MAINBOARD_VENDOR
+	help
+	  Override the default Manufacturer stored in SMBIOS structures.
+
+config MAINBOARD_SMBIOS_PRODUCT_NAME
+	string "SMBIOS Product name"
+	depends on GENERATE_SMBIOS_TABLES
+	default MAINBOARD_PART_NUMBER
+	help
+	  Override the default Product name stored in SMBIOS structures.
+
 endmenu