soc/intel/skylake: switch to common GNVS

Switch to common GNVS. No additional fields to those being present in
common GNVS are used by any SKL/KBL device. Thus, they're dropped
completely.

Change-Id: I87ab4ab05f6c081697801276a744d49e9e1908e0
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57946
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>

18 files changed, 18 insertions, 18 deletions

diff --git a/src/mainboard/51nb/x210/dsdt.asl b/src/mainboard/51nb/x210/dsdt.asl
index 398611f6a4..b4d7741431 100644
--- a/src/mainboard/51nb/x210/dsdt.asl
+++ b/src/mainboard/51nb/x210/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 {
 	#include <acpi/dsdt_top.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	Device (\_SB.PCI0)
diff --git a/src/mainboard/asrock/h110m/dsdt.asl b/src/mainboard/asrock/h110m/dsdt.asl
index 22571573f8..517f759b52 100644
--- a/src/mainboard/asrock/h110m/dsdt.asl
+++ b/src/mainboard/asrock/h110m/dsdt.asl
@@ -14,7 +14,7 @@ DefinitionBlock(
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/clevo/kbl-u/dsdt.asl b/src/mainboard/clevo/kbl-u/dsdt.asl
index 1440ebe71c..21d18c6363 100644
--- a/src/mainboard/clevo/kbl-u/dsdt.asl
+++ b/src/mainboard/clevo/kbl-u/dsdt.asl
@@ -11,7 +11,7 @@ DefinitionBlock(
 )
 {
 	#include <acpi/dsdt_top.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 
 	Device (\_SB.PCI0) {
diff --git a/src/mainboard/facebook/monolith/dsdt.asl b/src/mainboard/facebook/monolith/dsdt.asl
index 79de622400..225acfaee1 100644
--- a/src/mainboard/facebook/monolith/dsdt.asl
+++ b/src/mainboard/facebook/monolith/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	#include <acpi/dsdt_top.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	Scope (\_SB) {
diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl
index 2b0dd85a88..357f3bfe6f 100644
--- a/src/mainboard/google/eve/dsdt.asl
+++ b/src/mainboard/google/eve/dsdt.asl
@@ -17,7 +17,7 @@ DefinitionBlock(
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	/* CPU */
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/google/fizz/dsdt.asl b/src/mainboard/google/fizz/dsdt.asl
index 9800126ed1..01e94f2f77 100644
--- a/src/mainboard/google/fizz/dsdt.asl
+++ b/src/mainboard/google/fizz/dsdt.asl
@@ -17,7 +17,7 @@ DefinitionBlock(
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	/* CPU */
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/google/glados/dsdt.asl b/src/mainboard/google/glados/dsdt.asl
index 039c406cc7..e25c4319a1 100644
--- a/src/mainboard/google/glados/dsdt.asl
+++ b/src/mainboard/google/glados/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	#include <acpi/dsdt_top.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	Scope (\_SB) {
diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl
index cf4692e416..dbba8064e0 100644
--- a/src/mainboard/google/poppy/dsdt.asl
+++ b/src/mainboard/google/poppy/dsdt.asl
@@ -17,7 +17,7 @@ DefinitionBlock(
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	/* global NVS and variables */
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	/* CPU */
 	#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/hp/280_g2/dsdt.asl b/src/mainboard/hp/280_g2/dsdt.asl
index 26ebbe071f..184fee0d3a 100644
--- a/src/mainboard/hp/280_g2/dsdt.asl
+++ b/src/mainboard/hp/280_g2/dsdt.asl
@@ -15,7 +15,7 @@ DefinitionBlock(
 
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	Device (\_SB.PCI0) {
 		#include <soc/intel/skylake/acpi/systemagent.asl>
diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl
index 3afa5836bd..5af8829ff3 100644
--- a/src/mainboard/intel/kblrvp/dsdt.asl
+++ b/src/mainboard/intel/kblrvp/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	#include <acpi/dsdt_top.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	Scope (\_SB) {
diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl
index 490b50ae77..2ae3dca2d2 100644
--- a/src/mainboard/intel/kunimitsu/dsdt.asl
+++ b/src/mainboard/intel/kunimitsu/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	#include <acpi/dsdt_top.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	Scope (\_SB) {
diff --git a/src/mainboard/intel/saddlebrook/dsdt.asl b/src/mainboard/intel/saddlebrook/dsdt.asl
index e2291da3f9..1ec9ab022d 100644
--- a/src/mainboard/intel/saddlebrook/dsdt.asl
+++ b/src/mainboard/intel/saddlebrook/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	#include <acpi/dsdt_top.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	Device (\_SB.PCI0)
diff --git a/src/mainboard/kontron/bsl6/dsdt.asl b/src/mainboard/kontron/bsl6/dsdt.asl
index ee425e874d..916e3713f0 100644
--- a/src/mainboard/kontron/bsl6/dsdt.asl
+++ b/src/mainboard/kontron/bsl6/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	#include <acpi/dsdt_top.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	Device (\_SB.PCI0) {
 		#include <soc/intel/skylake/acpi/systemagent.asl>
diff --git a/src/mainboard/libretrend/lt1000/dsdt.asl b/src/mainboard/libretrend/lt1000/dsdt.asl
index 890b969a90..9f02d56fc6 100644
--- a/src/mainboard/libretrend/lt1000/dsdt.asl
+++ b/src/mainboard/libretrend/lt1000/dsdt.asl
@@ -12,7 +12,7 @@ DefinitionBlock(
 {
 	#include <acpi/dsdt_top.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 
 	Device (\_SB.PCI0)
diff --git a/src/mainboard/protectli/vault_kbl/dsdt.asl b/src/mainboard/protectli/vault_kbl/dsdt.asl
index 890b969a90..9f02d56fc6 100644
--- a/src/mainboard/protectli/vault_kbl/dsdt.asl
+++ b/src/mainboard/protectli/vault_kbl/dsdt.asl
@@ -12,7 +12,7 @@ DefinitionBlock(
 {
 	#include <acpi/dsdt_top.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 
 	Device (\_SB.PCI0)
diff --git a/src/mainboard/purism/librem_skl/dsdt.asl b/src/mainboard/purism/librem_skl/dsdt.asl
index 43c8e7f26b..ee71d1ab41 100644
--- a/src/mainboard/purism/librem_skl/dsdt.asl
+++ b/src/mainboard/purism/librem_skl/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	#include <acpi/dsdt_top.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	Device (\_SB.PCI0)
diff --git a/src/mainboard/razer/blade_stealth_kbl/dsdt.asl b/src/mainboard/razer/blade_stealth_kbl/dsdt.asl
index 5fd3569546..e304577656 100644
--- a/src/mainboard/razer/blade_stealth_kbl/dsdt.asl
+++ b/src/mainboard/razer/blade_stealth_kbl/dsdt.asl
@@ -14,7 +14,7 @@ DefinitionBlock(
 	#include <acpi/dsdt_top.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	Device (\_SB.PCI0)
diff --git a/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl b/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl
index ad20f909c5..20b4aefc96 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl
+++ b/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl
@@ -14,7 +14,7 @@ DefinitionBlock(
 	#include <soc/intel/common/block/acpi/acpi/platform.asl>
 
 	// global NVS and variables
-	#include <soc/intel/skylake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>