diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2020-06-17 11:54:35 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-11 23:38:53 +0000 |
| commit | 0f5de0fe8c7adfa4d09912500062bf5a0f0dc24a (patch) | |
| tree | 54fbe64e5faabf5586064745fa93e1ac4fed1df3 | |
| parent | 05ded4288d733a36335ecc5bdef7e6bc4a093fe8 (diff) | |
| download | chrome-ec-0f5de0fe8c7adfa4d09912500062bf5a0f0dc24a.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>
(cherry picked from commit 66bf0868e8bd55ba9e0d04671d164cfa1072173b)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2311237
Tested-by: Mary Ruthven <mruthven@chromium.org>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
(cherry picked from commit 40c028b97f42c31b0f1b560387954fe3ecce6143)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2350285
| -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 ac85109539..112c7f7a24 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)); } /* |