ibexpeak: Merge common NVS init

Change-Id: Ia5e26110928fa011305c13362f20fbe78ca9cf30
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7134
Tested-by: build bot (Jenkins)
Reviewed-by: Nicolas Reinecke <nr@das-labor.org>
This commit is contained in:
Vladimir Serbinenko 2014-10-20 19:16:44 +02:00
parent a3565ae7c6
commit 9d45d6975c
3 changed files with 5 additions and 10 deletions

View File

@ -34,11 +34,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 */
gnvs->pcnt = dev_count_cpu();
/* IGD Displays */ /* IGD Displays */
gnvs->ndid = 3; gnvs->ndid = 3;
gnvs->did[0] = 0x80000100; gnvs->did[0] = 0x80000100;

View File

@ -34,11 +34,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 */
gnvs->pcnt = dev_count_cpu();
/* IGD Displays */ /* IGD Displays */
gnvs->ndid = 3; gnvs->ndid = 3;
gnvs->did[0] = 0x80000100; gnvs->did[0] = 0x80000100;

View File

@ -674,6 +674,11 @@ static void southbridge_inject_dsdt(void)
memset(gnvs, 0, sizeof (*gnvs)); memset(gnvs, 0, sizeof (*gnvs));
acpi_create_gnvs(gnvs); acpi_create_gnvs(gnvs);
gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */
gnvs->pcnt = dev_count_cpu();
/* IGD OpRegion Base Address */ /* IGD OpRegion Base Address */
gnvs->aslb = (u32)opregion; gnvs->aslb = (u32)opregion;
/* And tell SMI about it */ /* And tell SMI about it */