4 files changed, 1 insertions, 7 deletions
diff --git a/src/cpu/intel/fsp_model_206ax/Kconfig b/src/cpu/intel/fsp_model_206ax/Kconfig
index 76b870ef8e..ea99ee0c7d 100644
--- a/src/cpu/intel/fsp_model_206ax/Kconfig
+++ b/src/cpu/intel/fsp_model_206ax/Kconfig
@@ -42,7 +42,6 @@ config CPU_SPECIFIC_OPTIONS
 	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 7169c7e7e5..c3acc7846a 100644
--- a/src/cpu/intel/fsp_model_406dx/Kconfig
+++ b/src/cpu/intel/fsp_model_406dx/Kconfig
@@ -37,7 +37,6 @@ 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/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;
 }