diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-10-18 12:04:50 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-19 12:19:32 -0700 |
| commit | 59dc8df73fa71f3064fd225cf89fed65bf1b25a9 (patch) | |
| tree | d3e63f595125746a9603a4a298514205c72235bb /board/nami | |
| parent | 10a08a5c2d8730861ce48c87d5de8753f10e5324 (diff) | |
| download | chrome-ec-59dc8df73fa71f3064fd225cf89fed65bf1b25a9.tar.gz | |
Nami: Extend SKU from 16 bit to 32 bit
Currently, EC is internally using uint16_t to store SKU_ID.
This patch extends it to 32 bit to support additional hardware features.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=b:112876867,b:117126568
BRANCH=none
TEST=Boot Sona
Change-Id: Ibd2b7b714222e6fa4bf22604437c8c4d2ba5ee7d
Reviewed-on: https://chromium-review.googlesource.com/1289310
Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'board/nami')
| -rw-r--r-- | board/nami/board.c | 6 | ||||
| -rw-r--r-- | board/nami/board.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/board/nami/board.c b/board/nami/board.c index 75bfa139ec..ff8d804496 100644 --- a/board/nami/board.c +++ b/board/nami/board.c @@ -69,7 +69,7 @@ uint16_t board_version; uint8_t oem = PROJECT_NAMI; -uint16_t sku; +uint32_t sku; static void tcpc_alert_event(enum gpio_signal signal) { @@ -892,9 +892,9 @@ static void cbi_init(void) oem = val; CPRINTS("OEM: %d", oem); - if (cbi_get_sku_id(&val) == EC_SUCCESS && val <= UINT16_MAX) + if (cbi_get_sku_id(&val) == EC_SUCCESS) sku = val; - CPRINTS("SKU: 0x%04x", sku); + CPRINTS("SKU: 0x%08x", sku); if (board_version < 0x300) /* Previous boards have GPIO42 connected to TP_INT_CONN */ diff --git a/board/nami/board.h b/board/nami/board.h index 54603d8f5b..939a42900d 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -314,7 +314,7 @@ void board_set_tcpc_power_mode(int port, int mode); /* These should be referenced only after HOOK_INIT:HOOK_PRIO_INIT_I2C+1. */ extern uint16_t board_version; extern uint8_t oem; -extern uint16_t sku; +extern uint32_t sku; #endif /* !__ASSEMBLER__ */ |