diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 19:50:39 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:53:04 +0000 |
| commit | 4076cecbaf563e010610a20b9fe2870754996f03 (patch) | |
| tree | 15536e4cbf8ccf9b2ac2bfc4c0f676d5ef2b2296 /common/system.c | |
| parent | b69596420685c5038e7df15732ac402e5d21839a (diff) | |
| download | chrome-ec-4076cecbaf563e010610a20b9fe2870754996f03.tar.gz | |
Revert "Treat SYSTEM_IMAGE_RW_B also as RW copy"
This reverts commit 5da63f4ea2c93e6b059d8c50ff01dbe53a13dec2.
BUG=b:200823466
TEST=make buildall -j
Change-Id: Id035f3e4a107c00407c16cc878bd88da63f9de7f
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273451
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'common/system.c')
| -rw-r--r-- | common/system.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/common/system.c b/common/system.c index 6016bfaef9..1d4586a8ce 100644 --- a/common/system.c +++ b/common/system.c @@ -467,16 +467,6 @@ static void jump_to_image(uintptr_t init_addr) resetvec(); } -static int is_rw_image(enum system_image_copy_t copy) -{ - return copy == SYSTEM_IMAGE_RW || copy == SYSTEM_IMAGE_RW_B; -} - -int system_is_in_rw(void) -{ - return is_rw_image(system_get_image_copy()); -} - test_mockable int system_run_image_copy(enum system_image_copy_t copy) { uintptr_t base; @@ -495,7 +485,7 @@ test_mockable int system_run_image_copy(enum system_image_copy_t copy) return EC_ERROR_ACCESS_DENIED; /* Target image must be RW image */ - if (!is_rw_image(copy)) + if (copy != SYSTEM_IMAGE_RW) return EC_ERROR_ACCESS_DENIED; /* Jumping must still be enabled */ @@ -568,7 +558,7 @@ static const struct image_data *system_get_image_data( * Read the version information from the proper location * on storage. */ - addr += (is_rw_image(copy)) ? + addr += (copy == SYSTEM_IMAGE_RW) ? CONFIG_EC_WRITABLE_STORAGE_OFF + CONFIG_RW_STORAGE_OFF : CONFIG_EC_PROTECTED_STORAGE_OFF + CONFIG_RO_STORAGE_OFF; |