diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-10-18 17:47:48 -0500 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-21 20:22:42 +0000 |
| commit | 4eb67c6f94af3beba1adc1bd02ca49e71eef1195 (patch) | |
| tree | 64c143cea3abdde045db549317d4529b833f67e3 | |
| parent | 2b948afb28d0674eebb4dc0ece088fbf95f6a142 (diff) | |
| download | chrome-ec-4eb67c6f94af3beba1adc1bd02ca49e71eef1195.tar.gz | |
factory_mode: add 0.3.22 to guc versions
Cr50 is getting new CCD capabilities. The GUC image won't have them.
This change adds 0.3.22 to the versions, so cr50 will set all
capabilities including the new ones to Always after the first update in
the factory.
BUG=none
TEST=cr50 prints the GUC message if 0.0.22, 0.0.13, or 0.3.22 are in the
inactive region. It doesn't with 0.5.51
Change-Id: Idc8d7b8a0687d36f59aaad31cd5ce026ab351a7d
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3237199
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | board/cr50/factory_mode.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/board/cr50/factory_mode.c b/board/cr50/factory_mode.c index dfd5c14175..a68a253da2 100644 --- a/board/cr50/factory_mode.c +++ b/board/cr50/factory_mode.c @@ -26,18 +26,18 @@ static int inactive_image_is_guc_image(void) 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. + * Chips from GUC are manufactured with 0.0.13, 0.0.22, or 0.3.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))) { + if (other->epoch_) + return 0; + if ((other->major_ == 0 && other->minor_ == 13) || + (other->major_ == 0 && other->minor_ == 22) || + (other->major_ == 3 && other->minor_ == 22)) { CPRINTS("GUC in inactive RW"); return 1; } - /* - * TODO(mruthven): Return true if factory image field of header is - * set - */ return 0; } |