[coreboot-gerrit] Patch set updated for coreboot: 0c97679 ibexpeak: Merge common NVS init

[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/7134

-gerrit

commit 0c976794cfb77f304203d092654baa0723f69d3e
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Mon Oct 20 19:16:44 2014 +0200

    ibexpeak: Merge common NVS init
    
    Change-Id: Ia5e26110928fa011305c13362f20fbe78ca9cf30
    Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
 src/mainboard/lenovo/x201/acpi_tables.c        | 5 -----
 src/mainboard/packardbell/ms2290/acpi_tables.c | 5 -----
 src/southbridge/intel/ibexpeak/lpc.c           | 5 +++++
 3 files changed, 5 insertions(+), 10 deletions(-)

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 03b4049..0f362a7 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 */