i945: Consolidate common GNVS init

Change-Id: Idc3522807b17e56bdaf8f04b4bd68c6ed9777363
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7110
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Vladimir Serbinenko 2014-10-18 02:26:21 +02:00
parent 39bbc8cb97
commit 385743acbc
9 changed files with 4 additions and 31 deletions

View File

@ -33,10 +33,6 @@
#include "southbridge/intel/i82801gx/nvs.h" #include "southbridge/intel/i82801gx/nvs.h"
void acpi_create_gnvs(global_nvs_t *gnvs) 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 */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;
gnvs->cmbp = 0x01; gnvs->cmbp = 0x01;

View File

@ -35,10 +35,6 @@
void acpi_create_gnvs(global_nvs_t *gnvs) 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) */ /* Enable COM port(s) */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;
gnvs->cmbp = 0x00; gnvs->cmbp = 0x00;

View File

@ -32,10 +32,6 @@
#include "southbridge/intel/i82801gx/nvs.h" #include "southbridge/intel/i82801gx/nvs.h"
void acpi_create_gnvs(global_nvs_t *gnvs) 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 */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;
gnvs->cmbp = 0x01; gnvs->cmbp = 0x01;

View File

@ -33,9 +33,6 @@
void acpi_create_gnvs(global_nvs_t *gnvs) void acpi_create_gnvs(global_nvs_t *gnvs)
{ {
memset((void *)gnvs, 0, sizeof(*gnvs));
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
} }
unsigned long acpi_fill_madt(unsigned long current) unsigned long acpi_fill_madt(unsigned long current)

View File

@ -32,10 +32,6 @@
#include "southbridge/intel/i82801gx/nvs.h" #include "southbridge/intel/i82801gx/nvs.h"
void acpi_create_gnvs(global_nvs_t *gnvs) 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 */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;
gnvs->cmbp = 0x01; gnvs->cmbp = 0x01;

View File

@ -33,10 +33,6 @@
#include "southbridge/intel/i82801gx/nvs.h" #include "southbridge/intel/i82801gx/nvs.h"
void acpi_create_gnvs(global_nvs_t *gnvs) 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 */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;
gnvs->cmbp = 0x01; gnvs->cmbp = 0x01;

View File

@ -33,10 +33,6 @@
#include "southbridge/intel/i82801gx/nvs.h" #include "southbridge/intel/i82801gx/nvs.h"
void acpi_create_gnvs(global_nvs_t *gnvs) 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 */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;
gnvs->cmbp = 0x01; gnvs->cmbp = 0x01;

View File

@ -33,10 +33,6 @@
#include "southbridge/intel/i82801gx/nvs.h" #include "southbridge/intel/i82801gx/nvs.h"
void acpi_create_gnvs(global_nvs_t *gnvs) 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 */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;
gnvs->cmbp = 0x01; gnvs->cmbp = 0x01;

View File

@ -618,6 +618,10 @@ static void southbridge_inject_dsdt(void)
if (gnvs) { if (gnvs) {
memset(gnvs, 0, sizeof(*gnvs)); memset(gnvs, 0, sizeof(*gnvs));
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
acpi_create_gnvs(gnvs); acpi_create_gnvs(gnvs);
/* And tell SMI about it */ /* And tell SMI about it */
smm_setup_structures(gnvs, NULL, NULL); smm_setup_structures(gnvs, NULL, NULL);