boardid: Add helpers to read sku_id strapping into coreboot tables
On many recent Chrome OS boards, the desire to unite more configurations
under the same image has led to the need of a "SKU ID" that identifies
different configurations of the same board (e.g. with certain optional
components stuffed or not stuffed, or replaced with a comparable
component). This is markedly different from the existing "board ID",
because that is reserved to count "revisions" -- changes made to the
same configuration over time during the development process. This patch
adds support to have a mainboard define this SKU ID and pass it through
the coreboot table like we already have for board IDs.
Change-Id: I8aabffe8e1003b0d6fb70d689ae513ca4b46aeda
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/22696
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/commonlib/include/commonlib/coreboot_tables.h b/src/commonlib/include/commonlib/coreboot_tables.h
index feee172..eaa3c4e 100644
--- a/src/commonlib/include/commonlib/coreboot_tables.h
+++ b/src/commonlib/include/commonlib/coreboot_tables.h
@@ -290,6 +290,7 @@
#define LB_TAG_BOARD_ID 0x0025
#define LB_TAG_RAM_CODE 0x0028
+#define LB_TAG_SKU_ID 0x002d
struct lb_strapping_id {
uint32_t tag;
diff --git a/src/include/boardid.h b/src/include/boardid.h
index 4324a72..e1bce03 100644
--- a/src/include/boardid.h
+++ b/src/include/boardid.h
@@ -20,7 +20,8 @@
#define UNDEFINED_STRAPPING_ID (~0)
-uint32_t board_id(void);
-uint32_t ram_code(void);
+uint32_t board_id(void); /* differentiates revisions */
+uint32_t ram_code(void); /* identifies installed DRAM modules */
+uint32_t sku_id(void); /* differentiates other optional components */
#endif /* __INCLUDE_BOARDID_H__ */
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index 18c70c9..aeaff28 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -246,6 +246,7 @@
__attribute__((weak)) uint32_t board_id(void) { return UNDEFINED_STRAPPING_ID; }
__attribute__((weak)) uint32_t ram_code(void) { return UNDEFINED_STRAPPING_ID; }
+__attribute__((weak)) uint32_t sku_id(void) { return UNDEFINED_STRAPPING_ID; }
static void lb_board_id(struct lb_header *header)
{
@@ -310,6 +311,23 @@
printk(BIOS_INFO, "RAM code: %d\n", code);
}
+static void lb_sku_id(struct lb_header *header)
+{
+ struct lb_strapping_id *rec;
+ uint32_t sid = sku_id();
+
+ if (sid == UNDEFINED_STRAPPING_ID)
+ return;
+
+ rec = (struct lb_strapping_id *)lb_new_record(header);
+
+ rec->tag = LB_TAG_SKU_ID;
+ rec->size = sizeof(*rec);
+ rec->id_code = sid;
+
+ printk(BIOS_INFO, "SKU ID: %d\n", sid);
+}
+
static void add_cbmem_pointers(struct lb_header *header)
{
/*
@@ -544,11 +562,10 @@
lb_vboot_handoff(head);
#endif
- /* Add board ID if available */
+ /* Add strapping IDs if available */
lb_board_id(head);
-
- /* Add RAM config if available */
lb_ram_code(head);
+ lb_sku_id(head);
/* Add SPI flash description if available */
if (IS_ENABLED(CONFIG_BOOT_DEVICE_SPI_FLASH))