3 files changed, 88 insertions, 2 deletions

diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index 8ffc69836c..258a4a53b7 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -538,6 +538,9 @@ unsigned long write_coreboot_table(
 
 	lb_boot_media_params(head);
 
+	/* Add all cbmem entries into the coreboot tables. */
+	cbmem_add_records_to_cbtable(head);
+
 	/* Remember where my valid memory ranges are */
 	return lb_table_fini(head);
 }
diff --git a/src/lib/imd.c b/src/lib/imd.c
index bbfbced9c8..2ad9cd8934 100644
--- a/src/lib/imd.c
+++ b/src/lib/imd.c
@@ -623,6 +623,11 @@ void *imd_entry_at(const struct imd *imd, const struct imd_entry *entry)
 	return imdr_entry_at(imdr, entry);
 }
 
+uint32_t imd_entry_id(const struct imd *imd, const struct imd_entry *entry)
+{
+	return entry->id;
+}
+
 int imd_entry_remove(const struct imd *imd, const struct imd_entry *entry)
 {
 	struct imd_root *r;
@@ -698,3 +703,42 @@ int imd_print_entries(const struct imd *imd, const struct imd_lookup *lookup,
 
 	return 0;
 }
+
+int imd_cursor_init(const struct imd *imd, struct imd_cursor *cursor)
+{
+	if (imd == NULL || cursor == NULL)
+		return -1;
+
+	memset(cursor, 0, sizeof(*cursor));
+
+	cursor->imdr[0] = &imd->lg;
+	cursor->imdr[1] = &imd->sm;
+
+	return 0;
+}
+
+const struct imd_entry *imd_cursor_next(struct imd_cursor *cursor)
+{
+	struct imd_root *r;
+	const struct imd_entry *e;
+
+	if (cursor->current_imdr >= ARRAY_SIZE(cursor->imdr))
+		return NULL;
+
+	r = imdr_root(cursor->imdr[cursor->current_imdr]);
+
+	if (r == NULL)
+		return NULL;
+
+	if (cursor->current_entry >= r->num_entries) {
+		/* Try next imdr. */
+		cursor->current_imdr++;
+		cursor->current_entry = 0;
+		return imd_cursor_next(cursor);
+	}
+
+	e = &r->entries[cursor->current_entry];
+	cursor->current_entry++;
+
+	return e;
+}
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
index 7cc34f5878..49faad97b4 100644
--- a/src/lib/imd_cbmem.c
+++ b/src/lib/imd_cbmem.c
@@ -263,7 +263,6 @@ void *cbmem_entry_start(const struct cbmem_entry *entry)
 	return imd_entry_at(imd, cbmem_to_imd(entry));
 }
 
-#if ENV_RAMSTAGE
 void cbmem_add_bootmem(void)
 {
 	void *base = NULL;
@@ -273,10 +272,50 @@ void cbmem_add_bootmem(void)
 	bootmem_add_range((uintptr_t)base, size, LB_MEM_TABLE);
 }
 
+#if ENV_RAMSTAGE
+/*
+ * -fdata-sections doesn't work so well on read only strings. They all
+ * get put in the same section even though those strings may never be
+ * referenced in the final binary.
+ */
 void cbmem_list(void)
 {
 	static const struct imd_lookup lookup[] = { CBMEM_ID_TO_NAME_TABLE };
 
 	imd_print_entries(cbmem_get_imd(), lookup, ARRAY_SIZE(lookup));
 }
-#endif /* __PRE_RAM__ */
+#endif
+
+void cbmem_add_records_to_cbtable(struct lb_header *header)
+{
+	struct imd_cursor cursor;
+	struct imd *imd;
+
+	imd = cbmem_get_imd();
+
+	if (imd_cursor_init(imd, &cursor))
+		return;
+
+	while (1) {
+		const struct imd_entry *e;
+		struct lb_cbmem_entry *lbe;
+		uint32_t id;
+
+		e = imd_cursor_next(&cursor);
+
+		if (e == NULL)
+			break;
+
+		id = imd_entry_id(imd, e);
+		/* Don't add these metadata entries. */
+		if (id == CBMEM_ID_IMD_ROOT || id == CBMEM_ID_IMD_SMALL)
+			continue;
+
+		lbe = (struct lb_cbmem_entry *)lb_new_record(header);
+		lbe->tag = LB_TAG_CBMEM_ENTRY;
+		lbe->size = sizeof(*lbe);
+		lbe->address = (uintptr_t)imd_entry_at(imd, e);
+		lbe->entry_size = imd_entry_size(imd, e);
+		lbe->id = id;
+	}
+}