summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-11-13 13:37:23 +0100
committerGerd Hoffmann <kraxel@redhat.com>2013-11-18 12:49:29 +0100
commit06262743c76102083287f5085380138164117bc7 (patch)
tree4cf46a57755a3fe06488b04b95cf6bdbef706c45
parenta4affe17f1a31946841b6fa425d0ef4b3ea00855 (diff)
downloadcoreboot-06262743c76102083287f5085380138164117bc7.tar.xz
smbios: make manufacturer, product_name and uuid runtime settable
Make manufacturer, product_name and uuid smbios fields (type 1) configurable at runtime, simliar to version and serial number. Change-Id: Ibc826225e31fa42aa944fa43632dd6a406d5c85d Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-on: http://review.coreboot.org/4085 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/arch/x86/boot/smbios.c20
-rw-r--r--src/include/smbios.h3
2 files changed, 21 insertions, 2 deletions
diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c
index 901a209eda..b8f2ec7c28 100644
--- a/src/arch/x86/boot/smbios.c
+++ b/src/arch/x86/boot/smbios.c
@@ -183,6 +183,21 @@ const char *__attribute__((weak)) smbios_mainboard_version(void)
return CONFIG_MAINBOARD_VERSION;
}
+const char *__attribute__((weak)) smbios_mainboard_manufacturer(void)
+{
+ return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER;
+}
+
+const char *__attribute__((weak)) smbios_mainboard_product_name(void)
+{
+ return CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME;
+}
+
+void __attribute__((weak)) smbios_mainboard_set_uuid(u8 *uuid)
+{
+ /* leave all zero */
+}
+
static int smbios_write_type1(unsigned long *current, int handle)
{
struct smbios_type1 *t = (struct smbios_type1 *)*current;
@@ -192,10 +207,11 @@ 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_SMBIOS_MANUFACTURER);
- t->product_name = smbios_add_string(t->eos, CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME);
+ t->manufacturer = smbios_add_string(t->eos, smbios_mainboard_manufacturer());
+ t->product_name = smbios_add_string(t->eos, smbios_mainboard_product_name());
t->serial_number = smbios_add_string(t->eos, smbios_mainboard_serial_number());
t->version = smbios_add_string(t->eos, smbios_mainboard_version());
+ smbios_mainboard_set_uuid(t->uuid);
len = t->length + smbios_string_table_len(t->eos);
*current += len;
return len;
diff --git a/src/include/smbios.h b/src/include/smbios.h
index 9051a6991f..ebe167ef20 100644
--- a/src/include/smbios.h
+++ b/src/include/smbios.h
@@ -8,8 +8,11 @@ unsigned long smbios_write_tables(unsigned long start);
int smbios_add_string(char *start, const char *str);
int smbios_string_table_len(char *start);
+const char *smbios_mainboard_manufacturer(void);
+const char *smbios_mainboard_product_name(void);
const char *smbios_mainboard_serial_number(void);
const char *smbios_mainboard_version(void);
+void smbios_mainboard_set_uuid(u8 *uuid);
#define BIOS_CHARACTERISTICS_PCI_SUPPORTED (1 << 7)
#define BIOS_CHARACTERISTICS_PC_CARD (1 << 8)