From ffdf1f950309876b013824c152f0dfc8b6dccb2a Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Sun, 10 Jan 2021 16:30:40 +0100
Subject: sb/intel/ibexpeak: Drop Global NVS support

Was copy-pasted from bd82x6x and no mainboard actually needs it.

The few globals moved outside the GNVS will be removed, relocated or
replaced with acpigen later.

Change-Id: I590a355f1bd1e54365b2e329cfdc62384446a15c
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49280
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/packardbell/ms2290/dsdt.asl     | 6 +++---
 src/mainboard/packardbell/ms2290/smihandler.c | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/mainboard/packardbell')

diff --git a/src/mainboard/packardbell/ms2290/dsdt.asl b/src/mainboard/packardbell/ms2290/dsdt.asl
index 16327345dd..0fa2cc09c5 100644
--- a/src/mainboard/packardbell/ms2290/dsdt.asl
+++ b/src/mainboard/packardbell/ms2290/dsdt.asl
@@ -15,9 +15,6 @@ DefinitionBlock(
 
 	#include "acpi/platform.asl"
 
-	/* global NVS and variables */
-	#include <southbridge/intel/ibexpeak/acpi/globalnvs.asl>
-
 	/* General Purpose Events */
 	#include "acpi/gpe.asl"
 
@@ -27,6 +24,9 @@ DefinitionBlock(
 		Device (PCI0)
 		{
 			#include <northbridge/intel/ironlake/acpi/ironlake.asl>
+
+			/* TBD: Remove. */
+			Name(\XHCI, 0)
 			#include <southbridge/intel/bd82x6x/acpi/pch.asl>
 
 			#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
diff --git a/src/mainboard/packardbell/ms2290/smihandler.c b/src/mainboard/packardbell/ms2290/smihandler.c
index 517c5e50b3..0f2ca42c35 100644
--- a/src/mainboard/packardbell/ms2290/smihandler.c
+++ b/src/mainboard/packardbell/ms2290/smihandler.c
@@ -3,7 +3,6 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <device/pci_ops.h>
-#include <soc/nvs.h>
 #include <southbridge/intel/common/pmutil.h>
 #include <northbridge/intel/ironlake/ironlake.h>
 #include <ec/acpi/ec.h>
-- 
cgit v1.2.3