Change in coreboot[master]: mb/x/acpi_tables: Rename to mainboard_fill_gnvs() - coreboot-gerrit

17 Dec 2020

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48707 )
Change subject: mb/x/acpi_tables: Rename to mainboard_fill_gnvs()
......................................................................
mb/x/acpi_tables: Rename to mainboard_fill_gnvs()
Rename acpi_create_gnvs() functions under mb/ to reflect
their changed functionality.
Remove now empty mb/acpi_tables.c files.
Change-Id: Ia366867ef73d1ade9805dc29b8e14b3073f44f60
Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com
---
M src/acpi/gnvs.c
M src/include/acpi/acpi_gnvs.h
M src/mainboard/acer/g43t-am3/acpi_tables.c
M src/mainboard/apple/macbook21/acpi_tables.c
M src/mainboard/apple/macbookair4_2/gnvs.c
M src/mainboard/asrock/b75pro3-m/acpi_tables.c
M src/mainboard/asrock/b85m_pro4/acpi_tables.c
M src/mainboard/asrock/g41c-gs/acpi_tables.c
D src/mainboard/asrock/h81m-hds/acpi_tables.c
D src/mainboard/asus/h61m-cs/acpi_tables.c
D src/mainboard/asus/maximus_iv_gene-z/acpi_tables.c
D src/mainboard/asus/p5gc-mx/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
D src/mainboard/asus/p8h61-m_lx/acpi_tables.c
M src/mainboard/asus/p8h61-m_lx3_r2_0/acpi_tables.c
M src/mainboard/asus/p8h61-m_pro/acpi_tables.c
M src/mainboard/asus/p8z77-m_pro/acpi_tables.c
M src/mainboard/asus/p8z77-v_lx2/acpi_tables.c
D src/mainboard/biostar/th61-itx/acpi_tables.c
M src/mainboard/bostentech/gbyt4/acpi_tables.c
M src/mainboard/compulab/intense_pc/acpi_tables.c
M src/mainboard/dell/optiplex_9010/acpi_tables.c
M src/mainboard/emulation/qemu-q35/acpi_tables.c
M src/mainboard/facebook/fbg1701/acpi_tables.c
D src/mainboard/foxconn/d41s/acpi_tables.c
M src/mainboard/foxconn/g41s-k/acpi_tables.c
M src/mainboard/getac/p470/acpi_tables.c
D src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c
M src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
M src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
D src/mainboard/gigabyte/ga-h61m-series/acpi_tables.c
M src/mainboard/google/auron/acpi_tables.c
M src/mainboard/google/beltino/acpi_tables.c
M src/mainboard/google/butterfly/acpi_tables.c
M src/mainboard/google/cyan/acpi_tables.c
M src/mainboard/google/jecht/acpi_tables.c
M src/mainboard/google/link/acpi_tables.c
M src/mainboard/google/parrot/acpi_tables.c
M src/mainboard/google/rambi/acpi_tables.c
M src/mainboard/google/slippy/acpi_tables.c
M src/mainboard/google/stout/acpi_tables.c
M src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c
M src/mainboard/hp/folio_9480m/acpi_tables.c
M src/mainboard/hp/snb_ivb_laptops/acpi_tables.c
M src/mainboard/hp/z220_sff_workstation/acpi_tables.c
M src/mainboard/ibase/mb899/acpi_tables.c
M src/mainboard/intel/baskingridge/acpi_tables.c
D src/mainboard/intel/d510mo/acpi_tables.c
D src/mainboard/intel/d945gclf/acpi_tables.c
M src/mainboard/intel/dcp847ske/acpi_tables.c
M src/mainboard/intel/dg41wv/acpi_tables.c
M src/mainboard/intel/dg43gt/acpi_tables.c
M src/mainboard/intel/emeraldlake2/acpi_tables.c
M src/mainboard/intel/harcuvar/acpi_tables.c
M src/mainboard/intel/strago/acpi_tables.c
M src/mainboard/intel/wtm2/acpi_tables.c
M src/mainboard/kontron/986lcd-m/acpi_tables.c
M src/mainboard/kontron/ktqm77/acpi_tables.c
M src/mainboard/lenovo/l520/acpi_tables.c
M src/mainboard/lenovo/s230u/acpi_tables.c
M src/mainboard/lenovo/t400/acpi_tables.c
M src/mainboard/lenovo/t410/acpi_tables.c
M src/mainboard/lenovo/t420/acpi_tables.c
M src/mainboard/lenovo/t420s/acpi_tables.c
M src/mainboard/lenovo/t430/acpi_tables.c
M src/mainboard/lenovo/t430s/acpi_tables.c
M src/mainboard/lenovo/t440p/acpi_tables.c
M src/mainboard/lenovo/t520/acpi_tables.c
M src/mainboard/lenovo/t530/acpi_tables.c
M src/mainboard/lenovo/t60/acpi_tables.c
M src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
M src/mainboard/lenovo/x131e/acpi_tables.c
M src/mainboard/lenovo/x1_carbon_gen1/acpi_tables.c
M src/mainboard/lenovo/x200/acpi_tables.c
M src/mainboard/lenovo/x201/acpi_tables.c
M src/mainboard/lenovo/x220/acpi_tables.c
M src/mainboard/lenovo/x230/acpi_tables.c
M src/mainboard/lenovo/x60/acpi_tables.c
M src/mainboard/msi/ms7707/acpi_tables.c
M src/mainboard/ocp/tiogapass/acpi_tables.c
D src/mainboard/packardbell/ms2290/acpi_tables.c
M src/mainboard/portwell/m107/acpi_tables.c
M src/mainboard/protectli/vault_bsw/acpi_tables.c
M src/mainboard/purism/librem_bdw/acpi_tables.c
M src/mainboard/roda/rk886ex/acpi_tables.c
M src/mainboard/roda/rk9/acpi_tables.c
M src/mainboard/roda/rv11/acpi_tables.c
M src/mainboard/samsung/lumpy/acpi_tables.c
M src/mainboard/samsung/stumpy/acpi_tables.c
M src/mainboard/sapphire/pureplatinumh61/acpi_tables.c
M src/mainboard/scaleway/tagada/acpi_tables.c
D src/mainboard/supermicro/x10slm-f/acpi_tables.c
M src/mainboard/supermicro/x9scl/acpi_tables.c
M src/soc/intel/baytrail/southcluster.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/pch/lpc.c
M src/soc/intel/denverton_ns/acpi.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801ix/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
M src/southbridge/intel/lynxpoint/lpc.c
105 files changed, 92 insertions(+), 194 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/48707/1

diff --git a/src/acpi/gnvs.c b/src/acpi/gnvs.c
index e572a37..b5f2ad2 100644
--- a/src/acpi/gnvs.c
+++ b/src/acpi/gnvs.c
@@ -30,6 +30,7 @@
 }
__weak void soc_fill_gnvs(struct global_nvs *gnvs_) { }
+__weak void mainboard_fill_gnvs(struct global_nvs *gnvs_) { }
void *gnvs_get_or_create(void)
 {
diff --git a/src/include/acpi/acpi_gnvs.h b/src/include/acpi/acpi_gnvs.h
index d827a07..e006349 100644
--- a/src/include/acpi/acpi_gnvs.h
+++ b/src/include/acpi/acpi_gnvs.h
@@ -34,5 +34,6 @@
 void acpi_init_gnvs(struct global_nvs *gnvs);
void soc_fill_gnvs(struct global_nvs *gnvs);
+void mainboard_fill_gnvs(struct global_nvs *gnvs);
#endif
diff --git a/src/mainboard/acer/g43t-am3/acpi_tables.c b/src/mainboard/acer/g43t-am3/acpi_tables.c
index 1485b67..2bdb744 100644
--- a/src/mainboard/acer/g43t-am3/acpi_tables.c
+++ b/src/mainboard/acer/g43t-am3/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801jx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+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/apple/macbook21/acpi_tables.c b/src/mainboard/apple/macbook21/acpi_tables.c
index 52c2fbb..6970dfc 100644
--- a/src/mainboard/apple/macbook21/acpi_tables.c
+++ b/src/mainboard/apple/macbook21/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable both COM ports */
    gnvs->cmap = 0x01;
diff --git a/src/mainboard/apple/macbookair4_2/gnvs.c b/src/mainboard/apple/macbookair4_2/gnvs.c
index 846f079..06763d3 100644
--- a/src/mainboard/apple/macbookair4_2/gnvs.c
+++ b/src/mainboard/apple/macbookair4_2/gnvs.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Disable USB ports in S3 by default */
    gnvs->s3u0 = 0;
diff --git a/src/mainboard/asrock/b75pro3-m/acpi_tables.c b/src/mainboard/asrock/b75pro3-m/acpi_tables.c
index 28c9d8e..e68746c 100644
--- a/src/mainboard/asrock/b75pro3-m/acpi_tables.c
+++ b/src/mainboard/asrock/b75pro3-m/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/asrock/b85m_pro4/acpi_tables.c b/src/mainboard/asrock/b85m_pro4/acpi_tables.c
index eed290d..59c4186 100644
--- a/src/mainboard/asrock/b85m_pro4/acpi_tables.c
+++ b/src/mainboard/asrock/b85m_pro4/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/lynxpoint/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/asrock/g41c-gs/acpi_tables.c b/src/mainboard/asrock/g41c-gs/acpi_tables.c
index 9eef159..720652663 100644
--- a/src/mainboard/asrock/g41c-gs/acpi_tables.c
+++ b/src/mainboard/asrock/g41c-gs/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+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/asrock/h81m-hds/acpi_tables.c b/src/mainboard/asrock/h81m-hds/acpi_tables.c
deleted file mode 100644
index 8ec5b11..0000000
--- a/src/mainboard/asrock/h81m-hds/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/lynxpoint/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/asus/h61m-cs/acpi_tables.c b/src/mainboard/asus/h61m-cs/acpi_tables.c
deleted file mode 100644
index 852b0b4..0000000
--- a/src/mainboard/asus/h61m-cs/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/asus/maximus_iv_gene-z/acpi_tables.c b/src/mainboard/asus/maximus_iv_gene-z/acpi_tables.c
deleted file mode 100644
index 14a79f8..0000000
--- a/src/mainboard/asus/maximus_iv_gene-z/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/asus/p5gc-mx/acpi_tables.c b/src/mainboard/asus/p5gc-mx/acpi_tables.c
deleted file mode 100644
index 496d419..0000000
--- a/src/mainboard/asus/p5gc-mx/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/i82801gx/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/asus/p5qc/acpi_tables.c b/src/mainboard/asus/p5qc/acpi_tables.c
index 65db55f..0d0b24c 100644
--- a/src/mainboard/asus/p5qc/acpi_tables.c
+++ b/src/mainboard/asus/p5qc/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801jx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+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 4f59ed0..e678bab 100644
--- a/src/mainboard/asus/p5ql-em/acpi_tables.c
+++ b/src/mainboard/asus/p5ql-em/acpi_tables.c
@@ -4,7 +4,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801jx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+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
index 9eef159..720652663 100644
--- a/src/mainboard/asus/p5qpl-am/acpi_tables.c
+++ b/src/mainboard/asus/p5qpl-am/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+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/p8h61-m_lx/acpi_tables.c b/src/mainboard/asus/p8h61-m_lx/acpi_tables.c
deleted file mode 100644
index 14a79f8..0000000
--- a/src/mainboard/asus/p8h61-m_lx/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi_tables.c b/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi_tables.c
index 28c9d8e..e68746c 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi_tables.c
+++ b/src/mainboard/asus/p8h61-m_lx3_r2_0/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/asus/p8h61-m_pro/acpi_tables.c b/src/mainboard/asus/p8h61-m_pro/acpi_tables.c
index 28c9d8e..e68746c 100644
--- a/src/mainboard/asus/p8h61-m_pro/acpi_tables.c
+++ b/src/mainboard/asus/p8h61-m_pro/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/asus/p8z77-m_pro/acpi_tables.c b/src/mainboard/asus/p8z77-m_pro/acpi_tables.c
index e401b65..c1da5cb 100644
--- a/src/mainboard/asus/p8z77-m_pro/acpi_tables.c
+++ b/src/mainboard/asus/p8z77-m_pro/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* critical temp that will shutdown the pc == 95C degrees */
    gnvs->tcrt = 95;
diff --git a/src/mainboard/asus/p8z77-v_lx2/acpi_tables.c b/src/mainboard/asus/p8z77-v_lx2/acpi_tables.c
index 28c9d8e..e68746c 100644
--- a/src/mainboard/asus/p8z77-v_lx2/acpi_tables.c
+++ b/src/mainboard/asus/p8z77-v_lx2/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/biostar/th61-itx/acpi_tables.c b/src/mainboard/biostar/th61-itx/acpi_tables.c
deleted file mode 100644
index 852b0b4..0000000
--- a/src/mainboard/biostar/th61-itx/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/bostentech/gbyt4/acpi_tables.c b/src/mainboard/bostentech/gbyt4/acpi_tables.c
index 7445fb0..175975e 100644
--- a/src/mainboard/bostentech/gbyt4/acpi_tables.c
+++ b/src/mainboard/bostentech/gbyt4/acpi_tables.c
@@ -5,7 +5,7 @@
 #include <soc/acpi.h>
 #include <soc/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/compulab/intense_pc/acpi_tables.c b/src/mainboard/compulab/intense_pc/acpi_tables.c
index f905187..fba85e1 100644
--- a/src/mainboard/compulab/intense_pc/acpi_tables.c
+++ b/src/mainboard/compulab/intense_pc/acpi_tables.c
@@ -4,7 +4,7 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
/* FIXME: check this function.  */
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/dell/optiplex_9010/acpi_tables.c b/src/mainboard/dell/optiplex_9010/acpi_tables.c
index 28c9d8e..e68746c 100644
--- a/src/mainboard/dell/optiplex_9010/acpi_tables.c
+++ b/src/mainboard/dell/optiplex_9010/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c
index 104e5d0..b95e34c 100644
--- a/src/mainboard/emulation/qemu-q35/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c
@@ -13,7 +13,7 @@
 #include "../qemu-i440fx/acpi.h"
 #include <southbridge/intel/i82801ix/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->apic = 1;
    gnvs->mpen = 1; /* Enable Multi Processing */
diff --git a/src/mainboard/facebook/fbg1701/acpi_tables.c b/src/mainboard/facebook/fbg1701/acpi_tables.c
index 5fe4a42..999fd1e 100644
--- a/src/mainboard/facebook/fbg1701/acpi_tables.c
+++ b/src/mainboard/facebook/fbg1701/acpi_tables.c
@@ -6,7 +6,7 @@
 #include <soc/acpi.h>
 #include <soc/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/foxconn/d41s/acpi_tables.c b/src/mainboard/foxconn/d41s/acpi_tables.c
deleted file mode 100644
index 496d419..0000000
--- a/src/mainboard/foxconn/d41s/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/i82801gx/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/foxconn/g41s-k/acpi_tables.c b/src/mainboard/foxconn/g41s-k/acpi_tables.c
index 781abcc..38c0704 100644
--- a/src/mainboard/foxconn/g41s-k/acpi_tables.c
+++ b/src/mainboard/foxconn/g41s-k/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->pwrs = 1; /* Power state (AC = 1) */
    gnvs->cmap = 1; /* COM 1 port */
diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c
index 1e8d64e..96e3d31 100644
--- a/src/mainboard/getac/p470/acpi_tables.c
+++ b/src/mainboard/getac/p470/acpi_tables.c
@@ -9,7 +9,7 @@
#include "mainboard.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable COM port(s) */
    gnvs->cmap = 0x01;
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c b/src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c
deleted file mode 100644
index 496d419..0000000
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/i82801gx/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
index 3012052..f22470c 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
@@ -4,7 +4,7 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = CRITICAL_TEMPERATURE;
    gnvs->tpsv = PASSIVE_TEMPERATURE;
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
index f7296e1..78f2ad6 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->pwrs = 1;    /* Power state (AC = 1) */
    gnvs->lptp = 0;    /* LPT port */
diff --git a/src/mainboard/gigabyte/ga-h61m-series/acpi_tables.c b/src/mainboard/gigabyte/ga-h61m-series/acpi_tables.c
deleted file mode 100644
index 852b0b4..0000000
--- a/src/mainboard/gigabyte/ga-h61m-series/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/bd82x6x/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/google/auron/acpi_tables.c b/src/mainboard/google/auron/acpi_tables.c
index 5284cef..501f54b 100644
--- a/src/mainboard/google/auron/acpi_tables.c
+++ b/src/mainboard/google/auron/acpi_tables.c
@@ -6,7 +6,7 @@
 #include <soc/nvs.h>
 #include <variant/thermal.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
diff --git a/src/mainboard/google/beltino/acpi_tables.c b/src/mainboard/google/beltino/acpi_tables.c
index 9756695..3887f1c 100644
--- a/src/mainboard/google/beltino/acpi_tables.c
+++ b/src/mainboard/google/beltino/acpi_tables.c
@@ -9,7 +9,7 @@
 #include <vendorcode/google/chromeos/gnvs.h>
 #include <variant/thermal.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
diff --git a/src/mainboard/google/butterfly/acpi_tables.c b/src/mainboard/google/butterfly/acpi_tables.c
index 315fd6d..b5524c4 100644
--- a/src/mainboard/google/butterfly/acpi_tables.c
+++ b/src/mainboard/google/butterfly/acpi_tables.c
@@ -5,7 +5,7 @@
 #include <vendorcode/google/chromeos/gnvs.h>
 #include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Disable USB ports in S3 by default */
    gnvs->s3u0 = 0;
diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c
index 2f2f298..e9e3f6cab 100644
--- a/src/mainboard/google/cyan/acpi_tables.c
+++ b/src/mainboard/google/cyan/acpi_tables.c
@@ -6,7 +6,7 @@
 #include <soc/acpi.h>
 #include <soc/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index 1197c0c..189f7f4 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -7,7 +7,7 @@
 #include <soc/nvs.h>
 #include <variant/thermal.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
diff --git a/src/mainboard/google/link/acpi_tables.c b/src/mainboard/google/link/acpi_tables.c
index 5b0621e..cc3f9a8 100644
--- a/src/mainboard/google/link/acpi_tables.c
+++ b/src/mainboard/google/link/acpi_tables.c
@@ -4,7 +4,7 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Disable USB ports in S3 by default */
    gnvs->s3u0 = 0;
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index 62e52c4..c98df6c 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -12,7 +12,7 @@
 #include "thermal.h"
 #include "onboard.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Disable USB ports in S3 by default */
    gnvs->s3u0 = 0;
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index dedec21..a853ca6 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -5,7 +5,7 @@
 #include <soc/acpi.h>
 #include <soc/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index fcafd88..023107e 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -8,7 +8,7 @@
#include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index f994e57..45bab43 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -13,7 +13,7 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Disable USB ports in S3 by default */
    gnvs->s3u0 = 0;
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c b/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c
index 28c9d8e..e68746c 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c
+++ b/src/mainboard/hp/compaq_8200_elite_sff/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/hp/folio_9480m/acpi_tables.c b/src/mainboard/hp/folio_9480m/acpi_tables.c
index 00963e1..c7fd96e 100644
--- a/src/mainboard/hp/folio_9480m/acpi_tables.c
+++ b/src/mainboard/hp/folio_9480m/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/lynxpoint/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->lids = 1;
diff --git a/src/mainboard/hp/snb_ivb_laptops/acpi_tables.c b/src/mainboard/hp/snb_ivb_laptops/acpi_tables.c
index 8999b72..20a67f7 100644
--- a/src/mainboard/hp/snb_ivb_laptops/acpi_tables.c
+++ b/src/mainboard/hp/snb_ivb_laptops/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    // the lid is open by default.
    gnvs->lids = 1;
diff --git a/src/mainboard/hp/z220_sff_workstation/acpi_tables.c b/src/mainboard/hp/z220_sff_workstation/acpi_tables.c
index 28c9d8e..e68746c 100644
--- a/src/mainboard/hp/z220_sff_workstation/acpi_tables.c
+++ b/src/mainboard/hp/z220_sff_workstation/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/ibase/mb899/acpi_tables.c b/src/mainboard/ibase/mb899/acpi_tables.c
index 52c2fbb..6970dfc 100644
--- a/src/mainboard/ibase/mb899/acpi_tables.c
+++ b/src/mainboard/ibase/mb899/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable both COM ports */
    gnvs->cmap = 0x01;
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index c0c488a..e13adb2 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -9,7 +9,7 @@
#include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
diff --git a/src/mainboard/intel/d510mo/acpi_tables.c b/src/mainboard/intel/d510mo/acpi_tables.c
deleted file mode 100644
index 496d419..0000000
--- a/src/mainboard/intel/d510mo/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/i82801gx/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c
deleted file mode 100644
index 496d419..0000000
--- a/src/mainboard/intel/d945gclf/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/i82801gx/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/intel/dcp847ske/acpi_tables.c b/src/mainboard/intel/dcp847ske/acpi_tables.c
index 43e5062..ac2f3fb 100644
--- a/src/mainboard/intel/dcp847ske/acpi_tables.c
+++ b/src/mainboard/intel/dcp847ske/acpi_tables.c
@@ -4,7 +4,7 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable USB ports in S3 by default */
    gnvs->s3u0 = 1;
diff --git a/src/mainboard/intel/dg41wv/acpi_tables.c b/src/mainboard/intel/dg41wv/acpi_tables.c
index 9eef159..720652663 100644
--- a/src/mainboard/intel/dg41wv/acpi_tables.c
+++ b/src/mainboard/intel/dg41wv/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+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 65db55f..0d0b24c 100644
--- a/src/mainboard/intel/dg43gt/acpi_tables.c
+++ b/src/mainboard/intel/dg43gt/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801jx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+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/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index 302966a..62f45cb 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -8,7 +8,7 @@
#include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
diff --git a/src/mainboard/intel/harcuvar/acpi_tables.c b/src/mainboard/intel/harcuvar/acpi_tables.c
index 821de5f..20b4c2d 100644
--- a/src/mainboard/intel/harcuvar/acpi_tables.c
+++ b/src/mainboard/intel/harcuvar/acpi_tables.c
@@ -8,7 +8,7 @@
 #include <soc/acpi.h>
 #include <soc/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index 25d6a37..4fec915 100644
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -10,7 +10,7 @@
 #include <boardid.h>
 #include "onboard.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index 21a94bc..c6d4ce8 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -7,7 +7,7 @@
 #include <soc/nvs.h>
 #include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable USB ports in S3 */
    gnvs->s3u0 = 1;
diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c
index 52c2fbb..6970dfc 100644
--- a/src/mainboard/kontron/986lcd-m/acpi_tables.c
+++ b/src/mainboard/kontron/986lcd-m/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable both COM ports */
    gnvs->cmap = 0x01;
diff --git a/src/mainboard/kontron/ktqm77/acpi_tables.c b/src/mainboard/kontron/ktqm77/acpi_tables.c
index 3012052..f22470c 100644
--- a/src/mainboard/kontron/ktqm77/acpi_tables.c
+++ b/src/mainboard/kontron/ktqm77/acpi_tables.c
@@ -4,7 +4,7 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = CRITICAL_TEMPERATURE;
    gnvs->tpsv = PASSIVE_TEMPERATURE;
diff --git a/src/mainboard/lenovo/l520/acpi_tables.c b/src/mainboard/lenovo/l520/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/l520/acpi_tables.c
+++ b/src/mainboard/lenovo/l520/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/s230u/acpi_tables.c b/src/mainboard/lenovo/s230u/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/s230u/acpi_tables.c
+++ b/src/mainboard/lenovo/s230u/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index b26996e..643c106a 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -7,7 +7,7 @@
 #include <device/device.h>
 #include <southbridge/intel/i82801ix/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->apic = 1;
    gnvs->mpen = 1; /* Enable Multi Processing */
diff --git a/src/mainboard/lenovo/t410/acpi_tables.c b/src/mainboard/lenovo/t410/acpi_tables.c
index f957656..45ae4d3 100644
--- a/src/mainboard/lenovo/t410/acpi_tables.c
+++ b/src/mainboard/lenovo/t410/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/ibexpeak/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/t420/acpi_tables.c b/src/mainboard/lenovo/t420/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/t420/acpi_tables.c
+++ b/src/mainboard/lenovo/t420/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/t420s/acpi_tables.c b/src/mainboard/lenovo/t420s/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/t420s/acpi_tables.c
+++ b/src/mainboard/lenovo/t420s/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/t430/acpi_tables.c b/src/mainboard/lenovo/t430/acpi_tables.c
index 5cb1fd3..29d8eba 100644
--- a/src/mainboard/lenovo/t430/acpi_tables.c
+++ b/src/mainboard/lenovo/t430/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/t430s/acpi_tables.c b/src/mainboard/lenovo/t430s/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/t430s/acpi_tables.c
+++ b/src/mainboard/lenovo/t430s/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/t440p/acpi_tables.c b/src/mainboard/lenovo/t440p/acpi_tables.c
index c235d12..93016a8 100644
--- a/src/mainboard/lenovo/t440p/acpi_tables.c
+++ b/src/mainboard/lenovo/t440p/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/lynxpoint/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default. */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/t520/acpi_tables.c b/src/mainboard/lenovo/t520/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/t520/acpi_tables.c
+++ b/src/mainboard/lenovo/t520/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/t530/acpi_tables.c b/src/mainboard/lenovo/t530/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/t530/acpi_tables.c
+++ b/src/mainboard/lenovo/t530/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/t60/acpi_tables.c b/src/mainboard/lenovo/t60/acpi_tables.c
index 62fcfe9..4a9c6ae 100644
--- a/src/mainboard/lenovo/t60/acpi_tables.c
+++ b/src/mainboard/lenovo/t60/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable both COM ports */
    gnvs->cmap = 0x01;
diff --git a/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c b/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
index 9eef159..720652663 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
+++ b/src/mainboard/lenovo/thinkcentre_a58/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+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/x131e/acpi_tables.c b/src/mainboard/lenovo/x131e/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/x131e/acpi_tables.c
+++ b/src/mainboard/lenovo/x131e/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/acpi_tables.c b/src/mainboard/lenovo/x1_carbon_gen1/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/acpi_tables.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index b26996e..643c106a 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -7,7 +7,7 @@
 #include <device/device.h>
 #include <southbridge/intel/i82801ix/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->apic = 1;
    gnvs->mpen = 1; /* Enable Multi Processing */
diff --git a/src/mainboard/lenovo/x201/acpi_tables.c b/src/mainboard/lenovo/x201/acpi_tables.c
index f957656..45ae4d3 100644
--- a/src/mainboard/lenovo/x201/acpi_tables.c
+++ b/src/mainboard/lenovo/x201/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/ibexpeak/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/x220/acpi_tables.c b/src/mainboard/lenovo/x220/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/x220/acpi_tables.c
+++ b/src/mainboard/lenovo/x220/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/x230/acpi_tables.c b/src/mainboard/lenovo/x230/acpi_tables.c
index 0f32e9f..9669ca2 100644
--- a/src/mainboard/lenovo/x230/acpi_tables.c
+++ b/src/mainboard/lenovo/x230/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c
index 62fcfe9..4a9c6ae 100644
--- a/src/mainboard/lenovo/x60/acpi_tables.c
+++ b/src/mainboard/lenovo/x60/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable both COM ports */
    gnvs->cmap = 0x01;
diff --git a/src/mainboard/msi/ms7707/acpi_tables.c b/src/mainboard/msi/ms7707/acpi_tables.c
index 28c9d8e..e68746c 100644
--- a/src/mainboard/msi/ms7707/acpi_tables.c
+++ b/src/mainboard/msi/ms7707/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/ocp/tiogapass/acpi_tables.c b/src/mainboard/ocp/tiogapass/acpi_tables.c
index 300e8f6..20f83e3 100644
--- a/src/mainboard/ocp/tiogapass/acpi_tables.c
+++ b/src/mainboard/ocp/tiogapass/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi.h>
 #include <acpi/acpi_gnvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    acpi_init_gnvs(gnvs);
 }
diff --git a/src/mainboard/packardbell/ms2290/acpi_tables.c b/src/mainboard/packardbell/ms2290/acpi_tables.c
deleted file mode 100644
index 17ed31e..0000000
--- a/src/mainboard/packardbell/ms2290/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/ibexpeak/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/portwell/m107/acpi_tables.c b/src/mainboard/portwell/m107/acpi_tables.c
index 5fe4a42..999fd1e 100644
--- a/src/mainboard/portwell/m107/acpi_tables.c
+++ b/src/mainboard/portwell/m107/acpi_tables.c
@@ -6,7 +6,7 @@
 #include <soc/acpi.h>
 #include <soc/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/protectli/vault_bsw/acpi_tables.c b/src/mainboard/protectli/vault_bsw/acpi_tables.c
index 5267dcd..aaa886d 100644
--- a/src/mainboard/protectli/vault_bsw/acpi_tables.c
+++ b/src/mainboard/protectli/vault_bsw/acpi_tables.c
@@ -5,7 +5,7 @@
 #include <soc/acpi.h>
 #include <string.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/purism/librem_bdw/acpi_tables.c b/src/mainboard/purism/librem_bdw/acpi_tables.c
index e127a56..4d25a1b 100644
--- a/src/mainboard/purism/librem_bdw/acpi_tables.c
+++ b/src/mainboard/purism/librem_bdw/acpi_tables.c
@@ -5,6 +5,6 @@
 #include <soc/acpi.h>
 #include <soc/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
 }
diff --git a/src/mainboard/roda/rk886ex/acpi_tables.c b/src/mainboard/roda/rk886ex/acpi_tables.c
index 52c2fbb..6970dfc 100644
--- a/src/mainboard/roda/rk886ex/acpi_tables.c
+++ b/src/mainboard/roda/rk886ex/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable both COM ports */
    gnvs->cmap = 0x01;
diff --git a/src/mainboard/roda/rk9/acpi_tables.c b/src/mainboard/roda/rk9/acpi_tables.c
index b0e8993..1eaadce 100644
--- a/src/mainboard/roda/rk9/acpi_tables.c
+++ b/src/mainboard/roda/rk9/acpi_tables.c
@@ -7,7 +7,7 @@
 #include <device/device.h>
 #include <southbridge/intel/i82801ix/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->apic = 1;
    gnvs->mpen = 1; /* Enable Multi Processing */
diff --git a/src/mainboard/roda/rv11/acpi_tables.c b/src/mainboard/roda/rv11/acpi_tables.c
index aea50a1..bee9643 100644
--- a/src/mainboard/roda/rv11/acpi_tables.c
+++ b/src/mainboard/roda/rv11/acpi_tables.c
@@ -5,7 +5,7 @@
#include <variant/thermal.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* The lid is open by default */
    gnvs->lids = 1;
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index 1a3317d..7f4839f 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -11,7 +11,7 @@
#include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /*
     * Disable 3G in suspend by default.
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index b2c1fca..af5450e 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -8,7 +8,7 @@
#include "thermal.h"
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    /* Enable Front USB ports in S3 by default */
    gnvs->s3u0 = 1;
diff --git a/src/mainboard/sapphire/pureplatinumh61/acpi_tables.c b/src/mainboard/sapphire/pureplatinumh61/acpi_tables.c
index ccbb75c..d27cf01 100644
--- a/src/mainboard/sapphire/pureplatinumh61/acpi_tables.c
+++ b/src/mainboard/sapphire/pureplatinumh61/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/mainboard/scaleway/tagada/acpi_tables.c b/src/mainboard/scaleway/tagada/acpi_tables.c
index a251d22..1c0061f 100644
--- a/src/mainboard/scaleway/tagada/acpi_tables.c
+++ b/src/mainboard/scaleway/tagada/acpi_tables.c
@@ -4,7 +4,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <soc/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    acpi_init_gnvs(gnvs);
diff --git a/src/mainboard/supermicro/x10slm-f/acpi_tables.c b/src/mainboard/supermicro/x10slm-f/acpi_tables.c
deleted file mode 100644
index 8ec5b11..0000000
--- a/src/mainboard/supermicro/x10slm-f/acpi_tables.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include <acpi/acpi_gnvs.h>
-#include <southbridge/intel/lynxpoint/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}
diff --git a/src/mainboard/supermicro/x9scl/acpi_tables.c b/src/mainboard/supermicro/x9scl/acpi_tables.c
index 28c9d8e..e68746c 100644
--- a/src/mainboard/supermicro/x9scl/acpi_tables.c
+++ b/src/mainboard/supermicro/x9scl/acpi_tables.c
@@ -3,7 +3,7 @@
 #include <acpi/acpi_gnvs.h>
 #include <southbridge/intel/bd82x6x/nvs.h>
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
    gnvs->tcrt = 100;
    gnvs->tpsv = 90;
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index 428002b..60047b9 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -489,7 +489,7 @@
    if (!gnvs)
    	return;
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa();
 }
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 588c7e8..ef4a339 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -369,7 +369,7 @@
    if (!gnvs)
    	return;
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa();
 }
diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c
index c328a90..ec5d109 100644
--- a/src/soc/intel/broadwell/pch/lpc.c
+++ b/src/soc/intel/broadwell/pch/lpc.c
@@ -614,7 +614,7 @@
    gnvs->pcnt = dev_count_cpu();
 #endif
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }
diff --git a/src/soc/intel/denverton_ns/acpi.c b/src/soc/intel/denverton_ns/acpi.c
index cf30541..9243110 100644
--- a/src/soc/intel/denverton_ns/acpi.c
+++ b/src/soc/intel/denverton_ns/acpi.c
@@ -246,7 +246,7 @@
    if (!gnvs)
    	return;
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index fb37789..cc57daf 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -655,7 +655,7 @@
    	return;
soc_fill_gnvs(gnvs);
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa();
 }
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 83f548f..649578f 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -491,7 +491,7 @@
    	return;
soc_fill_gnvs(gnvs);
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 064d79e..67c8797 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -458,7 +458,7 @@
    if (!gnvs)
    	return;
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index d959120..db3e42d 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -482,7 +482,7 @@
    if (!gnvs)
    	return;
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
    acpi_inject_nvsa();
 }
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 4f2f018..030119b 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -555,7 +555,7 @@
    	return;
soc_fill_gnvs(gnvs);
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa();
 }
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index de7cc23..a3666ba 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -693,7 +693,7 @@
    	return;
soc_fill_gnvs(gnvs);
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa();
 }
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/48707
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia366867ef73d1ade9805dc29b8e14b3073f44f60
Gerrit-Change-Number: 48707
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: Anjaneya "Reddy" Chagam anjaneya.chagam@intel.com
Gerrit-Reviewer: Damien Zammit
Gerrit-Reviewer: Evgeny Zinoviev me@ch1p.io
Gerrit-Reviewer: Frans Hendriks fhendriks@eltan.com
Gerrit-Reviewer: Johnny Lin Johnny_Lin@wiwynn.com
Gerrit-Reviewer: Jonathan Zhang jonzhang@fb.com
Gerrit-Reviewer: Mariusz Szafrański mariuszx.szafranski@intel.com
Gerrit-Reviewer: Michal Motyl michalx.motyl@intel.com
Gerrit-Reviewer: Michał Żygowski michal.zygowski@3mdeb.com
Gerrit-Reviewer: Morgan Jang Morgan_Jang@wiwynn.com
Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com
Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org
Gerrit-Reviewer: Piotr Król piotr.krol@3mdeb.com
Gerrit-Reviewer: Suresh Bellampalli suresh.bellampalli@intel.com
Gerrit-Reviewer: Tristan Corrick tristan@corrick.kiwi
Gerrit-Reviewer: Vanessa Eusebio vanessa.f.eusebio@intel.com
Gerrit-Reviewer: Wim Vervoorn wvervoorn@eltan.com
Gerrit-MessageType: newchange



    