[coreboot-gerrit] New patch to review for coreboot: 1e05ea9 Intel FSP: Move to DYNAMIC_CBMEM
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Fri Nov 14 18:16:34 CET 2014
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7468
-gerrit
commit 1e05ea980e485f13880142ef2f18e7eadd335d2f
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Mon Nov 10 19:12:53 2014 +0200
Intel FSP: Move to DYNAMIC_CBMEM
Change-Id: Ieefc12099a0e043eb1a7e14bdc7c6e3d209b3d8f
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/cpu/intel/fsp_model_206ax/Kconfig | 2 ++
src/cpu/intel/fsp_model_406dx/Kconfig | 1 +
src/mainboard/intel/cougar_canyon2/Kconfig | 2 --
src/soc/intel/broadwell/memmap.c | 7 +------
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/cpu/intel/fsp_model_206ax/Kconfig b/src/cpu/intel/fsp_model_206ax/Kconfig
index 043320c..e323010 100644
--- a/src/cpu/intel/fsp_model_206ax/Kconfig
+++ b/src/cpu/intel/fsp_model_206ax/Kconfig
@@ -40,6 +40,8 @@ config CPU_SPECIFIC_OPTIONS
select PARALLEL_CPU_INIT
select TSC_SYNC_MFENCE
select LAPIC_MONOTONIC_TIMER
+ select BROKEN_CAR_MIGRATE
+ select DYNAMIC_CBMEM
config BOOTBLOCK_CPU_INIT
string
diff --git a/src/cpu/intel/fsp_model_406dx/Kconfig b/src/cpu/intel/fsp_model_406dx/Kconfig
index 11a92a0..24be547 100644
--- a/src/cpu/intel/fsp_model_406dx/Kconfig
+++ b/src/cpu/intel/fsp_model_406dx/Kconfig
@@ -36,6 +36,7 @@ config CPU_SPECIFIC_OPTIONS
select TSC_SYNC_MFENCE
select LAPIC_MONOTONIC_TIMER
select BROKEN_CAR_MIGRATE
+ select DYNAMIC_CBMEM
choice
prompt "Rangeley CPU Stepping"
diff --git a/src/mainboard/intel/cougar_canyon2/Kconfig b/src/mainboard/intel/cougar_canyon2/Kconfig
index 3b25161..cbad724 100644
--- a/src/mainboard/intel/cougar_canyon2/Kconfig
+++ b/src/mainboard/intel/cougar_canyon2/Kconfig
@@ -11,8 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MMCONF_SUPPORT
select SUPERIO_SMSC_SIO1007
select ENABLE_VMX
- select EARLY_CBMEM_INIT
- select BROKEN_CAR_MIGRATE
select INTEL_INT15
select VGA
diff --git a/src/soc/intel/broadwell/memmap.c b/src/soc/intel/broadwell/memmap.c
index 698ff6b..046cc1d 100644
--- a/src/soc/intel/broadwell/memmap.c
+++ b/src/soc/intel/broadwell/memmap.c
@@ -23,7 +23,7 @@
#include <broadwell/pci_devs.h>
#include <broadwell/systemagent.h>
-static unsigned long get_top_of_ram(void)
+unsigned long get_top_of_ram(void)
{
/*
* Base of DPR is top of usable DRAM below 4GiB. The register has
@@ -39,8 +39,3 @@ static unsigned long get_top_of_ram(void)
return (unsigned long)tom;
}
-
-void *cbmem_top(void)
-{
- return (void *)get_top_of_ram();
-}
More information about the coreboot-gerrit
mailing list