Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39036 )
Change subject: mainboard/google/dedede: Migrate onto SKU ID helpers ......................................................................
mainboard/google/dedede: Migrate onto SKU ID helpers
Leverage the common sku id space helper encoders. dedede uses the non-legacy SKU ID space.
BUG=b:149348474 BRANCH=none TEST=tested on hatch
Change-Id: I0c21a748fddef0985022cb4e77a8db95d6692f4b Signed-off-by: Edward O'Callaghan quasisec@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/board_info.c 2 files changed, 7 insertions(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/39036/1
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 5254d16..6a511ba 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -7,6 +7,7 @@ select HAVE_ACPI_TABLES select MAINBOARD_HAS_CHROMEOS select SOC_INTEL_JASPERLAKE + select EC_GOOGLE_CHROMEEC_SKU_ID_MAX
if BOARD_GOOGLE_BASEBOARD_DEDEDE
diff --git a/src/mainboard/google/dedede/board_info.c b/src/mainboard/google/dedede/board_info.c index ee89beb..f9ed44d 100644 --- a/src/mainboard/google/dedede/board_info.c +++ b/src/mainboard/google/dedede/board_info.c @@ -12,37 +12,9 @@ #include <smbios.h> #include <string.h>
-#define SKU_UNKNOWN 0xffffffff -#define SKU_MAX 0x7fffffff - -static uint32_t board_info_get_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) { - /* sku{0..2147483647} */ - static char sku_str[14]; - uint32_t sku_id = board_info_get_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(); }
const char *smbios_mainboard_manufacturer(void) @@ -66,7 +38,11 @@
int board_info_get_fw_config(uint32_t *fw_config) { - uint32_t sku_id = board_info_get_sku(); + uint32_t sku_id = google_chromeec_get_board_sku(); + + /* FIXME: Move get_fw_config() in with rest of sku id helpers */ +#define SKU_UNKNOWN 0xffffffff +#define SKU_MAX 0x7fffffff
/* * FW_CONFIG can potentially have all the bits set. So check the