commit 10e4b41b417dbd6c805fabbe171bd8db6c0b7081
author Kaka Ni <nigang@huaqin.corp-partner.google.com> Fri Mar 01 10:34:15 2019
committer chrome-bot <chrome-bot@chromium.org> Mon Mar 04 07:42:31 2019
tree 6fac57a5f1cb08b4c31519ee6c590a732523f513
parent 9b7efa9e34b06d2b6cfa64564d8e2e89d2311599

flapjack: Support getting sku_id from FDT

On Flapjack, coreboot would read sku id form CBI and export it into the
device tree. Please refer to CL:1494093

So add read sku_id support for kukui & flapjack.

BUG=b:126805532
TEST=1:) emerge-flapjack mosys;
     2:) run 'mosys platform sku' in flapjack shows the string format for
     /proc/device-tree/firmware/coreboot/sku-id

Change-Id: Ia4d402e25cead5d1ff8bb571188aa3821170b106
Reviewed-on: https://chromium-review.googlesource.com/1496677
Commit-Ready: Kaka Ni <nigang@huaqin.corp-partner.google.com>
Tested-by: Kaka Ni <nigang@huaqin.corp-partner.google.com>
Reviewed-by: YH Lin <yueherngl@chromium.org>

platform/oak/oak.c

diff --git a/platform/oak/oak.c b/platform/oak/oak.c
index 8895a3d..63c0668 100644
--- a/platform/oak/oak.c
+++ b/platform/oak/oak.c
@@ -214,7 +214,7 @@
 	.memory		= &kukui_memory_cb,
 	.pd		= &cros_pd_cb,
 	.psu		= &generic_psu_battery_cb,
-	.sys		= &oak_sys_cb,
+	.sys		= &kukui_sys_cb,
 	.eventlog	= &oak_eventlog_cb,
 };
 

platform/oak/oak.h

diff --git a/platform/oak/oak.h b/platform/oak/oak.h
index 2c4c51a..4ed3008 100644
--- a/platform/oak/oak.h
+++ b/platform/oak/oak.h
@@ -47,6 +47,7 @@
 extern struct nvram_cb cros_spi_flash_nvram_cb;
 extern struct oak_psu_cb oak_psu_cb;
 extern struct sys_cb oak_sys_cb;
+extern struct sys_cb kukui_sys_cb;
 
 /* functions called by setup routines */
 extern int oak_vpd_setup(struct platform_intf *intf);

platform/oak/sys.c

diff --git a/platform/oak/sys.c b/platform/oak/sys.c
index 3c3773d..d5f8e18 100644
--- a/platform/oak/sys.c
+++ b/platform/oak/sys.c
@@ -47,6 +47,12 @@
 	return ret;
 }
 
+static int kukui_get_sku_id(struct platform_intf *intf)
+{
+	return fdt_get_sku_id();
+}
+
+
 static char *oak_get_name(struct platform_intf *intf)
 {
 	char *ret = NULL;
@@ -65,3 +71,14 @@
 	.signature_id		= sku_get_signature_id,
 #endif
 };
+
+struct sys_cb kukui_sys_cb = {
+	.vendor			= &oak_get_vendor,
+	.name			= &oak_get_name,
+	.version		= &cros_ec_board_version_str,
+	.sku_number		= &kukui_get_sku_id,
+#ifdef CONFIG_CROS_CONFIG
+	/* Only unibuild has the concept of a signature ID */
+	.signature_id		= sku_get_signature_id,
+#endif
+};