diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2020-06-17 11:54:35 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-22 20:07:49 +0000 |
| commit | 66bf0868e8bd55ba9e0d04671d164cfa1072173b (patch) | |
| tree | a03b6e0c097396110e0841d1e9d6188d6b227b3d | |
| parent | 0c649ba01ab555e84ab030b7f1a38c48b294bbe2 (diff) | |
| download | chrome-ec-66bf0868e8bd55ba9e0d04671d164cfa1072173b.tar.gz | |
cr50: do not trigger unnecessary legacy NVMEM partition checks
The logic of deciding if the alternative RW image is newer than a
certain version needs to be updated to accommodate moving to higher
prod and prepvt major version numbers.
BUG=none
TEST=the 'nvmem_find_partition: No Legacy Partitions found.' message
is not printed during startup any more when updating from 6.3 to
6.4.
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Change-Id: I59e18712b3365446c29f569bf0b50f95ab67df95
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2250658
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
| -rw-r--r-- | board/cr50/board.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/cr50/board.c b/board/cr50/board.c index 5e22322aae..180d33af9d 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -1853,7 +1853,7 @@ int board_nvmem_legacy_check_needed(void) h = (const struct SignedHeader *)get_program_memory_addr(other_rw); - return (h->major_ <= 2) || (h->minor_ <= 18); + return (h->major_ <= 2) || ((h->major_ <= 4) && (h->minor_ <= 18)); } /* |