summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/Intel/SoC/soc.html1
-rw-r--r--src/drivers/intel/fsp1_1/include/fsp/memmap.h7
-rw-r--r--src/drivers/intel/fsp2_0/include/fsp/memmap.h7
-rw-r--r--src/soc/intel/braswell/memmap.c7
-rw-r--r--src/soc/intel/denverton_ns/include/soc/smm.h7
-rw-r--r--src/soc/intel/skylake/memmap.c11
6 files changed, 0 insertions, 40 deletions
diff --git a/Documentation/Intel/SoC/soc.html b/Documentation/Intel/SoC/soc.html
index fff536b9b1..6b1bb30740 100644
--- a/Documentation/Intel/SoC/soc.html
+++ b/Documentation/Intel/SoC/soc.html
@@ -148,7 +148,6 @@ mv build/coreboot.rom.new build/coreboot.rom
<li>Edit the src/soc/&lt;Vendor&gt;/&lt;Chip Family&gt;/memmap.c file
<ol type="A">
<li>Add the fsp/memmap.h include file</li>
- <li>Add the mmap_region_granularity routine</li>
</ol>
</li>
<li>Add the necessary .h files to define the necessary values and structures</li>
diff --git a/src/drivers/intel/fsp1_1/include/fsp/memmap.h b/src/drivers/intel/fsp1_1/include/fsp/memmap.h
index 965bce646e..3f3850f3f5 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/memmap.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/memmap.h
@@ -18,13 +18,6 @@
#include <types.h>
-/*
- * mmap_region_granularity must to return a size which is a positive non-zero
- * integer multiple of the SMM size when SMM is in use. When not using SMM,
- * this value should be set to 8 MiB.
- */
-size_t mmap_region_granularity(void);
-
/* Fills in the arguments for the entire SMM region covered by chipset
* protections. e.g. TSEG. */
void smm_region(void **start, size_t *size);
diff --git a/src/drivers/intel/fsp2_0/include/fsp/memmap.h b/src/drivers/intel/fsp2_0/include/fsp/memmap.h
index 965bce646e..3f3850f3f5 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/memmap.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/memmap.h
@@ -18,13 +18,6 @@
#include <types.h>
-/*
- * mmap_region_granularity must to return a size which is a positive non-zero
- * integer multiple of the SMM size when SMM is in use. When not using SMM,
- * this value should be set to 8 MiB.
- */
-size_t mmap_region_granularity(void);
-
/* Fills in the arguments for the entire SMM region covered by chipset
* protections. e.g. TSEG. */
void smm_region(void **start, size_t *size);
diff --git a/src/soc/intel/braswell/memmap.c b/src/soc/intel/braswell/memmap.c
index 207c843d52..a4692ceb65 100644
--- a/src/soc/intel/braswell/memmap.c
+++ b/src/soc/intel/braswell/memmap.c
@@ -34,13 +34,6 @@ void smm_region(void **start, size_t *size)
*size = smm_region_size();
}
-size_t mmap_region_granularity(void)
-{
- /* Align to TSEG size when SMM is in use, and 8MiB by default */
- return CONFIG(HAVE_SMI_HANDLER) ? smm_region_size()
- : 8 << 20;
-}
-
/*
* Subregions within SMM
* +-------------------------+ BUNIT_SMRRH
diff --git a/src/soc/intel/denverton_ns/include/soc/smm.h b/src/soc/intel/denverton_ns/include/soc/smm.h
index 771c3d868a..ca01cf8def 100644
--- a/src/soc/intel/denverton_ns/include/soc/smm.h
+++ b/src/soc/intel/denverton_ns/include/soc/smm.h
@@ -24,13 +24,6 @@ struct smm_relocation_attrs {
uint32_t smrr_mask;
};
-/*
- * mmap_region_granularity must to return a size which is a positive non-zero
- * integer multiple of the SMM size when SMM is in use. When not using SMM,
- * this value should be set to 8 MiB.
- */
-size_t mmap_region_granularity(void);
-
/* Fills in the arguments for the entire SMM region covered by chipset
* protections. e.g. TSEG. */
void smm_region(void **start, size_t *size);
diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c
index 1058300197..7a39b6748a 100644
--- a/src/soc/intel/skylake/memmap.c
+++ b/src/soc/intel/skylake/memmap.c
@@ -30,17 +30,6 @@
#include "chip.h"
-size_t mmap_region_granularity(void)
-{
- if (CONFIG(HAVE_SMI_HANDLER))
- /* Align to TSEG size when SMM is in use */
- if (CONFIG_SMM_TSEG_SIZE != 0)
- return CONFIG_SMM_TSEG_SIZE;
-
- /* Make it 8MiB by default. */
- return 8*MiB;
-}
-
void smm_region(void **start, size_t *size)
{
*start = (void *)sa_get_tseg_base();