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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48707
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/acpi/gnvs.c

@@ -36,6 +36,7 @@ __weak uint32_t *gnvs_cbmc_ptr(struct global_nvs *gnvs_)
 }
 
 __weak void soc_fill_gnvs(struct global_nvs *gnvs_) { }
+__weak void mainboard_fill_gnvs(struct global_nvs *gnvs_) { }
 
 void *gnvs_get_or_create(void)
 {

src/include/acpi/acpi_gnvs.h

@@ -35,5 +35,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs);
 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

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) */

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;

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;

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;

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;

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 */

src/mainboard/asrock/h81m-hds/acpi_tables.c

@@ -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)
-{
-}

src/mainboard/asus/h61m-cs/acpi_tables.c

@@ -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)
-{
-}

src/mainboard/asus/maximus_iv_gene-z/acpi_tables.c

@@ -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)
-{
-}

src/mainboard/asus/p5gc-mx/acpi_tables.c

@@ -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)
-{
-}

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) */

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) */

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 */

src/mainboard/asus/p8h61-m_lx/acpi_tables.c

@@ -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)
-{
-}

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;

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;

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;

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;

src/mainboard/biostar/th61-itx/acpi_tables.c

@@ -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)
-{
-}

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);
 

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;

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;

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 */

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);
 

src/mainboard/foxconn/d41s/acpi_tables.c

@@ -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)
-{
-}

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 */

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;

src/mainboard/gigabyte/ga-945gcm-s2l/acpi_tables.c

@@ -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)
-{
-}

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;

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 */

src/mainboard/gigabyte/ga-h61m-series/acpi_tables.c

@@ -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)
-{
-}

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;

src/mainboard/google/beltino/acpi_tables.c

@@ -7,7 +7,7 @@
 #include <southbridge/intel/lynxpoint/pch.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;

src/mainboard/google/butterfly/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;

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);
 

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;

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;

src/mainboard/google/parrot/acpi_tables.c

@@ -11,7 +11,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;

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);
 

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;

src/mainboard/google/stout/acpi_tables.c

@@ -12,7 +12,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;

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;

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;
 

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;

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;

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;

src/mainboard/intel/baskingridge/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;

src/mainboard/intel/d510mo/acpi_tables.c

@@ -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)
-{
-}

src/mainboard/intel/d945gclf/acpi_tables.c

@@ -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)
-{
-}

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;

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 */

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) */

src/mainboard/intel/emeraldlake2/acpi_tables.c

@@ -7,7 +7,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;

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);
 

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);
 

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;

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;

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;

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;

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;

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 */

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 */

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;

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;

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 */

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;

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;

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;

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;

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;

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);
 }

src/mainboard/packardbell/ms2290/acpi_tables.c

@@ -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)
-{
-}

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);
 

src/mainboard/protectli/vault_bsw/acpi_tables.c

@@ -6,7 +6,7 @@
 #include <soc/nvs.h>
 #include <string.h>
 
-void acpi_create_gnvs(struct global_nvs *gnvs)
+void mainboard_fill_gnvs(struct global_nvs *gnvs)
 {
 
 	acpi_init_gnvs(gnvs);

src/mainboard/purism/librem_bdw/acpi_tables.c

@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi.h>
-#include <acpi/acpi_gnvs.h>
-#include <soc/acpi.h>
-#include <soc/nvs.h>
-
-void acpi_create_gnvs(struct global_nvs *gnvs)
-{
-}

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;

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 */

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;

src/mainboard/samsung/lumpy/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)
 {
 	/*
 	 * Disable 3G in suspend by default.

src/mainboard/samsung/stumpy/acpi_tables.c

@@ -7,7 +7,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;

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;

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);
 

src/mainboard/supermicro/x10slm-f/acpi_tables.c

@@ -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)
-{
-}

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;

src/soc/intel/baytrail/southcluster.c

@@ -489,7 +489,7 @@ static void southcluster_inject_dsdt(const struct device *device)
 	if (!gnvs)
 		return;
 
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
 
 	acpi_inject_nvsa();
 }

src/soc/intel/braswell/acpi.c

@@ -370,7 +370,7 @@ void southcluster_inject_dsdt(const struct device *device)
 	if (!gnvs)
 		return;
 
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
 
 	acpi_inject_nvsa();
 }

src/soc/intel/broadwell/pch/lpc.c

@@ -616,7 +616,8 @@ static void southcluster_inject_dsdt(const struct device *device)
 		return;
 
 	soc_fill_gnvs(gnvs);
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
+
 	acpi_inject_nvsa();
 }
 

src/soc/intel/denverton_ns/acpi.c

@@ -247,7 +247,7 @@ void southcluster_inject_dsdt(const struct device *device)
 	if (!gnvs)
 		return;
 
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
 	acpi_inject_nvsa();
 }
 

src/southbridge/intel/bd82x6x/lpc.c

@@ -665,7 +665,7 @@ void southbridge_inject_dsdt(const struct device *dev)
 		return;
 
 	soc_fill_gnvs(gnvs);
-	acpi_create_gnvs(gnvs);
+	mainboard_fill_gnvs(gnvs);
 
 	acpi_inject_nvsa();
 }