Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/29649 )
Change subject: mb/google/sarien: Set SMBIOS mainboard SKU ......................................................................
mb/google/sarien: Set SMBIOS mainboard SKU
Setting sku_id() is not enough to get a value to show up in the SMBIOS tables, it also needs to be returned as a string for the table creation to consume. This change defines the smbios_mainboard_sku() function and returns a string constant of "sku#" as expected.
Change-Id: I03013bab89d53d1eba969c6ffb7e95fcbb315a81 Signed-off-by: Duncan Laurie dlaurie@google.com Reviewed-on: https://review.coreboot.org/29649 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com Reviewed-by: Trent Begin tbegin@google.com --- M src/mainboard/google/sarien/sku.c M src/mainboard/google/sarien/variants/arcada/include/variant/variant.h M src/mainboard/google/sarien/variants/sarien/include/variant/variant.h 3 files changed, 8 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Trent Begin: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/sarien/sku.c b/src/mainboard/google/sarien/sku.c index 9fc61a3..c064c02 100644 --- a/src/mainboard/google/sarien/sku.c +++ b/src/mainboard/google/sarien/sku.c @@ -14,9 +14,15 @@ */
#include <boardid.h> +#include <smbios.h> #include <variant/variant.h>
uint32_t sku_id(void) { return VARIANT_SKU_ID; } + +const char *smbios_mainboard_sku(void) +{ + 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 f1e551a..d128432 100644 --- a/src/mainboard/google/sarien/variants/arcada/include/variant/variant.h +++ b/src/mainboard/google/sarien/variants/arcada/include/variant/variant.h @@ -18,5 +18,6 @@
/* Arcada is SKU ID 2 */ #define VARIANT_SKU_ID 2 +#define VARIANT_SKU_NAME "sku2"
#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 d0be7fc..d367505 100644 --- a/src/mainboard/google/sarien/variants/sarien/include/variant/variant.h +++ b/src/mainboard/google/sarien/variants/sarien/include/variant/variant.h @@ -18,5 +18,6 @@
/* Sarien is SKU ID 1 */ #define VARIANT_SKU_ID 1 +#define VARIANT_SKU_NAME "sku1"
#endif