From 31312b21d147938cb4d88ed90e570ac7804c930d Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Tue, 10 Apr 2018 12:56:19 +0200
Subject: sb/intel/i82801gx: Use common Intel SMM code

Use the common Intel code to set up smm and the smihandler. This is
expected to break S3 resume and other smihandler related
functionality as this code is meant to be used with
CONFIG_SMM_TSEG. Platforms (i945, pineview, x4x) using this
southbridge will adapt the CONFIG_SMM_TSEG codepath in subsequent
patches.

Tested on Intel D945GCLF, still boots fine but breaks S3 resume
support because it hangs on SMI.

Change-Id: If7016a3b98fc5f14c287ce800325084f9dc602a0
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/25594
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/mainboard/apple/macbook21/smihandler.c | 2 +-
 src/mainboard/lenovo/t60/smihandler.c      | 2 +-
 src/mainboard/lenovo/x60/smihandler.c      | 2 +-
 src/mainboard/lenovo/z61t/smihandler.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mainboard')

diff --git a/src/mainboard/apple/macbook21/smihandler.c b/src/mainboard/apple/macbook21/smihandler.c
index ab33801560..ec2f0772cb 100644
--- a/src/mainboard/apple/macbook21/smihandler.c
+++ b/src/mainboard/apple/macbook21/smihandler.c
@@ -18,7 +18,7 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-#include <southbridge/intel/i82801gx/i82801gx.h>
+#include <southbridge/intel/common/pmutil.h>
 #include <delay.h>
 
 #define GPE_EC_SCI	12
diff --git a/src/mainboard/lenovo/t60/smihandler.c b/src/mainboard/lenovo/t60/smihandler.c
index 4e6a68d356..aa29984ef4 100644
--- a/src/mainboard/lenovo/t60/smihandler.c
+++ b/src/mainboard/lenovo/t60/smihandler.c
@@ -18,7 +18,7 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-#include <southbridge/intel/i82801gx/i82801gx.h>
+#include <southbridge/intel/common/pmutil.h>
 #include <ec/acpi/ec.h>
 #include "dock.h"
 #include "smi.h"
diff --git a/src/mainboard/lenovo/x60/smihandler.c b/src/mainboard/lenovo/x60/smihandler.c
index 6d95ee1adc..3c8565d496 100644
--- a/src/mainboard/lenovo/x60/smihandler.c
+++ b/src/mainboard/lenovo/x60/smihandler.c
@@ -18,7 +18,7 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-#include <southbridge/intel/i82801gx/i82801gx.h>
+#include <southbridge/intel/common/pmutil.h>
 #include <ec/acpi/ec.h>
 #include <pc80/mc146818rtc.h>
 #include <ec/lenovo/h8/h8.h>
diff --git a/src/mainboard/lenovo/z61t/smihandler.c b/src/mainboard/lenovo/z61t/smihandler.c
index 253ab44e90..4f622241a6 100644
--- a/src/mainboard/lenovo/z61t/smihandler.c
+++ b/src/mainboard/lenovo/z61t/smihandler.c
@@ -18,7 +18,7 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <southbridge/intel/i82801gx/nvs.h>
-#include <southbridge/intel/i82801gx/i82801gx.h>
+#include <southbridge/intel/common/pmutil.h>
 #include <ec/acpi/ec.h>
 #include "dock.h"
 #include "smi.h"
-- 
cgit v1.2.3