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>

30 files changed, 7 insertions, 408 deletions

diff --git a/src/Kconfig b/src/Kconfig
index 560f9e5945..e5dc26b22c 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -159,14 +159,6 @@ config INCLUDE_CONFIG_FILE
 config EARLY_CBMEM_INIT
 	def_bool !LATE_CBMEM_INIT
 
-config DYNAMIC_CBMEM
-	bool
-	default n
-	help
-	  Instead of reserving a static amount of CBMEM space the CBMEM
-	  area grows dynamically.  CBMEM can be used both in romstage (after
-	  memory initialization) and ramstage.
-
 config COLLECT_TIMESTAMPS
 	bool "Create a table of timestamps collected during boot"
 	default n
@@ -200,7 +192,7 @@ config RELOCATABLE_MODULES
 	 loaded anywhere and all the relocations are handled automatically.
 
 config RELOCATABLE_RAMSTAGE
-	depends on (RELOCATABLE_MODULES && DYNAMIC_CBMEM && EARLY_CBMEM_INIT)
+	depends on (RELOCATABLE_MODULES && EARLY_CBMEM_INIT)
 	bool "Build the ramstage to be relocatable in 32-bit address space."
 	default n
 	help
diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c
index 1036adc17f..762d2464d2 100644
--- a/src/arch/x86/boot/cbmem.c
+++ b/src/arch/x86/boot/cbmem.c
@@ -26,21 +26,6 @@
 #include <console/cbmem_console.h>
 #include <timestamp.h>
 
-#if !CONFIG_DYNAMIC_CBMEM
-void get_cbmem_table(uint64_t *base, uint64_t *size)
-{
-	uint64_t top_of_ram = get_top_of_ram();
-
-	if (top_of_ram >= HIGH_MEMORY_SIZE) {
-		*base = top_of_ram - HIGH_MEMORY_SIZE;
-		*size = HIGH_MEMORY_SIZE;
-	} else {
-		*base = 0;
-		*size = 0;
-	}
-}
-#endif /* !DYNAMIC_CBMEM */
-
 #if IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
 
 #if !defined(__PRE_RAM__)
@@ -52,11 +37,7 @@ void __attribute__((weak)) backup_top_of_ram(uint64_t ramtop)
 void set_top_of_ram(uint64_t ramtop)
 {
 	backup_top_of_ram(ramtop);
-#if !CONFIG_DYNAMIC_CBMEM
-	cbmem_late_set_table(ramtop - HIGH_MEMORY_SIZE, HIGH_MEMORY_SIZE);
-#else
 	cbmem_set_top((void*)(uintptr_t)ramtop);
-#endif
 }
 #endif /* !__PRE_RAM__ */
 
@@ -66,13 +47,11 @@ unsigned long __attribute__((weak)) get_top_of_ram(void)
 	return 0;
 }
 
-#if IS_ENABLED(CONFIG_DYNAMIC_CBMEM)
 void *cbmem_top(void)
 {
 	/* Top of cbmem is at lowest usable DRAM address below 4GiB. */
 	return (void *)get_top_of_ram();
 }
-#endif
 
 #endif /* LATE_CBMEM_INIT */
 
diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c
index c2265ea908..712f66f3e8 100644
--- a/src/arch/x86/boot/tables.c
+++ b/src/arch/x86/boot/tables.c
@@ -101,11 +101,8 @@ void write_tables(void)
 #endif /* CONFIG_GENERATE_MP_TABLE */
 
 #if CONFIG_HAVE_ACPI_TABLES
-#if CONFIG_DYNAMIC_CBMEM
 #define MAX_ACPI_SIZE (144 * 1024)
-#else
-#define MAX_ACPI_SIZE (45 * 1024)
-#endif
+
 	post_code(0x9c);
 
 	/* Write ACPI tables to F segment and high tables area */
@@ -199,11 +196,7 @@ void write_tables(void)
 		/* FIXME: The high_table_base parameter is not reference when tables are high,
 		 * or high_table_pointer >1 MB.
 		 */
-#if CONFIG_DYNAMIC_CBMEM
 		u64 fixme_high_tables_base = 0;
-#else
-		u64 fixme_high_tables_base = (u32)get_cbmem_toc();
-#endif
 
 		/* Also put a forwarder entry into 0-4K */
 		new_high_table_pointer = write_coreboot_table(low_table_start, low_table_end,
diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig
index 58bf20db20..27049052d3 100644
--- a/src/cpu/allwinner/a10/Kconfig
+++ b/src/cpu/allwinner/a10/Kconfig
@@ -14,7 +14,6 @@ config CPU_SPECIFIC_OPTIONS
 	select HAVE_UART_SPECIAL
 	select BOOTBLOCK_CONSOLE
 	select CPU_HAS_BOOTBLOCK_INIT
-	select DYNAMIC_CBMEM
 
 # The "eGON.BT0" header takes 32 bytes
 config BOOTBLOCK_BASE
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;
 }
 
diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig
index 5ac629dfae..b2c692b9e9 100644
--- a/src/cpu/ti/am335x/Kconfig
+++ b/src/cpu/ti/am335x/Kconfig
@@ -7,7 +7,6 @@ config CPU_TI_AM335X
 	select HAVE_UART_SPECIAL
 	select BOOTBLOCK_CONSOLE
 	select CPU_HAS_BOOTBLOCK_INIT
-	select DYNAMIC_CBMEM
 	bool
 	default n
 
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index c2e73144c7..ca7a5f4c5c 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -118,8 +118,6 @@ struct cbmem_id_to_name {
 
 struct cbmem_entry;
 
-#if CONFIG_DYNAMIC_CBMEM
-
 /*
  * The dynamic cbmem infrastructure allows for growing cbmem dynamically as
  * things are added. It requires an external function, cbmem_top(), to be
@@ -171,35 +169,6 @@ int cbmem_entry_remove(const struct cbmem_entry *entry);
 void *cbmem_entry_start(const struct cbmem_entry *entry);
 u64 cbmem_entry_size(const struct cbmem_entry *entry);
 
-#else /* !CONFIG_DYNAMIC_CBMEM */
-
-/* Allocation with static CBMEM is resolved at build time. We start
- * with 128kB and conditionally add some of the most greedy CBMEM
- * table entries.
- */
-#define _CBMEM_SZ_MINIMAL	( 128 * 1024 )
-
-#define _CBMEM_SZ_TOTAL	\
-	(_CBMEM_SZ_MINIMAL + CONFIG_CONSOLE_CBMEM_BUFFER_SIZE + \
-	HIGH_MEMORY_SAVE + HIGH_MEMORY_SCRATCH)
-
-#define HIGH_MEMORY_SIZE	ALIGN_UP(_CBMEM_SZ_TOTAL, 0x10000)
-
-#ifndef __PRE_RAM__
-void cbmem_late_set_table(uint64_t base, uint64_t size);
-#endif
-
-void get_cbmem_table(uint64_t *base, uint64_t *size);
-struct cbmem_entry *get_cbmem_toc(void);
-
-static inline const struct cbmem_entry *cbmem_entry_find(uint32_t id)
-{
-	return NULL;
-}
-#endif /* CONFIG_DYNAMIC_CBMEM */
-
-/* Common API between cbmem and dynamic cbmem. */
-
 /* Returns 0 if old cbmem was recovered. Recovery is only attempted if
  * s3resume is non-zero. */
 int cbmem_recovery(int s3resume);
diff --git a/src/include/rmodule.h b/src/include/rmodule.h
index d229cf816a..76b855a22e 100644
--- a/src/include/rmodule.h
+++ b/src/include/rmodule.h
@@ -54,7 +54,6 @@ int rmodule_calc_region(unsigned int region_alignment, size_t rmodule_size,
 /* Support for loading rmodule stages. This API is only available when
  * using dynamic cbmem because it uses the dynamic cbmem API to obtain
  * the backing store region for the stage. */
-#if CONFIG_DYNAMIC_CBMEM
 struct cbfs_stage;
 struct cbmem_entry;
 
@@ -70,7 +69,6 @@ struct rmod_stage_load {
 /* Both of the following functions return 0 on success, -1 on error. */
 int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfs_stage *stage);
 int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl);
-#endif
 
 struct rmodule {
 	void *location;
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index b5eb81971d..9650fd5fd9 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -82,17 +82,8 @@ ramstage-y += memrange.c
 ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c
 ramstage-$(CONFIG_TIMER_QUEUE) += timer_queue.c
 
-# The CBMEM implementations are chosen based on CONFIG_DYNAMIC_CBMEM.
-ifeq ($(CONFIG_DYNAMIC_CBMEM),y)
-ramstage-y += dynamic_cbmem.c
-romstage-y += dynamic_cbmem.c
-else
-ramstage-y += cbmem.c
-romstage-y += cbmem.c
-endif # CONFIG_DYNAMIC_CBMEM
-
-romstage-y += cbmem_common.c
-ramstage-y += cbmem_common.c
+romstage-y += cbmem_common.c dynamic_cbmem.c
+ramstage-y += cbmem_common.c dynamic_cbmem.c
 
 ramstage-y += hexdump.c
 romstage-y += hexdump.c
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
deleted file mode 100644
index d5f89a188d..0000000000
--- a/src/lib/cbmem.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
- */
-
-#include <types.h>
-#include <string.h>
-#include <bootmem.h>
-#include <bootstate.h>
-#include <cbmem.h>
-#include <console/console.h>
-#include <arch/early_variables.h>
-#if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
-#include <arch/acpi.h>
-#endif
-
-// The CBMEM TOC reserves 512 bytes to keep
-// the other entries somewhat aligned.
-// Increase if MAX_CBMEM_ENTRIES exceeds 21
-#define CBMEM_TOC_RESERVED	512
-#define MAX_CBMEM_ENTRIES	16
-#define CBMEM_MAGIC		0x434f5245
-
-struct cbmem_entry {
-	u32 magic;
-	u32 id;
-	u64 base;
-	u64 size;
-} __attribute__((packed));
-
-#ifndef __PRE_RAM__
-static uint64_t cbmem_base = 0;
-static uint64_t cbmem_size = 0;
-#endif
-
-static void cbmem_trace_location(uint64_t base, uint64_t size, const char *s)
-{
-	if (base && size && s) {
-		printk(BIOS_DEBUG, "CBMEM region %llx-%llx (%s)\n",
-			base, base + size - 1, s);
-	}
-}
-
-static void cbmem_locate_table(uint64_t *base, uint64_t *size)
-{
-#ifdef __PRE_RAM__
-	get_cbmem_table(base, size);
-#else
-	if (!(cbmem_base && cbmem_size)) {
-		get_cbmem_table(&cbmem_base, &cbmem_size);
-		cbmem_trace_location(cbmem_base, cbmem_size, __FUNCTION__);
-	}
-	*base = cbmem_base;
-	*size = cbmem_size;
-#endif
-}
-
-struct cbmem_entry *get_cbmem_toc(void)
-{
-	uint64_t base, size;
-	cbmem_locate_table(&base, &size);
-	return (struct cbmem_entry *)(unsigned long)base;
-}
-
-#if !defined(__PRE_RAM__)
-void cbmem_late_set_table(uint64_t base, uint64_t size)
-{
-	cbmem_trace_location(base, size, __FUNCTION__);
-	cbmem_base = base;
-	cbmem_size = size;
-}
-#endif
-
-/**
- * cbmem is a simple mechanism to do some kind of book keeping of the coreboot
- * high tables memory. This is a small amount of memory which is "stolen" from
- * the system memory for coreboot purposes. Usually this memory is used for
- *  - the coreboot table
- *  - legacy tables (PIRQ, MP table)
- *  - ACPI tables
- *  - suspend/resume backup memory
- */
-
-static void cbmem_initialize_empty(void)
-{
-	uint64_t baseaddr, size;
-	struct cbmem_entry *cbmem_toc;
-
-	cbmem_locate_table(&baseaddr, &size);
-	cbmem_trace_location(baseaddr, size, __FUNCTION__);
-
-	if (!(baseaddr && size)) {
-		printk(BIOS_CRIT, "Unable to set location for CBMEM.\n");
-		return;
-	}
-
-	cbmem_toc = (struct cbmem_entry *)(unsigned long)baseaddr;
-	memset(cbmem_toc, 0, CBMEM_TOC_RESERVED);
-
-	cbmem_toc[0] = (struct cbmem_entry) {
-		.magic	= CBMEM_MAGIC,
-		.id	= CBMEM_ID_FREESPACE,
-		.base	= baseaddr + CBMEM_TOC_RESERVED,
-		.size	= size - CBMEM_TOC_RESERVED
-	};
-}
-
-static int cbmem_check_toc(void)
-{
-	uint64_t baseaddr, size;
-	struct cbmem_entry *cbmem_toc;
-
-	cbmem_locate_table(&baseaddr, &size);
-	cbmem_trace_location(baseaddr, size, __FUNCTION__);
-
-	cbmem_toc = (struct cbmem_entry *)(unsigned long)baseaddr;
-
-	return (cbmem_toc[0].magic == CBMEM_MAGIC);
-}
-
-void *cbmem_add(u32 id, u64 size)
-{
-	struct cbmem_entry *cbmem_toc;
-	int i;
-	void *p;
-
-	/*
-	 * This could be a restart, check if the section is there already. It
-	 * is remotely possible that the dram contents persisted over the
-	 * bootloader upgrade AND the same section now needs more room, but
-	 * this is quite a remote possibility and it is ignored here.
-	 */
-	p = cbmem_find(id);
-	if (p) {
-		printk(BIOS_NOTICE,
-		       "CBMEM section %x: using existing location at %p.\n",
-		       id, p);
-		return p;
-	}
-
-	cbmem_toc = get_cbmem_toc();
-
-	if (cbmem_toc == NULL) {
-		return NULL;
-	}
-
-	if (cbmem_toc[0].magic != CBMEM_MAGIC) {
-		printk(BIOS_ERR, "ERROR: CBMEM was not initialized yet.\n");
-		return NULL;
-	}
-
-	/* Will the entry fit at all? */
-	if (size > cbmem_toc[0].size) {
-		printk(BIOS_ERR, "ERROR: Not enough memory for table %x\n", id);
-		return NULL;
-	}
-
-	/* Align size to 512 byte blocks */
-
-	size = ALIGN(size, 512) < cbmem_toc[0].size ?
-		ALIGN(size, 512) : cbmem_toc[0].size;
-
-	/* Now look for the first free/usable TOC entry */
-	for (i = 0; i < MAX_CBMEM_ENTRIES; i++) {
-		if (cbmem_toc[i].id == CBMEM_ID_NONE)
-			break;
-	}
-
-	if (i >= MAX_CBMEM_ENTRIES) {
-		printk(BIOS_ERR, "ERROR: No more CBMEM entries available.\n");
-		return NULL;
-	}
-
-	printk(BIOS_DEBUG, "Adding CBMEM entry as no. %d\n", i);
-
-	cbmem_toc[i] = (struct cbmem_entry) {
-		.magic = CBMEM_MAGIC,
-		.id	= id,
-		.base	= cbmem_toc[0].base,
-		.size	= size
-	};
-
-	cbmem_toc[0].base += size;
-	cbmem_toc[0].size -= size;
-
-	return (void *)(uintptr_t)cbmem_toc[i].base;
-}
-
-void *cbmem_find(u32 id)
-{
-	struct cbmem_entry *cbmem_toc;
-	int i;
-	cbmem_toc = get_cbmem_toc();
-
-	if (cbmem_toc == NULL)
-		return NULL;
-
-	for (i = 0; i < MAX_CBMEM_ENTRIES; i++) {
-		if (cbmem_toc[i].id == id)
-			return (void *)(unsigned long)cbmem_toc[i].base;
-	}
-
-	return (void *)NULL;
-}
-
-/* Returns True if it was not initialized before. */
-int cbmem_recovery(int is_wakeup)
-{
-	int found = cbmem_check_toc();
-	int wipe = 0;
-
-	/* CBMEM TOC is wiped clean when we are not waking up from S3
-	 * suspend. Boards with EARLY_CBMEM_INIT do this in romstage,
-	 * boards without EARLY_CBMEM_INIT do this in ramstage.
-	 */
-#if defined(__PRE_RAM__) && CONFIG_EARLY_CBMEM_INIT
-	wipe = 1;
-#endif
-#if !defined(__PRE_RAM__) && !CONFIG_EARLY_CBMEM_INIT
-	wipe = 1;
-#endif
-
-	if (!is_wakeup && wipe)
-		cbmem_initialize_empty();
-
-	if (is_wakeup && !found) {
-		cbmem_initialize_empty();
-		cbmem_fail_resume();
-	}
-
-	/* Complete migration to CBMEM. */
-	cbmem_run_init_hooks();
-
-	return !found;
-}
-
-#ifndef __PRE_RAM__
-static void init_cbmem_post_device(void *unused)
-{
-#if CONFIG_HAVE_ACPI_RESUME
-	cbmem_recovery(acpi_is_wakeup());
-#else
-	cbmem_recovery(0);
-#endif
-}
-
-BOOT_STATE_INIT_ENTRIES(cbmem_bscb) = {
-	BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_ENTRY,
-	                      init_cbmem_post_device, NULL),
-};
-
-void cbmem_add_bootmem(void)
-{
-	bootmem_add_range(cbmem_base, cbmem_size, LB_MEM_TABLE);
-}
-
-void cbmem_list(void)
-{
-	struct cbmem_entry *cbmem_toc;
-	int i;
-	cbmem_toc = get_cbmem_toc();
-
-	if (cbmem_toc == NULL)
-		return;
-
-	for (i = 0; i < MAX_CBMEM_ENTRIES; i++) {
-
-		if (cbmem_toc[i].magic != CBMEM_MAGIC)
-			continue;
-		cbmem_print_entry(i, cbmem_toc[i].id, cbmem_toc[i].base,
-		                  cbmem_toc[i].size);
-	}
-}
-#endif
diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c
index d7c2326f12..8d96e8d86f 100644
--- a/src/lib/rmodule.c
+++ b/src/lib/rmodule.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 #include <assert.h>
+#include <cbmem.h>
+#include <cbfs_core.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -249,10 +251,6 @@ int rmodule_calc_region(unsigned int region_alignment, size_t rmodule_size,
 	return region_alignment - sizeof(struct rmodule_header);
 }
 
-#if CONFIG_DYNAMIC_CBMEM
-#include <cbmem.h>
-#include <cbfs_core.h>
-
 int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfs_stage *stage)
 {
 	struct rmodule rmod_stage;
@@ -307,5 +305,3 @@ int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl)
 
 	return rmodule_stage_load(rsl, stage);
 }
-
-#endif /* DYNAMIC_CBMEM */
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index 7e24a20815..b275e88eed 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select ARM_ROMSTAGE_ARMV7
 	select ARM_RAMSTAGE_ARMV7
 	select BOARD_ROMSIZE_KB_4096
-	select DYNAMIC_CBMEM
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index b002c21af9..406612ebaa 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_256
-	select DYNAMIC_CBMEM
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_DO_NATIVE_VGA_INIT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c
index 4931523ccd..08d563fbe5 100644
--- a/src/mainboard/emulation/qemu-i440fx/northbridge.c
+++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c
@@ -130,10 +130,6 @@ static void cpu_pci_domain_read_resources(struct device *dev)
 				   "debugcon");
 	}
 
-#if !CONFIG_DYNAMIC_CBMEM
-	set_top_of_ram(tomk * 1024);
-#endif
-
 	if (q35 && ((tomk * 1024) < 0xb0000000)) {
 		/*
 		 * Reserve the region between top-of-ram and the
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index 3949937c77..fcc750c09a 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 #	select HAVE_PIRQ_TABLE
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_256
-	select DYNAMIC_CBMEM
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_DO_NATIVE_VGA_INIT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index fa08acc4fd..a804fd315c 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_CMOS_DEFAULT
 	select HAVE_ACPI_RESUME
 	select HAVE_SMI_HANDLER
-	select DYNAMIC_CBMEM
 	select INTEL_INT15
 	select VGA
 	select INTEL_EDID
diff --git a/src/northbridge/intel/gm45/Kconfig b/src/northbridge/intel/gm45/Kconfig
index fac732929b..096c80fe46 100644
--- a/src/northbridge/intel/gm45/Kconfig
+++ b/src/northbridge/intel/gm45/Kconfig
@@ -27,7 +27,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	select HAVE_DEBUG_RAM_SETUP
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
-	select DYNAMIC_CBMEM
 	select IOMMU
 	select VGA
 	select INTEL_EDID
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
index c578011164..8a0cb5b284 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -26,7 +26,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
-	select DYNAMIC_CBMEM
 	select HAVE_DEBUG_RAM_SETUP
 	select LAPIC_MONOTONIC_TIMER
 	select VGA
diff --git a/src/northbridge/intel/nehalem/Kconfig b/src/northbridge/intel/nehalem/Kconfig
index b49f3315b5..ca5ffa50ac 100644
--- a/src/northbridge/intel/nehalem/Kconfig
+++ b/src/northbridge/intel/nehalem/Kconfig
@@ -22,7 +22,6 @@ config NORTHBRIDGE_INTEL_NEHALEM
 	select CPU_INTEL_MODEL_2065X
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
-	select DYNAMIC_CBMEM
 	select VGA
 	select INTEL_EDID
 	select TSC_MONOTONIC_TIMER
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 647b4fbfc2..11370f5694 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -22,7 +22,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select CACHE_MRC_BIN
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
-	select DYNAMIC_CBMEM
 	select CPU_INTEL_MODEL_206AX
 	select PER_DEVICE_ACPI_TABLES
 
@@ -31,7 +30,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE
 	select CACHE_MRC_BIN
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
-	select DYNAMIC_CBMEM
 	select CPU_INTEL_MODEL_206AX
 	select HAVE_DEBUG_RAM_SETUP
 	select PER_DEVICE_ACPI_TABLES
@@ -41,7 +39,6 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE
 	select CACHE_MRC_BIN
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
-	select DYNAMIC_CBMEM
 	select CPU_INTEL_MODEL_306AX
 	select PER_DEVICE_ACPI_TABLES
 
@@ -50,7 +47,6 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE
 	select CACHE_MRC_BIN
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
-	select DYNAMIC_CBMEM
 	select CPU_INTEL_MODEL_306AX
 	select HAVE_DEBUG_RAM_SETUP
 	select PER_DEVICE_ACPI_TABLES
diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index e7acbe351f..2b2d3210e8 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -17,7 +17,6 @@ config CPU_SPECIFIC_OPTIONS
 	select COLLECT_TIMESTAMPS
 	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
 	select SUPPORT_CPU_UCODE_IN_CBFS
-	select DYNAMIC_CBMEM
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_SMI_HANDLER
 	select HAVE_HARD_RESET
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 1b073eab12..5d84dbe21f 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -22,7 +22,6 @@ config CPU_SPECIFIC_OPTIONS
 	select COLLECT_TIMESTAMPS
 	select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
 	select SUPPORT_CPU_UCODE_IN_CBFS
-	select DYNAMIC_CBMEM
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_SMI_HANDLER
 	select HAVE_HARD_RESET
diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig
index 760bc729f1..b05def20cc 100644
--- a/src/soc/intel/fsp_baytrail/Kconfig
+++ b/src/soc/intel/fsp_baytrail/Kconfig
@@ -31,8 +31,6 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_VERSTAGE_X86_32
 	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
diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig
index a8fcbfb3f6..fddb6dadab 100644
--- a/src/soc/nvidia/tegra124/Kconfig
+++ b/src/soc/nvidia/tegra124/Kconfig
@@ -7,7 +7,6 @@ config SOC_NVIDIA_TEGRA124
 	select ARCH_RAMSTAGE_ARMV7
 	select HAVE_UART_SPECIAL
 	select BOOTBLOCK_CONSOLE
-	select DYNAMIC_CBMEM
 	select ARM_BOOTBLOCK_CUSTOM
 	select ARM_LPAE
 
diff --git a/src/soc/samsung/exynos5250/Kconfig b/src/soc/samsung/exynos5250/Kconfig
index 476376b892..3c7d6c4e77 100644
--- a/src/soc/samsung/exynos5250/Kconfig
+++ b/src/soc/samsung/exynos5250/Kconfig
@@ -6,7 +6,6 @@ config CPU_SAMSUNG_EXYNOS5250
 	select CPU_HAS_BOOTBLOCK_INIT
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_UART_SPECIAL
-	select DYNAMIC_CBMEM
 	bool
 	default n
 
diff --git a/src/soc/samsung/exynos5420/Kconfig b/src/soc/samsung/exynos5420/Kconfig
index 67926bc1e4..bd2bf135e0 100644
--- a/src/soc/samsung/exynos5420/Kconfig
+++ b/src/soc/samsung/exynos5420/Kconfig
@@ -7,7 +7,6 @@ config CPU_SAMSUNG_EXYNOS5420
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_UART_SPECIAL
 	select RELOCATABLE_MODULES
-	select DYNAMIC_CBMEM
 	bool
 	default n
 
diff --git a/src/soc/ucb/riscv/Kconfig b/src/soc/ucb/riscv/Kconfig
index e38ac29b0b..744edffa1b 100644
--- a/src/soc/ucb/riscv/Kconfig
+++ b/src/soc/ucb/riscv/Kconfig
@@ -4,7 +4,6 @@ config SOC_UCB_RISCV
 	select ARCH_VERSTAGE_RISCV
 	select ARCH_ROMSTAGE_RISCV
 	select ARCH_RAMSTAGE_RISCV
-	select DYNAMIC_CBMEM
 	bool
 	default n