From fbcfb63b06ad5cafc97ce76f8640e5c39b41736d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= <foss@mniewoehner.de>
Date: Sun, 26 Sep 2021 18:41:24 +0200
Subject: soc/intel/skylake: switch to common GNVS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/mainboard/google/eve/dsdt.asl    | 2 +-
 src/mainboard/google/fizz/dsdt.asl   | 2 +-
 src/mainboard/google/glados/dsdt.asl | 2 +-
 src/mainboard/google/poppy/dsdt.asl  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mainboard/google')

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>
-- 
cgit v1.2.3