Patch set updated for coreboot: 655695a Allow mainboard vendor name and part number override in SMBIOS tables

[Peter Stuge]

Peter Stuge ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1556

-gerrit

commit 655695aeb8f7ff74cc2e2cec0a2bd4851a401ba2
Author: Peter Stuge 
Date:   Thu Oct 4 21:18:13 2012 +0200

Allow mainboard vendor name and part number override in SMBIOS tables

Change-Id: I0dfe38b9f6f99b3376f1547412ecc97c2f7aff2b
    Signed-off-by: Peter Stuge 
---
 src/arch/x86/boot/smbios.c |  6 +++---
 src/mainboard/Kconfig      | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c
index 308336a..807cfad 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_VENDOR);
+	t->product_name = smbios_add_string(t->eos, CONFIG_MAINBOARD_SMBIOS_PART_NUMBER);
    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_VENDOR);
    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 3ca21ff..bf29fca 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -341,4 +341,17 @@ config MAINBOARD_VERSION
    default "1.0"
    help
      Define the used version number which will be used by SMBIOS tables.
+
+config MAINBOARD_SMBIOS_VENDOR
+	string "BIOS table vendor string"
+	default MAINBOARD_VENDOR
+	help
+	  Override the default mainboard vendor string used by SMBIOS tables.
+
+config MAINBOARD_SMBIOS_PART_NUMBER
+	string "BIOS table part number string"
+	default MAINBOARD_PART_NUMBER
+	help
+	  Override the default mainboard part number string used by SMBIOS tables.
+
 endmenu