[coreboot-gerrit] Patch set updated for coreboot: cc71321 lenovo: Hide SMBIOS config

[Vladimir Serbinenko (phcoder@gmail.com)]

Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7055

-gerrit

commit cc71321fd7e3b50a1dbca6e667b9933185137275
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Sun Oct 12 12:42:18 2014 +0200

    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 at gmail.com>
---
 src/drivers/i2c/at24rf08c/lenovo_serials.c     | 5 +++++
 src/mainboard/Kconfig                          | 8 ++++++++
 src/mainboard/lenovo/Kconfig                   | 4 ++++
 src/mainboard/lenovo/x201/acpi_tables.c        | 5 -----
 src/mainboard/packardbell/ms2290/acpi_tables.c | 5 -----
 src/southbridge/intel/ibexpeak/lpc.c           | 5 +++++
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/drivers/i2c/at24rf08c/lenovo_serials.c b/src/drivers/i2c/at24rf08c/lenovo_serials.c
index 53e76da..902bf1a 100644
--- a/src/drivers/i2c/at24rf08c/lenovo_serials.c
+++ b/src/drivers/i2c/at24rf08c/lenovo_serials.c
@@ -198,3 +198,8 @@ const char *smbios_mainboard_version(void)
 	already_read = 1;
 	return result;
 }
+
+const char *smbios_mainboard_manufacturer(void)
+{
+	return "LENOVO";
+}
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index f761b7a..57e8976 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -359,9 +359,14 @@ config ENABLE_POWER_BUTTON
 	def_bool y if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_ENABLE
 	def_bool n if !POWER_BUTTON_IS_OPTIONAL && POWER_BUTTON_FORCE_DISABLE
 
+config SMBIOS_PROVIDED_BY_MOBO
+	bool
+	default n
+
 config MAINBOARD_SERIAL_NUMBER
 	string "SMBIOS Serial Number"
 	depends on GENERATE_SMBIOS_TABLES
+	depends on !SMBIOS_PROVIDED_BY_MOBO
 	default "123456789"
         help
 	  The Serial Number to store in SMBIOS structures.
@@ -369,6 +374,7 @@ config MAINBOARD_SERIAL_NUMBER
 config MAINBOARD_VERSION
 	string "SMBIOS Version Number"
 	depends on GENERATE_SMBIOS_TABLES
+	depends on !SMBIOS_PROVIDED_BY_MOBO
 	default "1.0"
 	help
 	  The Version Number to store in SMBIOS structures.
@@ -376,6 +382,7 @@ config MAINBOARD_VERSION
 config MAINBOARD_SMBIOS_MANUFACTURER
 	string "SMBIOS Manufacturer"
 	depends on GENERATE_SMBIOS_TABLES
+	depends on !SMBIOS_PROVIDED_BY_MOBO
 	default MAINBOARD_VENDOR
 	help
 	  Override the default Manufacturer stored in SMBIOS structures.
@@ -383,6 +390,7 @@ config MAINBOARD_SMBIOS_MANUFACTURER
 config MAINBOARD_SMBIOS_PRODUCT_NAME
 	string "SMBIOS Product name"
 	depends on GENERATE_SMBIOS_TABLES
+	depends on !SMBIOS_PROVIDED_BY_MOBO
 	default MAINBOARD_PART_NUMBER
 	help
 	  Override the default Product name stored in SMBIOS structures.
diff --git a/src/mainboard/lenovo/Kconfig b/src/mainboard/lenovo/Kconfig
index c3ba61b..9fa43d6 100644
--- a/src/mainboard/lenovo/Kconfig
+++ b/src/mainboard/lenovo/Kconfig
@@ -1,5 +1,9 @@
 if VENDOR_LENOVO
 
+config SMBIOS_PROVIDED_BY_MOBO
+	bool
+	default y
+
 choice
 	prompt "Mainboard model"
 
diff --git a/src/mainboard/lenovo/x201/acpi_tables.c b/src/mainboard/lenovo/x201/acpi_tables.c
index 31accee..e58b969 100644
--- a/src/mainboard/lenovo/x201/acpi_tables.c
+++ b/src/mainboard/lenovo/x201/acpi_tables.c
@@ -34,11 +34,6 @@
 
 void acpi_create_gnvs(global_nvs_t * gnvs)
 {
-	memset((void *)gnvs, 0, sizeof(*gnvs));
-	gnvs->apic = 1;
-	gnvs->mpen = 1;		/* Enable Multi Processing */
-	gnvs->pcnt = dev_count_cpu();
-
 	/* IGD Displays */
 	gnvs->ndid = 3;
 	gnvs->did[0] = 0x80000100;
diff --git a/src/mainboard/packardbell/ms2290/acpi_tables.c b/src/mainboard/packardbell/ms2290/acpi_tables.c
index 31accee..e58b969 100644
--- a/src/mainboard/packardbell/ms2290/acpi_tables.c
+++ b/src/mainboard/packardbell/ms2290/acpi_tables.c
@@ -34,11 +34,6 @@
 
 void acpi_create_gnvs(global_nvs_t * gnvs)
 {
-	memset((void *)gnvs, 0, sizeof(*gnvs));
-	gnvs->apic = 1;
-	gnvs->mpen = 1;		/* Enable Multi Processing */
-	gnvs->pcnt = dev_count_cpu();
-
 	/* IGD Displays */
 	gnvs->ndid = 3;
 	gnvs->did[0] = 0x80000100;
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 31bb4e7..317a69a 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -679,6 +679,11 @@ static void southbridge_inject_dsdt(void)
 		memset(gnvs, 0, sizeof (*gnvs));
 
 		acpi_create_gnvs(gnvs);
+
+		gnvs->apic = 1;
+		gnvs->mpen = 1;		/* Enable Multi Processing */
+		gnvs->pcnt = dev_count_cpu();
+
 		/* IGD OpRegion Base Address */
 		gnvs->aslb = (u32)opregion;
 		/* And tell SMI about it */