diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 13:47:09 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:46:45 +0000 |
| commit | 44a22cd708c51a58be4b6c9cdc87b239d9a7ccff (patch) | |
| tree | 9d3505a1cfa9f67c049a2702241db4b4c13b491d /common/flash.c | |
| parent | 16b414e7b7617ca4cb58880b41c410891b8c0c48 (diff) | |
| download | chrome-ec-44a22cd708c51a58be4b6c9cdc87b239d9a7ccff.tar.gz | |
Revert "rollback: Add rollback support for chips with varying flash bank sizes"
This reverts commit bd3ae0748e7dd84c5c0b3fa2387062a4ba4ea3a3.
BUG=b:200823466
TEST=make buildall -j
Change-Id: Id075da3dfe4973458a4de55cabf8c8988c8ba4fa
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273365
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'common/flash.c')
| -rw-r--r-- | common/flash.c | 55 |
1 files changed, 4 insertions, 51 deletions
diff --git a/common/flash.c b/common/flash.c index 00d13d2693..517ad654d2 100644 --- a/common/flash.c +++ b/common/flash.c @@ -113,42 +113,16 @@ const uint32_t pstate_data __attribute__((section(".rodata.pstate"))) = #endif /* CONFIG_FLASH_PSTATE */ #ifdef CONFIG_FLASH_MULTIPLE_REGION -const struct ec_flash_bank *flash_bank_info(int bank) +int flash_bank_size(int bank) { int i; + for (i = 0; i < ARRAY_SIZE(flash_bank_array); i++) { if (bank < flash_bank_array[i].count) - return &flash_bank_array[i]; + return 1 << flash_bank_array[i].size_exp; bank -= flash_bank_array[i].count; } - - return NULL; -} - -int flash_bank_size(int bank) -{ - int rv; - const struct ec_flash_bank *info = flash_bank_info(bank); - - if (!info) - return -1; - - rv = BIT(info->size_exp); - ASSERT(rv > 0); - return rv; -} - -int flash_bank_erase_size(int bank) -{ - int rv; - const struct ec_flash_bank *info = flash_bank_info(bank); - - if (!info) - return -1; - - rv = BIT(info->erase_size_exp); - ASSERT(rv > 0); - return rv; + return -1; } int flash_bank_index(int offset) @@ -184,27 +158,6 @@ int flash_bank_count(int offset, int size) return -1; return end - begin; } - -int flash_bank_start_offset(int bank) -{ - int i; - int offset; - int bank_size; - - if (bank < 0) - return -1; - - offset = 0; - for (i = 0; i < bank; i++) { - bank_size = flash_bank_size(i); - if (bank_size < 0) - return -1; - offset += bank_size; - } - - return offset; -} - #endif /* CONFIG_FLASH_MULTIPLE_REGION */ static int flash_range_ok(int offset, int size_req, int align) |