From 774d41495e6b489e1a33f92e8749f1e9833b691c Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Wed, 20 Mar 2019 12:54:18 -0700 Subject: mb/google/sarien: Add SKU for boards with signed EC To support both boards with the same firmware add a SKU for each variant that is used to include the proper EC firmware image to match what the EC is expecting. BUG=b:119490232 TEST=tested by faking the EC response to ensure that the OS and firmware update tools are able to determine the correct model based on the value returned by the EC. Change-Id: Iaa677975e0bccbee5ec8a39821fe1637f08270fa Signed-off-by: Duncan Laurie Reviewed-on: https://review.coreboot.org/c/coreboot/+/32002 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/sarien/sku.c | 11 +++++++++-- .../google/sarien/variants/arcada/include/variant/variant.h | 8 +++++--- .../google/sarien/variants/sarien/include/variant/variant.h | 8 +++++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/mainboard/google/sarien/sku.c b/src/mainboard/google/sarien/sku.c index 708793db9e..d0b48f0572 100644 --- a/src/mainboard/google/sarien/sku.c +++ b/src/mainboard/google/sarien/sku.c @@ -14,15 +14,22 @@ */ #include +#include #include #include uint32_t sku_id(void) { - return VARIANT_SKU_ID; + if (wilco_ec_signed_fw()) + return VARIANT_SKU_ID_SIGNED_EC; + else + return VARIANT_SKU_ID; } const char *smbios_system_sku(void) { - return VARIANT_SKU_NAME; + if (wilco_ec_signed_fw()) + return VARIANT_SKU_NAME_SIGNED_EC; + else + return VARIANT_SKU_NAME; } diff --git a/src/mainboard/google/sarien/variants/arcada/include/variant/variant.h b/src/mainboard/google/sarien/variants/arcada/include/variant/variant.h index d1284322bb..da1189e14c 100644 --- a/src/mainboard/google/sarien/variants/arcada/include/variant/variant.h +++ b/src/mainboard/google/sarien/variants/arcada/include/variant/variant.h @@ -16,8 +16,10 @@ #ifndef VARIANT_H #define VARIANT_H -/* Arcada is SKU ID 2 */ -#define VARIANT_SKU_ID 2 -#define VARIANT_SKU_NAME "sku2" +/* Arcada is SKU ID 2 and 4 */ +#define VARIANT_SKU_ID 2 +#define VARIANT_SKU_NAME "sku2" +#define VARIANT_SKU_ID_SIGNED_EC 4 +#define VARIANT_SKU_NAME_SIGNED_EC "sku4" #endif diff --git a/src/mainboard/google/sarien/variants/sarien/include/variant/variant.h b/src/mainboard/google/sarien/variants/sarien/include/variant/variant.h index d36750571a..bbb3e9e68d 100644 --- a/src/mainboard/google/sarien/variants/sarien/include/variant/variant.h +++ b/src/mainboard/google/sarien/variants/sarien/include/variant/variant.h @@ -16,8 +16,10 @@ #ifndef VARIANT_H #define VARIANT_H -/* Sarien is SKU ID 1 */ -#define VARIANT_SKU_ID 1 -#define VARIANT_SKU_NAME "sku1" +/* Sarien is SKU ID 1 and 3 */ +#define VARIANT_SKU_ID 1 +#define VARIANT_SKU_NAME "sku1" +#define VARIANT_SKU_ID_SIGNED_EC 3 +#define VARIANT_SKU_NAME_SIGNED_EC "sku3" #endif -- cgit v1.2.3