Change in coreboot[master]: soc/intel: Drop spurious includes

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34868 )

Change subject: soc/intel: Drop spurious includes
......................................................................

soc/intel: Drop spurious includes

Change-Id: I2fff107e38abdd34f2d80d4d258be4c429d371e7
Signed-off-by: Kyösti Mälkki 
---
M src/soc/intel/apollolake/memmap.c
M src/soc/intel/apollolake/romstage.c
M src/soc/intel/baytrail/memmap.c
M src/soc/intel/baytrail/romstage/romstage.c
M src/soc/intel/braswell/memmap.c
M src/soc/intel/braswell/northcluster.c
M src/soc/intel/cannonlake/memmap.c
M src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
M src/soc/intel/fsp_baytrail/memmap.c
M src/soc/intel/icelake/memmap.c
M src/soc/intel/skylake/memmap.c
11 files changed, 0 insertions(+), 11 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/34868/1

diff --git a/src/soc/intel/apollolake/memmap.c b/src/soc/intel/apollolake/memmap.c
index 0eb66dc..8b51a85 100644
--- a/src/soc/intel/apollolake/memmap.c
+++ b/src/soc/intel/apollolake/memmap.c
@@ -20,7 +20,6 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <device/pci.h>
-#include <intelblocks/smm.h>
 #include <soc/systemagent.h>
 #include <soc/pci_devs.h>

diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 3ce6370..640208d 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -36,7 +36,6 @@
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/msr.h>
 #include <intelblocks/pmclib.h>
-#include <intelblocks/smm.h>
 #include <intelblocks/systemagent.h>
 #include <mrc_cache.h>
 #include <soc/cpu.h>
diff --git a/src/soc/intel/baytrail/memmap.c b/src/soc/intel/baytrail/memmap.c
index 94e91ca..bdd520c 100644
--- a/src/soc/intel/baytrail/memmap.c
+++ b/src/soc/intel/baytrail/memmap.c
@@ -16,7 +16,6 @@
 #include <cbmem.h>
 #include <stage_cache.h>
 #include <soc/iosf.h>
-#include <soc/smm.h>

uintptr_t smm_region_start(void)
 {
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index 5ae75b9..3785f3c 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -39,7 +39,6 @@
 #include <soc/pci_devs.h>
 #include <soc/pmc.h>
 #include <soc/romstage.h>
-#include <soc/smm.h>
 #include <soc/spi.h>

/* The cache-as-ram assembly file calls romstage_main() after setting up
diff --git a/src/soc/intel/braswell/memmap.c b/src/soc/intel/braswell/memmap.c
index b4c69a4..d502aed 100644
--- a/src/soc/intel/braswell/memmap.c
+++ b/src/soc/intel/braswell/memmap.c
@@ -17,7 +17,6 @@
 #include <cbmem.h>
 #include <cpu/x86/smm.h>
 #include <soc/iosf.h>
-#include <soc/smm.h>

static size_t smm_region_size(void)
 {
diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c
index ff58ebf..8a5f02e 100644
--- a/src/soc/intel/braswell/northcluster.c
+++ b/src/soc/intel/braswell/northcluster.c
@@ -28,7 +28,6 @@
 #include <soc/iosf.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
-#include <soc/smm.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <stddef.h>

diff --git a/src/soc/intel/cannonlake/memmap.c b/src/soc/intel/cannonlake/memmap.c
index d1f3ad0..276b9a3 100644
--- a/src/soc/intel/cannonlake/memmap.c
+++ b/src/soc/intel/cannonlake/memmap.c
@@ -24,7 +24,6 @@
 #include <intelblocks/ebda.h>
 #include <intelblocks/systemagent.h>
 #include <soc/pci_devs.h>
-#include <soc/smm.h>
 #include <soc/systemagent.h>
 #include <stdlib.h>

diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
index f11b206..07694b6 100644
--- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
+++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
@@ -29,7 +29,6 @@
 #include <soc/pmc.h>
 #include <soc/acpi.h>
 #include <soc/iomap.h>
-#include <soc/smm.h>

#ifdef __PRE_RAM__
 #include <soc/romstage.h>
diff --git a/src/soc/intel/fsp_baytrail/memmap.c b/src/soc/intel/fsp_baytrail/memmap.c
index 77ba406..c13365a 100644
--- a/src/soc/intel/fsp_baytrail/memmap.c
+++ b/src/soc/intel/fsp_baytrail/memmap.c
@@ -16,7 +16,6 @@

#include <cbmem.h>
 #include <soc/iosf.h>
-#include <soc/smm.h>
 #include <drivers/intel/fsp1_0/fsp_util.h>

uintptr_t smm_region_start(void)
diff --git a/src/soc/intel/icelake/memmap.c b/src/soc/intel/icelake/memmap.c
index 106742f..0d41f25 100644
--- a/src/soc/intel/icelake/memmap.c
+++ b/src/soc/intel/icelake/memmap.c
@@ -23,7 +23,6 @@
 #include <intelblocks/ebda.h>
 #include <intelblocks/systemagent.h>
 #include <soc/pci_devs.h>
-#include <soc/smm.h>
 #include <soc/soc_chip.h>
 #include <soc/systemagent.h>
 #include <stdlib.h>
diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c
index e4e2516..9d3f377 100644
--- a/src/soc/intel/skylake/memmap.c
+++ b/src/soc/intel/skylake/memmap.c
@@ -25,7 +25,6 @@
 #include <intelblocks/systemagent.h>
 #include <soc/msr.h>
 #include <soc/pci_devs.h>
-#include <soc/smm.h>
 #include <soc/systemagent.h>
 #include <stdlib.h>

[Kyösti Mälkki (Code Review)]

Hello Patrick Rudolph, Huang Jin, Philipp Deppenwiese, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/34868

to look at the new patch set (#2).

Change subject: soc/intel: Drop spurious includes
......................................................................

soc/intel: Drop spurious includes

Change-Id: I2fff107e38abdd34f2d80d4d258be4c429d371e7
Signed-off-by: Kyösti Mälkki 
---
M src/soc/intel/apollolake/memmap.c
M src/soc/intel/apollolake/romstage.c
M src/soc/intel/braswell/memmap.c
M src/soc/intel/braswell/northcluster.c
M src/soc/intel/cannonlake/memmap.c
M src/soc/intel/icelake/memmap.c
M src/soc/intel/skylake/memmap.c
7 files changed, 0 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/34868/2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34868 )

Change subject: soc/intel: Drop spurious includes
......................................................................

Patch Set 2: Code-Review+2

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34868 )

Change subject: soc/intel: Drop spurious includes
......................................................................

soc/intel: Drop spurious includes

Change-Id: I2fff107e38abdd34f2d80d4d258be4c429d371e7
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34868
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
---
M src/soc/intel/apollolake/memmap.c
M src/soc/intel/apollolake/romstage.c
M src/soc/intel/braswell/memmap.c
M src/soc/intel/braswell/northcluster.c
M src/soc/intel/cannonlake/memmap.c
M src/soc/intel/icelake/memmap.c
M src/soc/intel/skylake/memmap.c
7 files changed, 0 insertions(+), 7 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/soc/intel/apollolake/memmap.c b/src/soc/intel/apollolake/memmap.c
index 0eb66dc..8b51a85 100644
--- a/src/soc/intel/apollolake/memmap.c
+++ b/src/soc/intel/apollolake/memmap.c
@@ -20,7 +20,6 @@
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <device/pci.h>
-#include <intelblocks/smm.h>
 #include <soc/systemagent.h>
 #include <soc/pci_devs.h>

diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 3ce6370..640208d 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -36,7 +36,6 @@
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/msr.h>
 #include <intelblocks/pmclib.h>
-#include <intelblocks/smm.h>
 #include <intelblocks/systemagent.h>
 #include <mrc_cache.h>
 #include <soc/cpu.h>
diff --git a/src/soc/intel/braswell/memmap.c b/src/soc/intel/braswell/memmap.c
index b4c69a4..d502aed 100644
--- a/src/soc/intel/braswell/memmap.c
+++ b/src/soc/intel/braswell/memmap.c
@@ -17,7 +17,6 @@
 #include <cbmem.h>
 #include <cpu/x86/smm.h>
 #include <soc/iosf.h>
-#include <soc/smm.h>

static size_t smm_region_size(void)
 {
diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c
index ff58ebf..8a5f02e 100644
--- a/src/soc/intel/braswell/northcluster.c
+++ b/src/soc/intel/braswell/northcluster.c
@@ -28,7 +28,6 @@
 #include <soc/iosf.h>
 #include <soc/pci_devs.h>
 #include <soc/ramstage.h>
-#include <soc/smm.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <stddef.h>

diff --git a/src/soc/intel/cannonlake/memmap.c b/src/soc/intel/cannonlake/memmap.c
index d1f3ad0..276b9a3 100644
--- a/src/soc/intel/cannonlake/memmap.c
+++ b/src/soc/intel/cannonlake/memmap.c
@@ -24,7 +24,6 @@
 #include <intelblocks/ebda.h>
 #include <intelblocks/systemagent.h>
 #include <soc/pci_devs.h>
-#include <soc/smm.h>
 #include <soc/systemagent.h>
 #include <stdlib.h>

diff --git a/src/soc/intel/icelake/memmap.c b/src/soc/intel/icelake/memmap.c
index 106742f..0d41f25 100644
--- a/src/soc/intel/icelake/memmap.c
+++ b/src/soc/intel/icelake/memmap.c
@@ -23,7 +23,6 @@
 #include <intelblocks/ebda.h>
 #include <intelblocks/systemagent.h>
 #include <soc/pci_devs.h>
-#include <soc/smm.h>
 #include <soc/soc_chip.h>
 #include <soc/systemagent.h>
 #include <stdlib.h>
diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c
index e4e2516..9d3f377 100644
--- a/src/soc/intel/skylake/memmap.c
+++ b/src/soc/intel/skylake/memmap.c
@@ -25,7 +25,6 @@
 #include <intelblocks/systemagent.h>
 #include <soc/msr.h>
 #include <soc/pci_devs.h>
-#include <soc/smm.h>
 #include <soc/systemagent.h>
 #include <stdlib.h>