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

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

View Change

mainboards: Drop GNVS cmap and cmbp

Functionality depends of CMAP and CMBP references inside board
specific ASL implementation. Only roda/rk9 and roda/rk886ex has
that.

Change-Id: I4da8292375cb589d67dc68496b1e81971bc2a61f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
D src/mainboard/apple/macbook21/acpi_tables.c
M 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
M src/mainboard/asus/p5qpl-am/acpi_tables.c
M src/mainboard/emulation/qemu-q35/acpi_tables.c
M src/mainboard/foxconn/g41s-k/acpi_tables.c
M src/mainboard/getac/p470/acpi_tables.c
M src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
D src/mainboard/ibase/mb899/acpi_tables.c
M src/mainboard/intel/dg41wv/acpi_tables.c
M src/mainboard/intel/dg43gt/acpi_tables.c
D src/mainboard/kontron/986lcd-m/acpi_tables.c
M src/mainboard/lenovo/t400/acpi_tables.c
M src/mainboard/lenovo/t60/acpi_tables.c
M src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
M src/mainboard/lenovo/x200/acpi_tables.c
M src/mainboard/lenovo/x60/acpi_tables.c
18 files changed, 0 insertions(+), 76 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/49274/1
diff --git a/src/mainboard/apple/macbook21/acpi_tables.c b/src/mainboard/apple/macbook21/acpi_tables.c
deleted file mode 100644
index 6970dfc..0000000
--- a/src/mainboard/apple/macbook21/acpi_tables.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/i82801gx/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	/* Enable both COM ports */
-	gnvs->cmap = 0x01;
-	gnvs->cmbp = 0x01;
-
-}
diff --git a/src/mainboard/asrock/g41c-gs/acpi_tables.c b/src/mainboard/asrock/g41c-gs/acpi_tables.c
index 720652663..d14f59e 100644
--- a/src/mainboard/asrock/g41c-gs/acpi_tables.c
+++ b/src/mainboard/asrock/g41c-gs/acpi_tables.c
@@ -6,5 +6,4 @@
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
 	gnvs->pwrs = 1;    /* Power state (AC = 1) */
-	gnvs->cmap = 0x01; /* Enable COM 1 port */
 }
diff --git a/src/mainboard/asus/p5qc/acpi_tables.c b/src/mainboard/asus/p5qc/acpi_tables.c
index 5063ae6..d519632 100644
--- a/src/mainboard/asus/p5qc/acpi_tables.c
+++ b/src/mainboard/asus/p5qc/acpi_tables.c
@@ -7,5 +7,4 @@
 {
 	gnvs->pwrs = 1;    /* Power state (AC = 1) */
 	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
-	gnvs->cmap = 0x01; /* Enable COM 1 port */
 }
diff --git a/src/mainboard/asus/p5ql-em/acpi_tables.c b/src/mainboard/asus/p5ql-em/acpi_tables.c
index 21457ac..2094139 100644
--- a/src/mainboard/asus/p5ql-em/acpi_tables.c
+++ b/src/mainboard/asus/p5ql-em/acpi_tables.c
@@ -8,7 +8,6 @@
 {
 	gnvs->pwrs = 1;    /* Power state (AC = 1) */
 	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
-	gnvs->cmap = 0x01; /* Enable COM 1 port */
 }
 
 /* TODO: Could work... */
diff --git a/src/mainboard/asus/p5qpl-am/acpi_tables.c b/src/mainboard/asus/p5qpl-am/acpi_tables.c
index 720652663..d14f59e 100644
--- a/src/mainboard/asus/p5qpl-am/acpi_tables.c
+++ b/src/mainboard/asus/p5qpl-am/acpi_tables.c
@@ -6,5 +6,4 @@
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
 	gnvs->pwrs = 1;    /* Power state (AC = 1) */
-	gnvs->cmap = 0x01; /* Enable COM 1 port */
 }
diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c
index 15f2e56..d17f1d4 100644
--- a/src/mainboard/emulation/qemu-q35/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c
@@ -16,9 +16,6 @@
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
 
-	/* Enable both COM ports */
-	gnvs->cmap = 0x01;
-	gnvs->cmbp = 0x01;
 }
 
 void mainboard_fill_fadt(acpi_fadt_t *fadt)
diff --git a/src/mainboard/foxconn/g41s-k/acpi_tables.c b/src/mainboard/foxconn/g41s-k/acpi_tables.c
index 38c0704..e0a0749 100644
--- a/src/mainboard/foxconn/g41s-k/acpi_tables.c
+++ b/src/mainboard/foxconn/g41s-k/acpi_tables.c
@@ -6,8 +6,6 @@
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
 	gnvs->pwrs = 1; /* Power state (AC = 1) */
-	gnvs->cmap = 1; /* COM 1 port */
-	gnvs->cmap = 1; /* COM 2 port */
 	gnvs->lptp = 0; /* LPT port */
 	gnvs->fdcp = 0; /* Floppy Disk Controller */
 }
diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c
index 96e3d31..2de388a 100644
--- a/src/mainboard/getac/p470/acpi_tables.c
+++ b/src/mainboard/getac/p470/acpi_tables.c
@@ -3,19 +3,10 @@
 #include <string.h>
 #include <console/console.h>
 #include <acpi/acpi.h>
-#include <acpi/acpi_gnvs.h>
 #include <device/device.h>
-#include <southbridge/intel/i82801gx/nvs.h>
 
 #include "mainboard.h"
 
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	/* Enable COM port(s) */
-	gnvs->cmap = 0x01;
-	gnvs->cmbp = 0x00;
-}
-
 static long acpi_create_ecdt(acpi_ecdt_t * ecdt)
 {
 	/* Attention: Make sure these match the values from
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
index 3e06c96..ca206b5 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
@@ -9,5 +9,4 @@
 	gnvs->lptp = 0;    /* LPT port */
 	gnvs->fdcp = 0;    /* Floppy Disk Controller */
 	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
-	gnvs->cmap = 0x01; /* Enable COM 1 port */
 }
diff --git a/src/mainboard/ibase/mb899/acpi_tables.c b/src/mainboard/ibase/mb899/acpi_tables.c
deleted file mode 100644
index 6970dfc..0000000
--- a/src/mainboard/ibase/mb899/acpi_tables.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/i82801gx/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	/* Enable both COM ports */
-	gnvs->cmap = 0x01;
-	gnvs->cmbp = 0x01;
-
-}
diff --git a/src/mainboard/intel/dg41wv/acpi_tables.c b/src/mainboard/intel/dg41wv/acpi_tables.c
index 720652663..d14f59e 100644
--- a/src/mainboard/intel/dg41wv/acpi_tables.c
+++ b/src/mainboard/intel/dg41wv/acpi_tables.c
@@ -6,5 +6,4 @@
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
 	gnvs->pwrs = 1;    /* Power state (AC = 1) */
-	gnvs->cmap = 0x01; /* Enable COM 1 port */
 }
diff --git a/src/mainboard/intel/dg43gt/acpi_tables.c b/src/mainboard/intel/dg43gt/acpi_tables.c
index 5063ae6..d519632 100644
--- a/src/mainboard/intel/dg43gt/acpi_tables.c
+++ b/src/mainboard/intel/dg43gt/acpi_tables.c
@@ -7,5 +7,4 @@
 {
 	gnvs->pwrs = 1;    /* Power state (AC = 1) */
 	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
-	gnvs->cmap = 0x01; /* Enable COM 1 port */
 }
diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c
deleted file mode 100644
index 6970dfc..0000000
--- a/src/mainboard/kontron/986lcd-m/acpi_tables.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/i82801gx/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	/* Enable both COM ports */
-	gnvs->cmap = 0x01;
-	gnvs->cmbp = 0x01;
-
-}
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index 9c9a951..f4f8040 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -9,11 +9,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-
-	/* Enable both COM ports */
-	gnvs->cmap = 0x01;
-	gnvs->cmbp = 0x01;
-
 	/* Temperature at which OS will shutdown */
 	gnvs->tcrt = 100;
 	/* Temperature at which OS will throttle CPU */
diff --git a/src/mainboard/lenovo/t60/acpi_tables.c b/src/mainboard/lenovo/t60/acpi_tables.c
index 4a9c6ae..d742db0 100644
--- a/src/mainboard/lenovo/t60/acpi_tables.c
+++ b/src/mainboard/lenovo/t60/acpi_tables.c
@@ -5,10 +5,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	/* Enable both COM ports */
-	gnvs->cmap = 0x01;
-	gnvs->cmbp = 0x01;
-
 	/* Temperature at which OS will shutdown */
 	gnvs->tcrt = 100;
 	/* Temperature at which OS will throttle CPU */
diff --git a/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c b/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
index 720652663..d14f59e 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
+++ b/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
@@ -6,5 +6,4 @@
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
 	gnvs->pwrs = 1;    /* Power state (AC = 1) */
-	gnvs->cmap = 0x01; /* Enable COM 1 port */
 }
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index 9c9a951..f4f8040 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -9,11 +9,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-
-	/* Enable both COM ports */
-	gnvs->cmap = 0x01;
-	gnvs->cmbp = 0x01;
-
 	/* Temperature at which OS will shutdown */
 	gnvs->tcrt = 100;
 	/* Temperature at which OS will throttle CPU */
diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c
index 4a9c6ae..d742db0 100644
--- a/src/mainboard/lenovo/x60/acpi_tables.c
+++ b/src/mainboard/lenovo/x60/acpi_tables.c
@@ -5,10 +5,6 @@
 
 void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
-	/* Enable both COM ports */
-	gnvs->cmap = 0x01;
-	gnvs->cmbp = 0x01;
-
 	/* Temperature at which OS will shutdown */
 	gnvs->tcrt = 100;
 	/* Temperature at which OS will throttle CPU */

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

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I4da8292375cb589d67dc68496b1e81971bc2a61f
Gerrit-Change-Number: 49274
Gerrit-PatchSet: 1
Gerrit-Owner: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Alexander Couzens <lynxis@fe80.eu>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Damien Zammit
Gerrit-Reviewer: Evgeny Zinoviev <me@ch1p.io>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org>
Gerrit-Attention: Damien Zammit
Gerrit-Attention: Angel Pons <th3fanbus@gmail.com>
Gerrit-Attention: Evgeny Zinoviev <me@ch1p.io>
Gerrit-Attention: Alexander Couzens <lynxis@fe80.eu>
Gerrit-Attention: Patrick Rudolph <siro@das-labor.org>
Gerrit-MessageType: newchange