summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-13 07:57:34 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-15 04:41:35 +0000
commit89d7fd8100f2bde86be18e94d7b3497e621ca8c9 (patch)
treedb54efb2c633c528a86caa9ec60dee0c96dc0429
parenta347630641f796a39311cb0ddc6c9217e56eab07 (diff)
mainboard/google: Fix indirect includes
Change-Id: Ie79702efab519b16cff45ccad61b95e7d8c2fbac Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34854 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/google/dragonegg/smihandler.c2
-rw-r--r--src/mainboard/google/drallion/smihandler.c2
-rw-r--r--src/mainboard/google/eve/smihandler.c2
-rw-r--r--src/mainboard/google/fizz/smihandler.c2
-rw-r--r--src/mainboard/google/glados/smihandler.c2
-rw-r--r--src/mainboard/google/hatch/smihandler.c2
-rw-r--r--src/mainboard/google/poppy/smihandler.c2
-rw-r--r--src/mainboard/google/sarien/smihandler.c2
-rw-r--r--src/mainboard/intel/kblrvp/smihandler.c2
-rw-r--r--src/mainboard/intel/kunimitsu/smihandler.c2
-rw-r--r--src/soc/intel/cannonlake/include/soc/smm.h2
-rw-r--r--src/soc/intel/cannonlake/memmap.c1
-rw-r--r--src/soc/intel/icelake/include/soc/smm.h3
-rw-r--r--src/soc/intel/icelake/memmap.c1
14 files changed, 12 insertions, 15 deletions
diff --git a/src/mainboard/google/dragonegg/smihandler.c b/src/mainboard/google/dragonegg/smihandler.c
index 9c72cb694e..8d2afd60b7 100644
--- a/src/mainboard/google/dragonegg/smihandler.c
+++ b/src/mainboard/google/dragonegg/smihandler.c
@@ -17,7 +17,7 @@
#include <ec/google/chromeec/smm.h>
#include <gpio.h>
#include <soc/gpio.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include <variant/ec.h>
void mainboard_smi_espi_handler(void)
diff --git a/src/mainboard/google/drallion/smihandler.c b/src/mainboard/google/drallion/smihandler.c
index 0efcaa9ef1..18dbfbc154 100644
--- a/src/mainboard/google/drallion/smihandler.c
+++ b/src/mainboard/google/drallion/smihandler.c
@@ -15,7 +15,7 @@
#include <cpu/x86/smm.h>
#include <ec/google/wilco/smm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include <variant/ec.h>
void mainboard_smi_espi_handler(void)
diff --git a/src/mainboard/google/eve/smihandler.c b/src/mainboard/google/eve/smihandler.c
index 7b97446271..5bca488d7c 100644
--- a/src/mainboard/google/eve/smihandler.c
+++ b/src/mainboard/google/eve/smihandler.c
@@ -16,7 +16,7 @@
#include <cpu/x86/smm.h>
#include <ec/google/chromeec/smm.h>
#include <gpio.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include "ec.h"
#include "gpio.h"
diff --git a/src/mainboard/google/fizz/smihandler.c b/src/mainboard/google/fizz/smihandler.c
index 2b7367ad34..d20780c709 100644
--- a/src/mainboard/google/fizz/smihandler.c
+++ b/src/mainboard/google/fizz/smihandler.c
@@ -15,7 +15,7 @@
#include <cpu/x86/smm.h>
#include <ec/google/chromeec/smm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include <baseboard/variants.h>
#include <variant/ec.h>
diff --git a/src/mainboard/google/glados/smihandler.c b/src/mainboard/google/glados/smihandler.c
index a4a1ccadaa..114b937a29 100644
--- a/src/mainboard/google/glados/smihandler.c
+++ b/src/mainboard/google/glados/smihandler.c
@@ -24,7 +24,7 @@
#include <soc/iomap.h>
#include <soc/nvs.h>
#include <soc/pm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include "ec.h"
#include <variant/gpio.h>
diff --git a/src/mainboard/google/hatch/smihandler.c b/src/mainboard/google/hatch/smihandler.c
index 68d562dd0f..c7833e3900 100644
--- a/src/mainboard/google/hatch/smihandler.c
+++ b/src/mainboard/google/hatch/smihandler.c
@@ -17,7 +17,7 @@
#include <ec/google/chromeec/ec.h>
#include <ec/google/chromeec/smm.h>
#include <elog.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include <variant/ec.h>
void mainboard_smi_espi_handler(void)
diff --git a/src/mainboard/google/poppy/smihandler.c b/src/mainboard/google/poppy/smihandler.c
index 4f45687700..44ab10cdf1 100644
--- a/src/mainboard/google/poppy/smihandler.c
+++ b/src/mainboard/google/poppy/smihandler.c
@@ -19,7 +19,7 @@
#include <elog.h>
#include <gpio.h>
#include <soc/gpio.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include <baseboard/variants.h>
#include <variant/gpio.h>
diff --git a/src/mainboard/google/sarien/smihandler.c b/src/mainboard/google/sarien/smihandler.c
index 0efcaa9ef1..18dbfbc154 100644
--- a/src/mainboard/google/sarien/smihandler.c
+++ b/src/mainboard/google/sarien/smihandler.c
@@ -15,7 +15,7 @@
#include <cpu/x86/smm.h>
#include <ec/google/wilco/smm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include <variant/ec.h>
void mainboard_smi_espi_handler(void)
diff --git a/src/mainboard/intel/kblrvp/smihandler.c b/src/mainboard/intel/kblrvp/smihandler.c
index ba8458be15..d642c73c98 100644
--- a/src/mainboard/intel/kblrvp/smihandler.c
+++ b/src/mainboard/intel/kblrvp/smihandler.c
@@ -21,7 +21,7 @@
#include <soc/iomap.h>
#include <soc/nvs.h>
#include <soc/pm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include "ec.h"
#include <variant/gpio.h>
diff --git a/src/mainboard/intel/kunimitsu/smihandler.c b/src/mainboard/intel/kunimitsu/smihandler.c
index df02601368..0830e6091b 100644
--- a/src/mainboard/intel/kunimitsu/smihandler.c
+++ b/src/mainboard/intel/kunimitsu/smihandler.c
@@ -22,7 +22,7 @@
#include <soc/iomap.h>
#include <soc/nvs.h>
#include <soc/pm.h>
-#include <soc/smm.h>
+#include <intelblocks/smihandler.h>
#include "ec.h"
#include "gpio.h"
diff --git a/src/soc/intel/cannonlake/include/soc/smm.h b/src/soc/intel/cannonlake/include/soc/smm.h
index e2367a7795..f2e7950ba2 100644
--- a/src/soc/intel/cannonlake/include/soc/smm.h
+++ b/src/soc/intel/cannonlake/include/soc/smm.h
@@ -45,8 +45,6 @@ struct smm_relocation_params {
int smm_save_state_in_msrs;
};
-/* Mainboard handler for eSPI SMIs */
-void mainboard_smi_espi_handler(void);
void smm_relocation_handler(int cpu, uintptr_t curr_smbase,
uintptr_t staggered_smbase);
diff --git a/src/soc/intel/cannonlake/memmap.c b/src/soc/intel/cannonlake/memmap.c
index a842ff63ec..d1f3ad0035 100644
--- a/src/soc/intel/cannonlake/memmap.c
+++ b/src/soc/intel/cannonlake/memmap.c
@@ -17,6 +17,7 @@
#include <arch/ebda.h>
#include <cbmem.h>
#include <console/console.h>
+#include <cpu/x86/smm.h>
#include <device/device.h>
#include <device/pci.h>
#include <fsp/util.h>
diff --git a/src/soc/intel/icelake/include/soc/smm.h b/src/soc/intel/icelake/include/soc/smm.h
index 2d4adf7e8c..b61951b85b 100644
--- a/src/soc/intel/icelake/include/soc/smm.h
+++ b/src/soc/intel/icelake/include/soc/smm.h
@@ -44,9 +44,6 @@ struct smm_relocation_params {
int smm_save_state_in_msrs;
};
-/* Mainboard handler for eSPI SMIs */
-void mainboard_smi_espi_handler(void);
-
void smm_relocation_handler(int cpu, uintptr_t curr_smbase,
uintptr_t staggered_smbase);
void smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
diff --git a/src/soc/intel/icelake/memmap.c b/src/soc/intel/icelake/memmap.c
index e0d7d68fe6..106742f51b 100644
--- a/src/soc/intel/icelake/memmap.c
+++ b/src/soc/intel/icelake/memmap.c
@@ -16,6 +16,7 @@
#include <arch/ebda.h>
#include <cbmem.h>
#include <console/console.h>
+#include <cpu/x86/smm.h>
#include <device/device.h>
#include <device/pci.h>
#include <fsp/util.h>