summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/x86/boot/smbios.c6
-rw-r--r--src/mainboard/Kconfig15
2 files changed, 18 insertions, 3 deletions
diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c
index 308336a5e8..073c7c5e08 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 d6413c94ef..a8cf362a05 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