diff options
| author | Patryk Duda <pdk@semihalf.com> | 2023-03-23 17:32:09 +0100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-04-06 11:20:16 +0000 |
| commit | 54f60fea2490c4bb56c387f035b175b3ddbc3960 (patch) | |
| tree | 7e580e4fce7a677f7242f9dbf0ad69bf4e303071 | |
| parent | 2ce53eae03d5f52ee48e6165788f0531aa06a70a (diff) | |
| download | chrome-ec-54f60fea2490c4bb56c387f035b175b3ddbc3960.tar.gz | |
rollback: Remove SECTION_IS_RO around get_rollback_erase_size_bytes()
This function is used when CONFIG_ROLLBACK_UPDATE is enabled. There is
no need to prevent from compiling this function in RW.
BUG=b:277029648
BRANCH=none
TEST=make BOARD=bloonchipper
Change-Id: I75acb976dd53f15c9ce6bbdd5a2cc7c5e22da8e5
Signed-off-by: Patryk Duda <pdk@semihalf.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4381921
Commit-Queue: Patryk Duda <patrykd@google.com>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Tested-by: Patryk Duda <patrykd@google.com>
| -rw-r--r-- | common/rollback.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/common/rollback.c b/common/rollback.c index 20dcbe4aa9..4b7d2f7106 100644 --- a/common/rollback.c +++ b/common/rollback.c @@ -45,25 +45,6 @@ static int get_rollback_offset(int region) #endif } -#ifdef SECTION_IS_RO -static int get_rollback_erase_size_bytes(int region) -{ - int erase_size; - -#ifndef CONFIG_FLASH_MULTIPLE_REGION - erase_size = CONFIG_FLASH_ERASE_SIZE; -#else - int rollback_start_bank = crec_flash_bank_index(CONFIG_ROLLBACK_OFF); - - erase_size = crec_flash_bank_erase_size(rollback_start_bank + region); -#endif - ASSERT(erase_size > 0); - ASSERT(ROLLBACK_REGIONS * erase_size <= CONFIG_ROLLBACK_SIZE); - ASSERT(sizeof(struct rollback_data) <= erase_size); - return erase_size; -} -#endif - /* * When MPU is available, read rollback with interrupts disabled, to minimize * time protection is left open. @@ -187,6 +168,22 @@ failed: #endif #ifdef CONFIG_ROLLBACK_UPDATE +static int get_rollback_erase_size_bytes(int region) +{ + int erase_size; + +#ifndef CONFIG_FLASH_MULTIPLE_REGION + erase_size = CONFIG_FLASH_ERASE_SIZE; +#else + int rollback_start_bank = crec_flash_bank_index(CONFIG_ROLLBACK_OFF); + + erase_size = crec_flash_bank_erase_size(rollback_start_bank + region); +#endif + ASSERT(erase_size > 0); + ASSERT(ROLLBACK_REGIONS * erase_size <= CONFIG_ROLLBACK_SIZE); + ASSERT(sizeof(struct rollback_data) <= erase_size); + return erase_size; +} #ifdef CONFIG_ROLLBACK_SECRET_SIZE static int add_entropy(uint8_t *dst, const uint8_t *src, const uint8_t *add, |