summaryrefslogtreecommitdiff
path: root/src/ec
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2020-04-09 22:23:39 -0600
committerAaron Durbin <adurbin@chromium.org>2020-04-11 14:26:47 +0000
commit32107dffb7013095f45f363fddcf8a3215790199 (patch)
tree72ffe38e6f3cae3f39f3e69b94d45ff4d2904fcd /src/ec
parent2a203c50efb68e4ddb1bb657ca9ba3f4d0f6d735 (diff)
ec/google/chromeec: expose failure and unprovisioned SKU id values
Provide CROS_SKU_UNKNOWN and CROS_SKU_UNPROVISIONED defintion so callers can utilize the default and failing value without open coding it. BUG=b:153642124 Change-Id: I447004e9016b6ab3306ea532721494ebbcda741d Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40299 Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/ec')
-rw-r--r--src/ec/google/chromeec/ec.h3
-rw-r--r--src/ec/google/chromeec/ec_skuid.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ec/google/chromeec/ec.h b/src/ec/google/chromeec/ec.h
index f1caeb09fa..77ba21169e 100644
--- a/src/ec/google/chromeec/ec.h
+++ b/src/ec/google/chromeec/ec.h
@@ -79,6 +79,9 @@ int google_chromeec_cbi_get_fw_config(uint32_t *fw_config);
int google_chromeec_cbi_get_dram_part_num(char *buf, size_t bufsize);
int google_chromeec_cbi_get_oem_name(char *buf, size_t bufsize);
+#define CROS_SKU_UNKNOWN 0xFFFFFFFF
+#define CROS_SKU_UNPROVISIONED 0x7FFFFFFF
+/* Returns CROS_SKU_UNKNOWN on failure. */
uint32_t google_chromeec_get_board_sku(void);
const char *google_chromeec_smbios_system_sku(void);
diff --git a/src/ec/google/chromeec/ec_skuid.c b/src/ec/google/chromeec/ec_skuid.c
index 665d425fac..51229758e6 100644
--- a/src/ec/google/chromeec/ec_skuid.c
+++ b/src/ec/google/chromeec/ec_skuid.c
@@ -12,17 +12,15 @@
#include <string.h>
#include <smbios.h>
-#define SKU_UNKNOWN 0xFFFFFFFF
-
uint32_t google_chromeec_get_board_sku(void)
{
- MAYBE_STATIC_NONZERO uint32_t sku_id = SKU_UNKNOWN;
+ MAYBE_STATIC_NONZERO uint32_t sku_id = CROS_SKU_UNKNOWN;
- if (sku_id != SKU_UNKNOWN)
+ if (sku_id != CROS_SKU_UNKNOWN)
return sku_id;
if (google_chromeec_cbi_get_sku_id(&sku_id))
- sku_id = SKU_UNKNOWN;
+ sku_id = CROS_SKU_UNKNOWN;
return sku_id;
}