From fa2f793957d03c96b2ad3a048b0889fe4203cb81 Mon Sep 17 00:00:00 2001
From: Subrata Banik <subrata.banik@intel.com>
Date: Wed, 30 Oct 2019 15:47:06 +0530
Subject: soc/intel/{cnl,icl}: Move globalnvs.asl/nvs.h into common/block/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch creates a common instance of globalnvs.asl/nvs.h inside intel common
code (soc/intel/common/block/) and ask cnl & icl soc code to refer globalnvs.asl
and nvs.h from common code block.

TEST=Able to build and boot Hatch and ICL DE system. Dump DSDT.asl to verify
GNVS operation region presence after booting to OS.

Change-Id: Ia9fb12a75557bd7dc38f6d22ba2b32065d18b3ee
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36457
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Michael Niewöhner
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/mainboard/google/dragonegg/dsdt.asl | 2 +-
 src/mainboard/google/drallion/dsdt.asl  | 2 +-
 src/mainboard/google/hatch/dsdt.asl     | 2 +-
 src/mainboard/google/sarien/dsdt.asl    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mainboard/google')

diff --git a/src/mainboard/google/dragonegg/dsdt.asl b/src/mainboard/google/dragonegg/dsdt.asl
index d5c709ec1d..4318dc35f3 100644
--- a/src/mainboard/google/dragonegg/dsdt.asl
+++ b/src/mainboard/google/dragonegg/dsdt.asl
@@ -30,7 +30,7 @@ DefinitionBlock(
 	#include <soc/intel/icelake/acpi/platform.asl>
 
 	// global NVS and variables
-	#include <soc/intel/icelake/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/drallion/dsdt.asl b/src/mainboard/google/drallion/dsdt.asl
index 91d3704276..0a092cff0f 100644
--- a/src/mainboard/google/drallion/dsdt.asl
+++ b/src/mainboard/google/drallion/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	#include <soc/intel/cannonlake/acpi/platform.asl>
 
 	/* global NVS and variables */
-	#include <soc/intel/cannonlake/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/hatch/dsdt.asl b/src/mainboard/google/hatch/dsdt.asl
index 9329b58a79..62478293f3 100644
--- a/src/mainboard/google/hatch/dsdt.asl
+++ b/src/mainboard/google/hatch/dsdt.asl
@@ -30,7 +30,7 @@ DefinitionBlock(
 	#include <soc/intel/cannonlake/acpi/platform.asl>
 
 	/* global NVS and variables */
-	#include <soc/intel/cannonlake/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/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl
index 743a2f0a56..9a5c787a25 100644
--- a/src/mainboard/google/sarien/dsdt.asl
+++ b/src/mainboard/google/sarien/dsdt.asl
@@ -29,7 +29,7 @@ DefinitionBlock(
 	#include <soc/intel/cannonlake/acpi/platform.asl>
 
 	/* global NVS and variables */
-	#include <soc/intel/cannonlake/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	/* CPU */
 	#include <cpu/intel/common/acpi/cpu.asl>
-- 
cgit v1.2.3