summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/x86/boot/coreboot_table.c44
-rw-r--r--src/include/boot/coreboot_tables.h6
2 files changed, 34 insertions, 16 deletions
diff --git a/src/arch/x86/boot/coreboot_table.c b/src/arch/x86/boot/coreboot_table.c
index 53ff3d36d4..a9ff6f0f1b 100644
--- a/src/arch/x86/boot/coreboot_table.c
+++ b/src/arch/x86/boot/coreboot_table.c
@@ -179,22 +179,39 @@ static void lb_framebuffer(struct lb_header *header)
#endif
}
-#if CONFIG_COLLECT_TIMESTAMPS
-static void lb_tsamp(struct lb_header *header)
+static void add_cbmem_pointers(struct lb_header *header)
{
- struct lb_tstamp *tstamp;
- void *tstamp_table = cbmem_find(CBMEM_ID_TIMESTAMP);
+ /*
+ * These CBMEM sections' addresses are included in the coreboot table
+ * with the appropriate tags.
+ */
+ const struct section_id {
+ int cbmem_id;
+ int table_tag;
+ } section_ids[] = {
+ {CBMEM_ID_TIMESTAMP, LB_TAG_TIMESTAMPS},
+ {CBMEM_ID_CONSOLE, LB_TAG_CBMEM_CONSOLE}
+ };
+ int i;
- if (!tstamp_table)
- return;
+ for (i = 0; i < ARRAY_SIZE(section_ids); i++) {
+ const struct section_id *sid = section_ids + i;
+ struct lb_cbmem_ref *cbmem_ref;
+ void *cbmem_addr = cbmem_find(sid->cbmem_id);
- tstamp = (struct lb_tstamp *)lb_new_record(header);
- tstamp->tag = LB_TAG_TIMESTAMPS;
- tstamp->size = sizeof(*tstamp);
- tstamp->tstamp_tab = tstamp_table;
+ if (!cbmem_addr)
+ continue; /* This section is not present */
+ cbmem_ref = (struct lb_cbmem_ref *)lb_new_record(header);
+ if (!cbmem_ref) {
+ printk(BIOS_ERR, "No more room in coreboot table!\n");
+ break;
+ }
+ cbmem_ref->tag = sid->table_tag;
+ cbmem_ref->size = sizeof(*cbmem_ref);
+ cbmem_ref->cbmem_addr = cbmem_addr;
+ }
}
-#endif
static struct lb_mainboard *lb_mainboard(struct lb_header *header)
{
@@ -637,9 +654,8 @@ unsigned long write_coreboot_table(
/* Record our framebuffer */
lb_framebuffer(head);
-#if CONFIG_COLLECT_TIMESTAMPS
- lb_tsamp(head);
-#endif
+ add_cbmem_pointers(head);
+
/* Remember where my valid memory ranges are */
return lb_table_fini(head, 1);
diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h
index 46d64898b4..5535a38a7c 100644
--- a/src/include/boot/coreboot_tables.h
+++ b/src/include/boot/coreboot_tables.h
@@ -196,11 +196,13 @@ struct lb_framebuffer {
};
#define LB_TAG_TIMESTAMPS 0x0016
-struct lb_tstamp {
+#define LB_TAG_CBMEM_CONSOLE 0x0017
+#define LB_TAG_MRC_CACHE 0x0018
+struct lb_cbmem_ref {
uint32_t tag;
uint32_t size;
- void *tstamp_tab;
+ void *cbmem_addr;
};
/* The following structures are for the cmos definitions table */