diff --git a/src/arch/arm/tables.c b/src/arch/arm/tables.c
index 17a3fd1..eb08e6e 100644
--- a/src/arch/arm/tables.c
+++ b/src/arch/arm/tables.c
@@ -50,9 +50,6 @@
 			new_table_pointer - table_pointer);
 
 	post_code(0x9e);
-
-	/* Print CBMEM sections */
-	cbmem_list();
 }
 
 void lb_arch_add_records(struct lb_header *header)
diff --git a/src/arch/arm64/tables.c b/src/arch/arm64/tables.c
index 17a3fd1..eb08e6e 100644
--- a/src/arch/arm64/tables.c
+++ b/src/arch/arm64/tables.c
@@ -50,9 +50,6 @@
 			new_table_pointer - table_pointer);
 
 	post_code(0x9e);
-
-	/* Print CBMEM sections */
-	cbmem_list();
 }
 
 void lb_arch_add_records(struct lb_header *header)
diff --git a/src/arch/mips/tables.c b/src/arch/mips/tables.c
index 2083442..a3d9939 100644
--- a/src/arch/mips/tables.c
+++ b/src/arch/mips/tables.c
@@ -51,9 +51,6 @@
 	       new_table_pointer - table_pointer);
 
 	post_code(0x9e);
-
-	/* Print CBMEM sections */
-	cbmem_list();
 }
 
 void lb_arch_add_records(struct lb_header *header)
diff --git a/src/arch/power8/tables.c b/src/arch/power8/tables.c
index 0a88505..02d1c16 100644
--- a/src/arch/power8/tables.c
+++ b/src/arch/power8/tables.c
@@ -51,9 +51,6 @@
 			new_table_pointer - table_pointer);
 
 	post_code(0x9e);
-
-	/* Print CBMEM sections */
-	cbmem_list();
 }
 
 void lb_arch_add_records(struct lb_header *header)
diff --git a/src/arch/riscv/tables.c b/src/arch/riscv/tables.c
index 17a3fd1..eb08e6e 100644
--- a/src/arch/riscv/tables.c
+++ b/src/arch/riscv/tables.c
@@ -50,9 +50,6 @@
 			new_table_pointer - table_pointer);
 
 	post_code(0x9e);
-
-	/* Print CBMEM sections */
-	cbmem_list();
 }
 
 void lb_arch_add_records(struct lb_header *header)
diff --git a/src/arch/x86/tables.c b/src/arch/x86/tables.c
index 8cfd655..5780cd1 100644
--- a/src/arch/x86/tables.c
+++ b/src/arch/x86/tables.c
@@ -212,7 +212,4 @@
 		write_coreboot_table(low_table_start, low_table_end,
 				     rom_table_start, rom_table_end);
 	}
-
-	/* Print CBMEM sections */
-	cbmem_list();
 }
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index eeed65e..18e8b34 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -572,6 +572,9 @@
 	/* Add all cbmem entries into the coreboot tables. */
 	cbmem_add_records_to_cbtable(head);
 
+	/* Print CBMEM sections */
+	cbmem_list();
+
 	/* Remember where my valid memory ranges are */
 	return lb_table_fini(head);
 }