diff --git a/src/arch/arm/tables.c b/src/arch/arm/tables.c
index 49fab9f3d2..825d7a2427 100644
--- a/src/arch/arm/tables.c
+++ b/src/arch/arm/tables.c
@@ -38,10 +38,6 @@ uint64_t high_tables_base = 0;
 uint64_t high_tables_size;
 #endif
 
-void cbmem_arch_init(void)
-{
-}
-
 struct lb_memory *write_tables(void)
 {
 	unsigned long table_pointer, new_table_pointer;
diff --git a/src/arch/arm64/tables.c b/src/arch/arm64/tables.c
index 49fab9f3d2..825d7a2427 100644
--- a/src/arch/arm64/tables.c
+++ b/src/arch/arm64/tables.c
@@ -38,10 +38,6 @@ uint64_t high_tables_base = 0;
 uint64_t high_tables_size;
 #endif
 
-void cbmem_arch_init(void)
-{
-}
-
 struct lb_memory *write_tables(void)
 {
 	unsigned long table_pointer, new_table_pointer;
diff --git a/src/arch/mips/tables.c b/src/arch/mips/tables.c
index 858fa799a3..0c17ff2a85 100644
--- a/src/arch/mips/tables.c
+++ b/src/arch/mips/tables.c
@@ -30,10 +30,6 @@
 
 #define MAX_COREBOOT_TABLE_SIZE (8 * 1024)
 
-void cbmem_arch_init(void)
-{
-}
-
 struct lb_memory *write_tables(void)
 {
 	unsigned long table_pointer, new_table_pointer;
diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c
index 6355a1b9dc..74607ccfce 100644
--- a/src/arch/x86/boot/tables.c
+++ b/src/arch/x86/boot/tables.c
@@ -35,11 +35,12 @@
 uint64_t high_tables_base = 0;
 uint64_t high_tables_size;
 
-void cbmem_arch_init(void)
+static void cbmem_arch_init(void)
 {
 	/* defined in gdt.c */
 	move_gdt();
 }
+RAMSTAGE_CBMEM_INIT_HOOK(cbmem_arch_init)
 
 struct lb_memory *write_tables(void)
 {
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index 058fb64e88..58df163f4c 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -204,19 +204,24 @@ void *cbmem_add(u32 id, u64 size);
 void *cbmem_find(u32 id);
 
 typedef void (* const cbmem_init_hook_t)(void);
-#define CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t init_fn_ ## _ptr \
-	__attribute__((used, section(".rodata.cbmem_init_hooks"))) = init_fn_;
+void cbmem_run_init_hooks(void);
 
 #ifndef __PRE_RAM__
 /* Ramstage only functions. */
 void cbmem_list(void);
-void cbmem_arch_init(void);
 void cbmem_print_entry(int n, u32 id, u64 start, u64 size);
-static inline void cbmem_run_init_hooks(void) {}
-#else
-static inline void cbmem_arch_init(void) {}
-void cbmem_run_init_hooks(void);
-#endif /* __PRE_RAM__ */
+#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
+	init_fn_ ## _unused_ __attribute__((unused)) = init_fn_;
+#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) \
+	static cbmem_init_hook_t init_fn_ ## _ptr_ __attribute__((used, \
+	section(".rodata.cbmem_init_hooks"))) = init_fn_;
+#else /* __PRE_RAM__ */
+#define ROMSTAGE_CBMEM_INIT_HOOK(init_fn_) \
+	static cbmem_init_hook_t init_fn_ ## _ptr_ __attribute__((used, \
+	section(".rodata.cbmem_init_hooks"))) = init_fn_;
+#define RAMSTAGE_CBMEM_INIT_HOOK(init_fn_) static cbmem_init_hook_t \
+	init_fn_ ## _unused_ __attribute__((unused)) = init_fn_;
+#endif /* !__PRE_RAM__ */
 
 #endif /* __ASSEMBLER__ */
 
diff --git a/src/include/memlayout.h b/src/include/memlayout.h
index 17bc8c9549..9392253aac 100644
--- a/src/include/memlayout.h
+++ b/src/include/memlayout.h
@@ -51,7 +51,9 @@
 	REGION(timestamp, addr, size, 8)
 
 #define PRERAM_CBMEM_CONSOLE(addr, size) \
-	REGION(preram_cbmem_console, addr, size, 4)
+	REGION(preram_cbmem_console, addr, size, 4) \
+	_ = ASSERT(size <= CONFIG_CONSOLE_CBMEM_BUFFER_SIZE, \
+		"pre-RAM CBMEM console size must not be larger than post-RAM!");
 
 /* Use either CBFS_CACHE (unified) or both (PRERAM|POSTRAM)_CBFS_CACHE */
 #define CBFS_CACHE(addr, size) REGION(cbfs_cache, addr, size, 4)
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index 85908c9453..0759d9ed89 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -227,9 +227,6 @@ int cbmem_initialize(void)
 		cbmem_init(high_tables_base, high_tables_size);
 		rv = 1;
 	}
-#ifndef __PRE_RAM__
-	cbmem_arch_init();
-#endif
 	cbmem_run_init_hooks();
 
 	/* Migrate cache-as-ram variables. */
@@ -243,9 +240,6 @@ int cbmem_initialize(void)
 static void init_cbmem_post_device(void *unused)
 {
 	cbmem_initialize();
-#if CONFIG_CONSOLE_CBMEM
-	cbmemc_reinit();
-#endif
 }
 
 BOOT_STATE_INIT_ENTRIES(cbmem_bscb) = {
diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c
index 467bc7c529..2c03aae325 100644
--- a/src/lib/cbmem_common.c
+++ b/src/lib/cbmem_common.c
@@ -20,7 +20,7 @@
 #include <cbmem.h>
 #include <stdlib.h>
 
-#ifndef __PRE_RAM__
+#ifndef __PRE_RAM__	/* TODO clean up ifdefs after x86 has --gc-sections */
 
 static const struct cbmem_id_to_name cbmem_ids[] = { CBMEM_ID_TO_NAME_TABLE };
 
@@ -46,7 +46,7 @@ void cbmem_print_entry(int n, u32 id, u64 base, u64 size)
 	printk(BIOS_DEBUG, "%08llx\n", size);
 }
 
-#else	/* __PRE_RAM__ */
+#endif	/* !__PRE_RAM__ */
 
 extern cbmem_init_hook_t _cbmem_init_hooks;
 extern cbmem_init_hook_t _ecbmem_init_hooks;
@@ -59,5 +59,3 @@ void cbmem_run_init_hooks(void)
 		init_hook_ptr++;
 	}
 }
-
-#endif	/* __PRE_RAM__ */
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 0238f2eae1..30cb132cab 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -234,4 +234,5 @@ void cbmemc_reinit(void)
 }
 
 /* Call cbmemc_reinit() at cbmem_initialize() time. */
-CBMEM_INIT_HOOK(cbmemc_reinit)
+ROMSTAGE_CBMEM_INIT_HOOK(cbmemc_reinit)
+RAMSTAGE_CBMEM_INIT_HOOK(cbmemc_reinit)
diff --git a/src/lib/dynamic_cbmem.c b/src/lib/dynamic_cbmem.c
index 842c95bde2..081ee20b21 100644
--- a/src/lib/dynamic_cbmem.c
+++ b/src/lib/dynamic_cbmem.c
@@ -183,7 +183,6 @@ void cbmem_initialize_empty(void)
 	printk(BIOS_DEBUG, "CBMEM: root @ %p %d entries.\n",
 	       root, root->max_entries);
 
-	cbmem_arch_init();
 	cbmem_run_init_hooks();
 
 	/* Migrate cache-as-ram variables. */
@@ -260,7 +259,6 @@ int cbmem_initialize(void)
 	root->locked = 1;
 #endif
 
-	cbmem_arch_init();
 	cbmem_run_init_hooks();
 
 	/* Migrate cache-as-ram variables. */
@@ -425,9 +423,6 @@ void *cbmem_entry_start(const struct cbmem_entry *entry)
 static void init_cbmem_pre_device(void *unused)
 {
 	cbmem_initialize();
-#if CONFIG_CONSOLE_CBMEM
-	cbmemc_reinit();
-#endif /* CONFIG_CONSOLE_CBMEM */
 }
 
 BOOT_STATE_INIT_ENTRIES(cbmem_bscb) = {
diff --git a/src/lib/ramstage.ld b/src/lib/ramstage.ld
index 9ad0e88ccb..732c8e903c 100644
--- a/src/lib/ramstage.ld
+++ b/src/lib/ramstage.ld
@@ -66,6 +66,9 @@
 	_bs_init_begin = .;
 	KEEP(*(.bs_init));
 	_bs_init_end = .;
+	_cbmem_init_hooks = .;
+	KEEP(*(.rodata.cbmem_init_hooks));
+	_ecbmem_init_hooks = .;
 
 	*(.rodata)
 	*(.rodata.*)
diff --git a/src/lib/rmodule.ld b/src/lib/rmodule.ld
index abcc6a2fc2..44704dc6e4 100644
--- a/src/lib/rmodule.ld
+++ b/src/lib/rmodule.ld
@@ -55,6 +55,9 @@ SECTIONS
 		_bs_init_begin = .;
 		*(.bs_init)
 		_bs_init_end = .;
+		_cbmem_init_hooks = .;
+		KEEP(*(.rodata.cbmem_init_hooks));
+		_ecbmem_init_hooks = .;
 
 		. = ALIGN(8);
 
diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index d3404021b7..475d7aefd6 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -214,7 +214,8 @@ static void timestamp_sync(void)
 	if (ts_cbmem_table->base_time == 0)
 		ts_cbmem_table->base_time = ts_cache_table->base_time;
 }
-CBMEM_INIT_HOOK(timestamp_sync)
+ROMSTAGE_CBMEM_INIT_HOOK(timestamp_sync)
+RAMSTAGE_CBMEM_INIT_HOOK(timestamp_sync)
 
 void timestamp_early_init(uint64_t base)
 {
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index 6121e8417f..f4e084a89a 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -154,7 +154,7 @@ static void migrate_power_state(void)
 	}
 	memcpy(ps_cbmem, ps_car, sizeof(*ps_cbmem));
 }
-CBMEM_INIT_HOOK(migrate_power_state)
+ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state)
 
 static struct chipset_power_state *fill_power_state(void)
 {
diff --git a/src/soc/intel/broadwell/romstage/power_state.c b/src/soc/intel/broadwell/romstage/power_state.c
index bc7f15e6c7..097a07644f 100644
--- a/src/soc/intel/broadwell/romstage/power_state.c
+++ b/src/soc/intel/broadwell/romstage/power_state.c
@@ -50,7 +50,7 @@ static void migrate_power_state(void)
 	}
 	memcpy(ps_cbmem, ps_car, sizeof(*ps_cbmem));
 }
-CBMEM_INIT_HOOK(migrate_power_state)
+ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state)
 
 /* Return 0, 3, or 5 to indicate the previous sleep state. */
 static int prev_sleep_state(struct chipset_power_state *ps)