util/autoport: Rename to mainboard_fill_gnvs()

Change-Id: Ia8d7083ca2f21abbb5f184c1b55dcf1bf047a7be
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49231
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
diff --git a/util/autoport/bd82x6x.go b/util/autoport/bd82x6x.go
index 5d943e4..e2a84e4 100644
--- a/util/autoport/bd82x6x.go
+++ b/util/autoport/bd82x6x.go
@@ -359,10 +359,11 @@
 	defer gnvs.Close()
 
 	Add_gpl(gnvs)
-	gnvs.WriteString(`#include <southbridge/intel/bd82x6x/nvs.h>
+	gnvs.WriteString(`#include <acpi/acpi_gnvs.h>
+#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)
 {
 	/* The lid is open by default. */
 	gnvs->lids = 1;