diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2019-10-03 13:49:00 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-04 20:56:39 +0000 |
| commit | 596cb02d8d2921276e20df826560af46089968d7 (patch) | |
| tree | 7b4cd419777148b3dea5bbbc2e89b8e8588a5178 | |
| parent | ab8226590009cea576fc9febd667d4729298db28 (diff) | |
| download | chrome-ec-596cb02d8d2921276e20df826560af46089968d7.tar.gz | |
cr50: enable CCD factory mode during chip factory process
It would be beneficial if chips were arriving from GUC in CCD factory
mode, there is no need to check the inactive RW image version and keep
track of changing version numbers.
BRANCH=none
BUG=b:126202052
TEST=deferred to chip factory process verification testing.
Change-Id: I5a321898ce1f8507c030b2e4d6ade093974fb4b7
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1838872
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
| -rw-r--r-- | board/cr50/factory_mode.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/board/cr50/factory_mode.c b/board/cr50/factory_mode.c index a645fd5aed..63b49cb59d 100644 --- a/board/cr50/factory_mode.c +++ b/board/cr50/factory_mode.c @@ -32,33 +32,6 @@ static int board_id_is_erased(void) return 0; } -static int inactive_image_is_guc_image(void) -{ - enum system_image_copy_t inactive_copy; - const struct SignedHeader *other; - - if (system_get_image_copy() == SYSTEM_IMAGE_RW) - inactive_copy = SYSTEM_IMAGE_RW_B; - else - inactive_copy = SYSTEM_IMAGE_RW; - other = (struct SignedHeader *) get_program_memory_addr( - inactive_copy); - /* - * Chips from GUC are manufactured with 0.0.13 or 0.0.22. Compare the - * versions to determine if the inactive image is a GUC image. - */ - if (other->epoch_ == 0 && other->major_ == 0 && - ((other->minor_ == 13) || (other->minor_ == 22))) { - CPRINTS("GUC in inactive RW"); - return 1; - } - /* - * TODO(mruthven): Return true if factory image field of header is - * set - */ - return 0; -} - /** * Return non-zero if this is the first boot of a board in the factory. * @@ -74,7 +47,7 @@ static int inactive_image_is_guc_image(void) int board_is_first_factory_boot(void) { return (!(system_get_reset_flags() & RESET_FLAG_HIBERNATE) && - inactive_image_is_guc_image() && board_id_is_erased()); + chip_factory_mode() && board_id_is_erased()); } /* |