summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-11-10 19:12:53 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-12-16 20:40:41 +0100
commit13a845acb3aee15dad1b4d66027731baba659e0e (patch)
tree11b3432828f9901c6959ea83065ce7cbda3004e9 /src
parentcb0dd58b37b22f7731cd81da8024934040fafdc0 (diff)
downloadcoreboot-13a845acb3aee15dad1b4d66027731baba659e0e.tar.xz
Intel FSP: Move to DYNAMIC_CBMEM
Flag the boards with BROKEN_CAR_MIGRATE, as testing for EARLY_CBMEM_INIT is not enough to disable CBMEM console for romstage on these platforms. To have CBMEM early in ramstage, define get_top_of_ram() on sandy/ivy. Change-Id: Ieefc12099a0e043eb1a7e14bdc7c6e3d209b3d8f Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/7468 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Martin Roth <gaumless@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/cpu/intel/fsp_model_206ax/Kconfig2
-rw-r--r--src/cpu/intel/fsp_model_406dx/Kconfig1
-rw-r--r--src/mainboard/intel/cougar_canyon2/Kconfig2
-rw-r--r--src/northbridge/intel/fsp_sandybridge/northbridge.c11
-rw-r--r--src/soc/intel/broadwell/memmap.c7
-rw-r--r--src/soc/intel/fsp_baytrail/Kconfig1
6 files changed, 14 insertions, 10 deletions
diff --git a/src/cpu/intel/fsp_model_206ax/Kconfig b/src/cpu/intel/fsp_model_206ax/Kconfig
index c05b12b9ca..9b0edfcbf4 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 5cd4c656e5..2f891ade03 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 27b9a97d4d..0432a53f4a 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/northbridge/intel/fsp_sandybridge/northbridge.c b/src/northbridge/intel/fsp_sandybridge/northbridge.c
index da27b25208..a95d7368b5 100644
--- a/src/northbridge/intel/fsp_sandybridge/northbridge.c
+++ b/src/northbridge/intel/fsp_sandybridge/northbridge.c
@@ -243,9 +243,16 @@ static void pci_domain_set_resources(device_t dev)
add_fixed_resources(dev, 6);
assign_resources(dev->link_list);
+}
+
+unsigned long get_top_of_ram(void)
+{
+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0, 0));
- /* Leave some space for the HOB data above CBMem */
- set_top_of_ram((tomk - 2048) * 1024);
+ /* Base of TSEG is top of usable DRAM */
+ u32 tom = pci_read_config32(dev, TSEG) & ~(1UL << 0);
+ tom -= 0x200000; /* 2MB for FSP HOB */
+ return (unsigned long) tom;
}
/* TODO We could determine how many PCIe busses we need in
diff --git a/src/soc/intel/broadwell/memmap.c b/src/soc/intel/broadwell/memmap.c
index 698ff6b83c..046cc1da07 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();
-}
diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig
index caa01bdabc..b61fac305e 100644
--- a/src/soc/intel/fsp_baytrail/Kconfig
+++ b/src/soc/intel/fsp_baytrail/Kconfig
@@ -31,6 +31,7 @@ config CPU_SPECIFIC_OPTIONS
select ARCH_ROMSTAGE_X86_32
select ARCH_RAMSTAGE_X86_32
select DYNAMIC_CBMEM
+ select BROKEN_CAR_MIGRATE
select HAVE_SMI_HANDLER
select HAVE_HARD_RESET
select MMCONF_SUPPORT