From c4fdb7b923f82e31a687fc01f7176ad05ab51689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Sat, 10 Aug 2019 15:51:59 +0300
Subject: cpu/x86: Move some SMM function declarations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I9a4e57f8fd032f2824eab0e5b59d635710e3e24b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34822
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/southbridge/amd/agesa/hudson/smi.c   | 5 +++--
 src/southbridge/amd/pi/hudson/smi.c      | 5 +++--
 src/southbridge/intel/fsp_rangeley/lpc.c | 1 +
 src/southbridge/intel/i82801dx/smi.c     | 1 +
 src/southbridge/intel/i82801ix/smi.c     | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/southbridge')

diff --git a/src/southbridge/amd/agesa/hudson/smi.c b/src/southbridge/amd/agesa/hudson/smi.c
index 4180795a73..f8196b4e65 100644
--- a/src/southbridge/amd/agesa/hudson/smi.c
+++ b/src/southbridge/amd/agesa/hudson/smi.c
@@ -18,9 +18,10 @@
  * Utilities for SMM setup
  */
 
-#include "smi.h"
-
 #include <console/console.h>
+#include <cpu/x86/smm.h>
+
+#include "smi.h"
 
 void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
 {
diff --git a/src/southbridge/amd/pi/hudson/smi.c b/src/southbridge/amd/pi/hudson/smi.c
index 4180795a73..f8196b4e65 100644
--- a/src/southbridge/amd/pi/hudson/smi.c
+++ b/src/southbridge/amd/pi/hudson/smi.c
@@ -18,9 +18,10 @@
  * Utilities for SMM setup
  */
 
-#include "smi.h"
-
 #include <console/console.h>
+#include <cpu/x86/smm.h>
+
+#include "smi.h"
 
 void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
 {
diff --git a/src/southbridge/intel/fsp_rangeley/lpc.c b/src/southbridge/intel/fsp_rangeley/lpc.c
index af2e411584..d7ae8f6a11 100644
--- a/src/southbridge/intel/fsp_rangeley/lpc.c
+++ b/src/southbridge/intel/fsp_rangeley/lpc.c
@@ -28,6 +28,7 @@
 #include <arch/ioapic.h>
 #include <arch/acpi.h>
 #include <arch/cpu.h>
+#include <cpu/x86/smm.h>
 #include <elog.h>
 #include <string.h>
 #include <cbmem.h>
diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c
index 7dfed9d946..521b98db04 100644
--- a/src/southbridge/intel/i82801dx/smi.c
+++ b/src/southbridge/intel/i82801dx/smi.c
@@ -23,6 +23,7 @@
 #include <device/pci_ops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
+#include <cpu/x86/smi_deprecated.h>
 #include <string.h>
 #include "i82801dx.h"
 
diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c
index 5d898cc3c6..0a80dd2ccf 100644
--- a/src/southbridge/intel/i82801ix/smi.c
+++ b/src/southbridge/intel/i82801ix/smi.c
@@ -24,6 +24,7 @@
 #include <arch/acpi.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/smm.h>
+#include <cpu/x86/smi_deprecated.h>
 #include <string.h>
 #include <southbridge/intel/common/pmutil.h>
 #include "i82801ix.h"
-- 
cgit v1.2.3