diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index b894809..8fc7b6f 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -585,7 +585,7 @@
 	return lb_table_fini(head);
 }
 
-void write_tables(void)
+void *write_tables(void)
 {
 	uintptr_t cbtable_start;
 	uintptr_t cbtable_end;
@@ -596,7 +596,7 @@
 
 	if (!cbtable_start) {
 		printk(BIOS_ERR, "Could not add CBMEM for coreboot table.\n");
-		return;
+		return NULL;
 	}
 
 	/* Add architecture specific tables. */
@@ -615,4 +615,5 @@
 
 	/* Print CBMEM sections */
 	cbmem_list();
+	return (void *)cbtable_start;
 }