summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2019-05-16 15:51:23 -0700
committerYH Lin <yueherngl@chromium.org>2019-05-22 18:37:03 +0000
commitd2238b3abaad36fde8cc0852a149e1aebb9f6edd (patch)
treeb6310e14cad41f677442fb89aecc6212d3efd230
parent8299be183a457a4c0b008a9b574a810ada3f0816 (diff)
downloadchrome-ec-d2238b3abaad36fde8cc0852a149e1aebb9f6edd.tar.gz
Flapjack: Export board_version, oem, sku
This patch export board_version, oem, sku so that they can be used in other files. It also changes the board_version size to uint8_t. Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> BUG=none BRANCH=none TEST=Verify CBI info is printed expectedly. Change-Id: Iadc82ce86d19fc4c0bc6eaceb64433b4e25d5dcf Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1625093 Reviewed-by: YH Lin <yueherngl@chromium.org> Commit-Queue: YH Lin <yueherngl@chromium.org> Tested-by: YH Lin <yueherngl@chromium.org>
-rw-r--r--board/flapjack/board.c6
-rw-r--r--board/flapjack/board.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/board/flapjack/board.c b/board/flapjack/board.c
index b80530c41c..4df9c6b557 100644
--- a/board/flapjack/board.c
+++ b/board/flapjack/board.c
@@ -65,7 +65,7 @@ static const struct mv_to_id panels[] = {
BUILD_ASSERT(ARRAY_SIZE(panels) < PANEL_COUNT);
BUILD_ASSERT(PANEL_COUNT <= PANEL_UNINITIALIZED);
-uint16_t board_version;
+uint8_t board_version;
uint8_t oem;
uint32_t sku = LCM_ID_TO_SKU_ID(PANEL_UNINITIALIZED);
@@ -174,9 +174,9 @@ static void cbi_init(void)
{
uint32_t val;
- if (cbi_get_board_version(&val) == EC_SUCCESS && val <= UINT16_MAX)
+ if (cbi_get_board_version(&val) == EC_SUCCESS && val <= UINT8_MAX)
board_version = val;
- CPRINTS("Board Version: 0x%04x", board_version);
+ CPRINTS("Board Version: 0x%02x", board_version);
if (cbi_get_oem_id(&val) == EC_SUCCESS && val <= PROJECT_COUNT)
oem = val;
diff --git a/board/flapjack/board.h b/board/flapjack/board.h
index 97b633aa79..0acc23fd14 100644
--- a/board/flapjack/board.h
+++ b/board/flapjack/board.h
@@ -325,6 +325,10 @@ struct mv_to_id {
int board_read_id(enum adc_channel, const struct mv_to_id *table, int size);
+extern uint8_t board_version;
+extern uint8_t oem;
+extern uint32_t sku;
+
#endif /* !__ASSEMBLER__ */
#endif /* __CROS_EC_BOARD_H */