Patch set updated for coreboot: 86c4da0 ibexpeak: Merge common NVS init

[Vladimir Serbinenko]

Vladimir Serbinenko ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7134

-gerrit

commit 86c4da0a47c174121998bad81b2a63234ae56947
Author: Vladimir Serbinenko 
Date:   Mon Oct 20 19:16:44 2014 +0200

ibexpeak: Merge common NVS init

Change-Id: Ia5e26110928fa011305c13362f20fbe78ca9cf30
    Signed-off-by: Vladimir Serbinenko 
---
 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 1ac4bd4..759858a 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 22e316c..d2f0d9a 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 9550a9e..6e41196 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -674,6 +674,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 */