diff options
| author | Tim Lin <tim2.lin@ite.corp-partner.google.com> | 2021-06-04 14:11:25 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-09 18:54:47 +0000 |
| commit | 670bd7e258d352a2ea197e055e46b60690935afc (patch) | |
| tree | 9a223dbbdde5e822f63475fdb0a39c0dc1300112 /common/vboot_hash.c | |
| parent | 3bf7cf9dfe738f1f156d6b9dc5ade87290d1d78e (diff) | |
| download | chrome-ec-670bd7e258d352a2ea197e055e46b60690935afc.tar.gz | |
include/flash: rename the APIs
The names conflict when enabling both Zephyr's flash driver and
CONFIG_FLASH_CROS option. Rename all the APIs in include/flash.h
BUG=b:187192628
BRANCH=none
TEST=make buildall -j4
Signed-off-by: Tim Lin <tim2.lin@ite.corp-partner.google.com>
Change-Id: If1fd0ea28fa9f5cec1c1daa8f72f63eb7a0e6500
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2931749
Commit-Queue: Keith Short <keithshort@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'common/vboot_hash.c')
| -rw-r--r-- | common/vboot_hash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/vboot_hash.c b/common/vboot_hash.c index 04e3ae5f7f..ea32bbe680 100644 --- a/common/vboot_hash.c +++ b/common/vboot_hash.c @@ -94,7 +94,7 @@ static int read_and_hash_chunk(int offset, int size) return rv; } - rv = flash_read(offset, size, buf); + rv = crec_flash_read(offset, size, buf); if (rv == EC_SUCCESS) SHA256_update(&ctx, (const uint8_t *)buf, size); else @@ -115,10 +115,10 @@ static int read_and_hash_chunk(int offset, int size) static void hash_next_chunk(size_t size) { #ifdef CONFIG_MAPPED_STORAGE - flash_lock_mapped_storage(1); + crec_flash_lock_mapped_storage(1); SHA256_update(&ctx, (const uint8_t *)(CONFIG_MAPPED_STORAGE_BASE + data_offset + curr_pos), size); - flash_lock_mapped_storage(0); + crec_flash_lock_mapped_storage(0); #else if (read_and_hash_chunk(data_offset + curr_pos, size) != EC_SUCCESS) return; |