3 files changed, 24 insertions, 5 deletions
diff --git a/src/commonlib/include/commonlib/coreboot_tables.h b/src/commonlib/include/commonlib/coreboot_tables.h
index feee17274a..eaa3c4eec0 100644
--- a/src/commonlib/include/commonlib/coreboot_tables.h
+++ b/src/commonlib/include/commonlib/coreboot_tables.h
@@ -290,6 +290,7 @@ struct lb_x86_rom_mtrr {
 
 #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 4324a72e5e..e1bce0388a 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 18c70c9764..aeaff28313 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -246,6 +246,7 @@ static inline void lb_vboot_handoff(struct lb_header *header) {}
 
 __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 @@ static void lb_ram_code(struct lb_header *header)
 	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 @@ static uintptr_t write_coreboot_table(uintptr_t rom_table_end)
 	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))