4 files changed, 0 insertions, 20 deletions
diff --git a/src/arch/armv7/tables.c b/src/arch/armv7/tables.c
index 3f5338c821..7e7cbe409c 100644
--- a/src/arch/armv7/tables.c
+++ b/src/arch/armv7/tables.c
@@ -50,10 +50,6 @@ struct lb_memory *write_tables(void)
 {
 	unsigned long table_pointer, new_table_pointer;
 
-#if !CONFIG_DYNAMIC_CBMEM
-	cbmem_base_check();
-#endif
-
 	post_code(0x9d);
 
 	table_pointer = (unsigned long)cbmem_add(CBMEM_ID_CBTABLE,
diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c
index eea9bf1c12..40bf087cc3 100644
--- a/src/arch/x86/boot/tables.c
+++ b/src/arch/x86/boot/tables.c
@@ -50,10 +50,6 @@ struct lb_memory *write_tables(void)
 	 */
 	unsigned long high_table_pointer;
 
-#if !CONFIG_DYNAMIC_CBMEM
-	cbmem_base_check();
-#endif
-
 	rom_table_start = 0xf0000;
 	rom_table_end =   0xf0000;
 
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index f9d268aa8b..746f40cbcf 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -134,7 +134,6 @@ u64 cbmem_entry_size(const struct cbmem_entry *entry);
 void set_top_of_ram(uint64_t ramtop);
 void backup_top_of_ram(uint64_t ramtop);
 void cbmem_late_set_table(uint64_t base, uint64_t size);
-int cbmem_base_check(void);
 #endif
 
 int cbmem_reinit(void);
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index e6d39132d4..6b0cbc8948 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -256,17 +256,6 @@ BOOT_STATE_INIT_ENTRIES(cbmem_bscb) = {
 	                      init_cbmem_post_device, NULL),
 };
 
-int cbmem_base_check(void)
-{
-	if (!cbmem_base) {
-		printk(BIOS_ERR, "ERROR: CBMEM Base is not set.\n");
-		// Are there any boards without?
-		// Stepan thinks we should die() here!
-	}
-	printk(BIOS_DEBUG, "CBMEM Base is %llx.\n", cbmem_base);
-	return !!cbmem_base;
-}
-
 void cbmem_add_lb_mem(struct lb_memory *mem)
 {
 	lb_add_memory_range(mem, LB_MEM_TABLE, cbmem_base, cbmem_size);