GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lenovo: Hide SMBIOS config 

It's derived from EEPROM on Lenovo machines and not from user config
which is ignored.

Change-Id: I54fb76a3160e47cd36d33d2937c4bfaddcd36a69
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7055
Tested-by: build bot (Jenkins)
Reviewed-by: Nicolas Reinecke <nr@das-labor.org>
This commit is contained in:
Vladimir Serbinenko 2015-05-30 23:08:26 +02:00
parent 1a1a826276
commit 0afdec4cdc
5 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Kconfig
View File

@ -588,9 +588,14 @@ config GENERATE_SMBIOS_TABLES
If unsure, say Y. If unsure, say Y.
config SMBIOS_PROVIDED_BY_MOBO
bool
default n
config MAINBOARD_SERIAL_NUMBER config MAINBOARD_SERIAL_NUMBER
string "SMBIOS Serial Number" string "SMBIOS Serial Number"
depends on GENERATE_SMBIOS_TABLES depends on GENERATE_SMBIOS_TABLES
depends on !SMBIOS_PROVIDED_BY_MOBO
default "123456789" default "123456789"
help help
The Serial Number to store in SMBIOS structures. The Serial Number to store in SMBIOS structures.
@ -598,6 +603,7 @@ config MAINBOARD_SERIAL_NUMBER
config MAINBOARD_VERSION config MAINBOARD_VERSION
string "SMBIOS Version Number" string "SMBIOS Version Number"
depends on GENERATE_SMBIOS_TABLES depends on GENERATE_SMBIOS_TABLES
depends on !SMBIOS_PROVIDED_BY_MOBO
default "1.0" default "1.0"
help help
The Version Number to store in SMBIOS structures. The Version Number to store in SMBIOS structures.
@ -605,6 +611,7 @@ config MAINBOARD_VERSION
config MAINBOARD_SMBIOS_MANUFACTURER config MAINBOARD_SMBIOS_MANUFACTURER
string "SMBIOS Manufacturer" string "SMBIOS Manufacturer"
depends on GENERATE_SMBIOS_TABLES depends on GENERATE_SMBIOS_TABLES
depends on !SMBIOS_PROVIDED_BY_MOBO
default MAINBOARD_VENDOR default MAINBOARD_VENDOR
help help
Override the default Manufacturer stored in SMBIOS structures. Override the default Manufacturer stored in SMBIOS structures.
@ -612,6 +619,7 @@ config MAINBOARD_SMBIOS_MANUFACTURER
config MAINBOARD_SMBIOS_PRODUCT_NAME config MAINBOARD_SMBIOS_PRODUCT_NAME
string "SMBIOS Product name" string "SMBIOS Product name"
depends on GENERATE_SMBIOS_TABLES depends on GENERATE_SMBIOS_TABLES
depends on !SMBIOS_PROVIDED_BY_MOBO
default MAINBOARD_PART_NUMBER default MAINBOARD_PART_NUMBER
help help
Override the default Product name stored in SMBIOS structures. Override the default Product name stored in SMBIOS structures.

3
src/arch/x86/boot/smbios.c
View File

@ -281,6 +281,8 @@ static int smbios_write_type0(unsigned long *current, int handle)
return len; return len;
} }
#if !CONFIG_SMBIOS_PROVIDED_BY_MOBO
const char *__attribute__((weak)) smbios_mainboard_serial_number(void) const char *__attribute__((weak)) smbios_mainboard_serial_number(void)
{ {
return CONFIG_MAINBOARD_SERIAL_NUMBER; return CONFIG_MAINBOARD_SERIAL_NUMBER;
@ -305,6 +307,7 @@ void __attribute__((weak)) smbios_mainboard_set_uuid(u8 *uuid)
{ {
/* leave all zero */ /* leave all zero */
} }
#endif
#ifdef CONFIG_MAINBOARD_FAMILY #ifdef CONFIG_MAINBOARD_FAMILY
const char *smbios_mainboard_family(void) const char *smbios_mainboard_family(void)

1
src/drivers/i2c/Kconfig
View File

@ -1,6 +1,7 @@
source src/drivers/i2c/adm1026/Kconfig source src/drivers/i2c/adm1026/Kconfig
source src/drivers/i2c/adm1027/Kconfig source src/drivers/i2c/adm1027/Kconfig
source src/drivers/i2c/adt7463/Kconfig source src/drivers/i2c/adt7463/Kconfig
source src/drivers/i2c/at24rf08c/Kconfig
source src/drivers/i2c/i2cmux/Kconfig source src/drivers/i2c/i2cmux/Kconfig
source src/drivers/i2c/i2cmux2/Kconfig source src/drivers/i2c/i2cmux2/Kconfig
source src/drivers/i2c/lm63/Kconfig source src/drivers/i2c/lm63/Kconfig

7
src/drivers/i2c/at24rf08c/Kconfig Normal file
View File

@ -0,0 +1,7 @@
if VENDOR_LENOVO
config SMBIOS_PROVIDED_BY_MOBO
bool
default y
endif

5
src/drivers/i2c/at24rf08c/lenovo_serials.c
View File

@ -213,3 +213,8 @@ const char *smbios_mainboard_bios_version(void)
s = strconcat("CBET4000 ", coreboot_version); s = strconcat("CBET4000 ", coreboot_version);
return s; return s;
} }
const char *smbios_mainboard_manufacturer(void)
{
return "LENOVO";
}