Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7110
-gerrit
commit b9bc02032a5f50e044f9077f85350bec3e5b677c Author: Vladimir Serbinenko phcoder@gmail.com Date: Sat Oct 18 02:26:21 2014 +0200
i945: Consolidate common GNVS init
Change-Id: Idc3522807b17e56bdaf8f04b4bd68c6ed9777363 Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/mainboard/apple/macbook21/acpi_tables.c | 4 ---- src/mainboard/getac/p470/acpi_tables.c | 4 ---- src/mainboard/ibase/mb899/acpi_tables.c | 4 ---- src/mainboard/intel/d945gclf/acpi_tables.c | 3 --- src/mainboard/kontron/986lcd-m/acpi_tables.c | 4 ---- src/mainboard/lenovo/t60/acpi_tables.c | 4 ---- src/mainboard/lenovo/x60/acpi_tables.c | 4 ---- src/mainboard/roda/rk886ex/acpi_tables.c | 4 ---- src/southbridge/intel/i82801gx/lpc.c | 4 ++++ 9 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/src/mainboard/apple/macbook21/acpi_tables.c b/src/mainboard/apple/macbook21/acpi_tables.c index eff36d2..48c6f89 100644 --- a/src/mainboard/apple/macbook21/acpi_tables.c +++ b/src/mainboard/apple/macbook21/acpi_tables.c @@ -33,10 +33,6 @@ #include "southbridge/intel/i82801gx/nvs.h" void acpi_create_gnvs(global_nvs_t *gnvs) { - memset((void *)gnvs, 0, sizeof(*gnvs)); - gnvs->apic = 1; - gnvs->mpen = 1; /* Enable Multi Processing */ - /* Enable both COM ports */ gnvs->cmap = 0x01; gnvs->cmbp = 0x01; diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c index 9c46253..3e8abe5 100644 --- a/src/mainboard/getac/p470/acpi_tables.c +++ b/src/mainboard/getac/p470/acpi_tables.c @@ -35,10 +35,6 @@
void acpi_create_gnvs(global_nvs_t *gnvs) { - memset((void *)gnvs, 0, sizeof(*gnvs)); - gnvs->apic = 1; - gnvs->mpen = 1; /* Enable Multi Processing */ - /* Enable COM port(s) */ gnvs->cmap = 0x01; gnvs->cmbp = 0x00; diff --git a/src/mainboard/ibase/mb899/acpi_tables.c b/src/mainboard/ibase/mb899/acpi_tables.c index aa298c4..54ee4f6 100644 --- a/src/mainboard/ibase/mb899/acpi_tables.c +++ b/src/mainboard/ibase/mb899/acpi_tables.c @@ -32,10 +32,6 @@ #include "southbridge/intel/i82801gx/nvs.h" void acpi_create_gnvs(global_nvs_t *gnvs) { - memset((void *)gnvs, 0, sizeof(*gnvs)); - gnvs->apic = 1; - gnvs->mpen = 1; /* Enable Multi Processing */ - /* Enable both COM ports */ gnvs->cmap = 0x01; gnvs->cmbp = 0x01; diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c index 1c7062d..629a044 100644 --- a/src/mainboard/intel/d945gclf/acpi_tables.c +++ b/src/mainboard/intel/d945gclf/acpi_tables.c @@ -33,7 +33,4 @@
void acpi_create_gnvs(global_nvs_t *gnvs) { - memset((void *)gnvs, 0, sizeof(*gnvs)); - gnvs->apic = 1; - gnvs->mpen = 1; /* Enable Multi Processing */ } diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c index aa298c4..54ee4f6 100644 --- a/src/mainboard/kontron/986lcd-m/acpi_tables.c +++ b/src/mainboard/kontron/986lcd-m/acpi_tables.c @@ -32,10 +32,6 @@ #include "southbridge/intel/i82801gx/nvs.h" void acpi_create_gnvs(global_nvs_t *gnvs) { - memset((void *)gnvs, 0, sizeof(*gnvs)); - gnvs->apic = 1; - gnvs->mpen = 1; /* Enable Multi Processing */ - /* Enable both COM ports */ gnvs->cmap = 0x01; gnvs->cmbp = 0x01; diff --git a/src/mainboard/lenovo/t60/acpi_tables.c b/src/mainboard/lenovo/t60/acpi_tables.c index eff36d2..48c6f89 100644 --- a/src/mainboard/lenovo/t60/acpi_tables.c +++ b/src/mainboard/lenovo/t60/acpi_tables.c @@ -33,10 +33,6 @@ #include "southbridge/intel/i82801gx/nvs.h" void acpi_create_gnvs(global_nvs_t *gnvs) { - memset((void *)gnvs, 0, sizeof(*gnvs)); - gnvs->apic = 1; - gnvs->mpen = 1; /* Enable Multi Processing */ - /* Enable both COM ports */ gnvs->cmap = 0x01; gnvs->cmbp = 0x01; diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c index eff36d2..48c6f89 100644 --- a/src/mainboard/lenovo/x60/acpi_tables.c +++ b/src/mainboard/lenovo/x60/acpi_tables.c @@ -33,10 +33,6 @@ #include "southbridge/intel/i82801gx/nvs.h" void acpi_create_gnvs(global_nvs_t *gnvs) { - memset((void *)gnvs, 0, sizeof(*gnvs)); - gnvs->apic = 1; - gnvs->mpen = 1; /* Enable Multi Processing */ - /* Enable both COM ports */ gnvs->cmap = 0x01; gnvs->cmbp = 0x01; diff --git a/src/mainboard/roda/rk886ex/acpi_tables.c b/src/mainboard/roda/rk886ex/acpi_tables.c index eff36d2..48c6f89 100644 --- a/src/mainboard/roda/rk886ex/acpi_tables.c +++ b/src/mainboard/roda/rk886ex/acpi_tables.c @@ -33,10 +33,6 @@ #include "southbridge/intel/i82801gx/nvs.h" void acpi_create_gnvs(global_nvs_t *gnvs) { - memset((void *)gnvs, 0, sizeof(*gnvs)); - gnvs->apic = 1; - gnvs->mpen = 1; /* Enable Multi Processing */ - /* Enable both COM ports */ gnvs->cmap = 0x01; gnvs->cmbp = 0x01; diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index f47fb55..4c3d91d 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -639,6 +639,10 @@ static void southbridge_inject_dsdt(void) if (gnvs) { int scopelen; memset(gnvs, 0, sizeof(*gnvs)); + + gnvs->apic = 1; + gnvs->mpen = 1; /* Enable Multi Processing */ + acpi_create_gnvs(gnvs); /* And tell SMI about it */ smm_setup_structures(gnvs, NULL, NULL);