aboutsummaryrefslogtreecommitdiff
path: root/src/cpu/intel/haswell
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-11-28 11:24:19 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-27 22:54:32 +0100
commitae98e83eb256c17a4a8d535bba4107611126db3d (patch)
treede963b2d1cd3652e51ec17da112ff7642ddb0e72 /src/cpu/intel/haswell
parent2fb6b40ed0d4c4d169d4b909ad784e1841b50242 (diff)
CBMEM: Always use DYNAMIC_CBMEM
Drop the implementation of statically allocated high memory region for CBMEM. There is no longer the need to explicitly select DYNAMIC_CBMEM, it is the only remaining choice. Change-Id: Iadf6f27a134e05daa1038646d0b4e0b8f9f0587a Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/7851 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/cpu/intel/haswell')
-rw-r--r--src/cpu/intel/haswell/Kconfig1
-rw-r--r--src/cpu/intel/haswell/romstage.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig
index e911b17dfd..4732623e26 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -19,7 +19,6 @@ config CPU_SPECIFIC_OPTIONS
select SMM_MODULES
select RELOCATABLE_MODULES
select RELOCATABLE_RAMSTAGE
- select DYNAMIC_CBMEM
select SUPPORT_CPU_UCODE_IN_CBFS
#select AP_IN_SIPI_WAIT
select TSC_SYNC_MFENCE
diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index 1af5259715..50150cf51b 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -75,14 +75,11 @@ static inline u32 *stack_push(u32 *stack, u32 value)
static unsigned long choose_top_of_stack(void)
{
unsigned long stack_top;
-#if CONFIG_DYNAMIC_CBMEM
+
/* cbmem_add() does a find() before add(). */
stack_top = (unsigned long)cbmem_add(CBMEM_ID_ROMSTAGE_RAM_STACK,
ROMSTAGE_RAM_STACK_SIZE);
stack_top += ROMSTAGE_RAM_STACK_SIZE;
-#else
- stack_top = CONFIG_RAMTOP;
-#endif
return stack_top;
}