From f43ba9cf185f84c484f72bd681adcb0224a65b9b Mon Sep 17 00:00:00 2001 From: Marc Jones Date: Tue, 9 Jun 2015 21:10:43 -0600 Subject: smbios: Fix type1 family setting The type1 family setting from chromium was mis-merged into the type2 function. Move it to the correct type1 function. Bad commit: 51bdc4781635b99d89e6b7a414a2172be8cb690c Change-Id: I72e6ef80bbf185a39fcf169c8247dc16462e6bc3 Signed-off-by: Marc Jones Reviewed-on: http://review.coreboot.org/10498 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/arch/x86/boot/smbios.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/arch') diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index 11c2d1c6d6..2f1226dd7a 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -326,6 +326,9 @@ static int smbios_write_type1(unsigned long *current, int handle) 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()); +#ifdef CONFIG_MAINBOARD_FAMILY + t->family = smbios_add_string(t->eos, smbios_mainboard_family()); +#endif smbios_mainboard_set_uuid(t->uuid); len = t->length + smbios_string_table_len(t->eos); *current += len; @@ -345,9 +348,6 @@ static int smbios_write_type2(unsigned long *current, int handle) 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()); -#ifdef CONFIG_MAINBOARD_FAMILY - t->family = smbios_add_string(t->eos, smbios_mainboard_family()); -#endif len = t->length + smbios_string_table_len(t->eos); *current += len; return len; -- cgit v1.2.3