[coreboot-gerrit] Change in coreboot[master]: mainboard/google/volteer: Migrate onto SKU ID helpers

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39037 )

Change subject: mainboard/google/volteer: Migrate onto SKU ID helpers
......................................................................

mainboard/google/volteer: Migrate onto SKU ID helpers

Leverage the common sku id space helper encoders.
volteer uses the non-legacy SKU ID space.

BUG=b:149348474
BRANCH=none
TEST=only tested on hatch

Change-Id: Ic66908afb7abb34527b4177cfd07f03ad718317c
Signed-off-by: Edward O'Callaghan 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39037
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
---
M src/mainboard/google/volteer/Kconfig
M src/mainboard/google/volteer/mainboard.c
2 files changed, 2 insertions(+), 28 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 572a100..699cdea 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -6,6 +6,7 @@
    select DRIVERS_SPI_ACPI
    select EC_GOOGLE_CHROMEEC
    select EC_GOOGLE_CHROMEEC_BOARDID
+	select EC_GOOGLE_CHROMEEC_SKUID
    select EC_GOOGLE_CHROMEEC_LPC
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c
index 51cbc40..dcefb5d 100644
--- a/src/mainboard/google/volteer/mainboard.c
+++ b/src/mainboard/google/volteer/mainboard.c
@@ -17,36 +17,9 @@
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <variant/gpio.h>

-#define SKU_UNKNOWN		0xFFFFFFFF
-#define SKU_MAX			0x7FFFFFFF
-
-static uint32_t get_board_sku(void)
-{
-	static uint32_t sku_id = SKU_UNKNOWN;
-
-	if (sku_id != SKU_UNKNOWN)
-		return sku_id;
-
-	if (google_chromeec_cbi_get_sku_id(&sku_id))
-		sku_id = SKU_UNKNOWN;
-
-	return sku_id;
-}
-
 const char *smbios_system_sku(void)
 {
-	static char sku_str[14]; /* sku{0..2147483647} */
-	uint32_t sku_id = get_board_sku();
-
-	if ((sku_id == SKU_UNKNOWN) || (sku_id > SKU_MAX)) {
-		printk(BIOS_ERR, "%s: Unexpected SKU ID %u\n",
-			__func__, sku_id);
-		return "";
-	}
-
-	snprintf(sku_str, sizeof(sku_str), "sku%u", sku_id);
-
-	return sku_str;
+	return google_chromeec_smbios_system_sku();
 }

static void mainboard_init(struct device *dev)