Attention is currently required from: Damien Zammit, Angel Pons, Alexander Couzens, Patrick Rudolph.

Kyösti Mälkki has uploaded this change for review.

View Change

[WIP] mainboards: Move GNVS PWRS

Change-Id: I3f834cf7563b9e512fcab34cdb7a27a9f0fd31c0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M src/cpu/x86/mp_init.c
M src/mainboard/acer/g43t-am3/acpi_tables.c
D src/mainboard/asrock/g41c-gs/acpi_tables.c
M src/mainboard/asus/p5qc/acpi_tables.c
M src/mainboard/asus/p5ql-em/acpi_tables.c
D src/mainboard/asus/p5qpl-am/acpi_tables.c
D src/mainboard/foxconn/g41s-k/acpi_tables.c
M src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
D src/mainboard/intel/dg41wv/acpi_tables.c
M src/mainboard/intel/dg43gt/acpi_tables.c
D src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
11 files changed, 3 insertions(+), 50 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/49352/1

diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 23d16fb..721dc77 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -131,6 +131,9 @@
 
 	/* Enable Multi Processing, c-state/p-state. MPEN */
 	gnvs->mpen = gnvs->pcnt > 1 ? 1 : 0;
+
+	/* If no EC present, on AC. */
+	gnvs->pwrs = 1; /* Power state (AC = 1) */
 }
 #endif
 
diff --git a/src/mainboard/acer/g43t-am3/acpi_tables.c b/src/mainboard/acer/g43t-am3/acpi_tables.c
index 67e7b1a0..cd44ed2 100644
--- a/src/mainboard/acer/g43t-am3/acpi_tables.c
+++ b/src/mainboard/acer/g43t-am3/acpi_tables.c
@@ -5,6 +5,5 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	gnvs->pwrs = 1;	   /* Power state (AC = 1) */
 	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
 }
diff --git a/src/mainboard/asrock/g41c-gs/acpi_tables.c b/src/mainboard/asrock/g41c-gs/acpi_tables.c
deleted file mode 100644
index 566cad7..0000000
--- a/src/mainboard/asrock/g41c-gs/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->pwrs = 1;    /* Power state (AC = 1) */
-}
diff --git a/src/mainboard/asus/p5qc/acpi_tables.c b/src/mainboard/asus/p5qc/acpi_tables.c
index 1ac0957..cd44ed2 100644
--- a/src/mainboard/asus/p5qc/acpi_tables.c
+++ b/src/mainboard/asus/p5qc/acpi_tables.c
@@ -5,6 +5,5 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	gnvs->pwrs = 1;    /* Power state (AC = 1) */
 	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
 }
diff --git a/src/mainboard/asus/p5ql-em/acpi_tables.c b/src/mainboard/asus/p5ql-em/acpi_tables.c
index 1ac0957..cd44ed2 100644
--- a/src/mainboard/asus/p5ql-em/acpi_tables.c
+++ b/src/mainboard/asus/p5ql-em/acpi_tables.c
@@ -5,6 +5,5 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	gnvs->pwrs = 1;    /* Power state (AC = 1) */
 	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
 }
diff --git a/src/mainboard/asus/p5qpl-am/acpi_tables.c b/src/mainboard/asus/p5qpl-am/acpi_tables.c
deleted file mode 100644
index 566cad7..0000000
--- a/src/mainboard/asus/p5qpl-am/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->pwrs = 1;    /* Power state (AC = 1) */
-}
diff --git a/src/mainboard/foxconn/g41s-k/acpi_tables.c b/src/mainboard/foxconn/g41s-k/acpi_tables.c
deleted file mode 100644
index 3bdb266..0000000
--- a/src/mainboard/foxconn/g41s-k/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->pwrs = 1; /* Power state (AC = 1) */
-}
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
index 1ac0957..cd44ed2 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
@@ -5,6 +5,5 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	gnvs->pwrs = 1;    /* Power state (AC = 1) */
 	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
 }
diff --git a/src/mainboard/intel/dg41wv/acpi_tables.c b/src/mainboard/intel/dg41wv/acpi_tables.c
deleted file mode 100644
index 566cad7..0000000
--- a/src/mainboard/intel/dg41wv/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->pwrs = 1;    /* Power state (AC = 1) */
-}
diff --git a/src/mainboard/intel/dg43gt/acpi_tables.c b/src/mainboard/intel/dg43gt/acpi_tables.c
index 1ac0957..cd44ed2 100644
--- a/src/mainboard/intel/dg43gt/acpi_tables.c
+++ b/src/mainboard/intel/dg43gt/acpi_tables.c
@@ -5,6 +5,5 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	gnvs->pwrs = 1;    /* Power state (AC = 1) */
 	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
 }
diff --git a/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c b/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
deleted file mode 100644
index 566cad7..0000000
--- a/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->pwrs = 1;    /* Power state (AC = 1) */
-}

To view, visit change 49352. To unsubscribe, or for help writing mail filters, visit settings.