diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2020-05-14 20:02:00 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-20 00:12:32 +0000 |
| commit | 70c81db54fff163b7b4bfe2b4a02e2b10e906bed (patch) | |
| tree | 1d52c50765a328046bb8980a849883041992e58a | |
| parent | 8a85d198bc5c4e3384779774a447f2d0bd7a5813 (diff) | |
| download | chrome-ec-70c81db54fff163b7b4bfe2b4a02e2b10e906bed.tar.gz | |
board_id: refactor to expose function checking INFO1 board ID space
This patch makes it possible to check if the INFO1 Board ID space is
programmed or not.
BUG=b:153764696
TEST='make buildall -j'
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Change-Id: Ic771956a08e276c2e1a426729a8ecdae3f86a04f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2204974
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
| -rw-r--r-- | board/cr50/factory_mode.c | 19 | ||||
| -rw-r--r-- | chip/g/board_id.c | 19 | ||||
| -rw-r--r-- | chip/g/board_id.h | 8 |
3 files changed, 27 insertions, 19 deletions
diff --git a/board/cr50/factory_mode.c b/board/cr50/factory_mode.c index 520105c241..dfd5c14175 100644 --- a/board/cr50/factory_mode.c +++ b/board/cr50/factory_mode.c @@ -14,25 +14,6 @@ #define CPRINTF(format, args...) cprintf(CC_CCD, format, ## args) -static int board_id_is_erased(void) -{ - struct board_id id; - /* - * If we can't read the board id for some reason, return 0 just to be - * safe - */ - if (read_board_id(&id) != EC_SUCCESS) { - CPRINTS("%s: BID read error", __func__); - return 0; - } - - if (board_id_is_blank(&id)) { - CPRINTS("BID erased"); - return 1; - } - return 0; -} - static int inactive_image_is_guc_image(void) { enum system_image_copy_t inactive_copy; diff --git a/chip/g/board_id.c b/chip/g/board_id.c index 588676c41e..0eb6efc0b5 100644 --- a/chip/g/board_id.c +++ b/chip/g/board_id.c @@ -40,6 +40,25 @@ int board_id_is_blank(const struct board_id *id) return board_id_type_is_blank(id) && board_id_flags_are_blank(id); } +int board_id_is_erased(void) +{ + struct board_id id; + /* + * If we can't read the board id for some reason, return 0 just to be + * safe + */ + if (read_board_id(&id) != EC_SUCCESS) { + CPRINTS("%s: BID read error", __func__); + return 0; + } + + if (board_id_is_blank(&id)) { + CPRINTS("BID erased"); + return 1; + } + return 0; +} + uint32_t check_board_id_vs_header(const struct board_id *id, const struct SignedHeader *h) { diff --git a/chip/g/board_id.h b/chip/g/board_id.h index 01cb7e5028..fbac4cb357 100644 --- a/chip/g/board_id.h +++ b/chip/g/board_id.h @@ -68,4 +68,12 @@ int board_id_is_blank(const struct board_id *id); * @return True if the board id type and type_inv are 0xffffffff. */ int board_id_type_is_blank(const struct board_id *id); + +/** + * Check if board id space in INFO1 is erased. + * + * @return True if INFO1 board ID space is erased, False otherwise. + */ +int board_id_is_erased(void); + #endif /* ! __EC_CHIP_G_BOARD_ID_H */ |