sb,soc/intel: Drop OSYS from GNVS

The value should be set by OSPM using some combination of
_OSI() queris in the \_SB._INI() method.

To maintain previous behaviour with this commit, boards where
GNVS osys initialisation was removed now do the same in ASL.

Change-Id: Id4957b12a72fbf7fa988e7ff039e47abcc072e1c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49353
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

10 files changed, 10 insertions, 45 deletions

diff --git a/src/mainboard/acer/g43t-am3/acpi_tables.c b/src/mainboard/acer/g43t-am3/acpi_tables.c
deleted file mode 100644
index cd44ed207b..0000000000
--- a/src/mainboard/acer/g43t-am3/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
-}
diff --git a/src/mainboard/acer/g43t-am3/dsdt.asl b/src/mainboard/acer/g43t-am3/dsdt.asl
index c1dd80e9ee..9094e77182 100644
--- a/src/mainboard/acer/g43t-am3/dsdt.asl
+++ b/src/mainboard/acer/g43t-am3/dsdt.asl
@@ -11,6 +11,8 @@ DefinitionBlock(
 )
 {
 	#include <acpi/dsdt_top.asl>
+
+	OSYS = 2002
 	// global NVS and variables
 	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801jx/acpi/globalnvs.asl>
diff --git a/src/mainboard/asus/p5qc/acpi_tables.c b/src/mainboard/asus/p5qc/acpi_tables.c
deleted file mode 100644
index cd44ed207b..0000000000
--- a/src/mainboard/asus/p5qc/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
-}
diff --git a/src/mainboard/asus/p5qc/dsdt.asl b/src/mainboard/asus/p5qc/dsdt.asl
index ab44aaf65b..6561493c0e 100644
--- a/src/mainboard/asus/p5qc/dsdt.asl
+++ b/src/mainboard/asus/p5qc/dsdt.asl
@@ -11,6 +11,8 @@ DefinitionBlock(
 )
 {
 	#include <acpi/dsdt_top.asl>
+
+	OSYS = 2002
 	// global NVS and variables
 	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801jx/acpi/globalnvs.asl>
diff --git a/src/mainboard/asus/p5ql-em/acpi_tables.c b/src/mainboard/asus/p5ql-em/acpi_tables.c
deleted file mode 100644
index cd44ed207b..0000000000
--- a/src/mainboard/asus/p5ql-em/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
-}
diff --git a/src/mainboard/asus/p5ql-em/dsdt.asl b/src/mainboard/asus/p5ql-em/dsdt.asl
index 4d49c79d9f..8e1b7f9728 100644
--- a/src/mainboard/asus/p5ql-em/dsdt.asl
+++ b/src/mainboard/asus/p5ql-em/dsdt.asl
@@ -13,6 +13,8 @@ DefinitionBlock(
 )
 {
 	#include <acpi/dsdt_top.asl>
+
+	OSYS = 2002
 	// global NVS and variables
 	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801jx/acpi/globalnvs.asl>
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c b/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
deleted file mode 100644
index cd44ed207b..0000000000
--- a/src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
-}
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
index 12c14f7a71..2ed7aeb6a6 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
@@ -11,6 +11,8 @@ DefinitionBlock(
 )
 {
 	#include <acpi/dsdt_top.asl>
+
+	OSYS = 2002
 	// global NVS and variables
 	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>
diff --git a/src/mainboard/intel/dg43gt/acpi_tables.c b/src/mainboard/intel/dg43gt/acpi_tables.c
deleted file mode 100644
index cd44ed207b..0000000000
--- a/src/mainboard/intel/dg43gt/acpi_tables.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_gnvs.h>
-#include <soc/nvs.h>
-
-void mainboard_fill_gnvs(struct global_nvs *gnvs)
-{
-	gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
-}
diff --git a/src/mainboard/intel/dg43gt/dsdt.asl b/src/mainboard/intel/dg43gt/dsdt.asl
index 242db5390b..7b8e27a460 100644
--- a/src/mainboard/intel/dg43gt/dsdt.asl
+++ b/src/mainboard/intel/dg43gt/dsdt.asl
@@ -11,6 +11,8 @@ DefinitionBlock(
 )
 {
 	#include <acpi/dsdt_top.asl>
+
+	OSYS = 2002
 	// global NVS and variables
 	#include <southbridge/intel/common/acpi/platform.asl>
 	#include <southbridge/intel/i82801jx/acpi/globalnvs.asl>