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/init_rom.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/init_rom.c')
| -rw-r--r-- | common/init_rom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/init_rom.c b/common/init_rom.c index fd796f7fe9..320849c008 100644 --- a/common/init_rom.c +++ b/common/init_rom.c @@ -43,11 +43,11 @@ const void *init_rom_map(const void *addr, int size) /* * Convert flash offset to memory mapped address */ - if (flash_dataptr((int)offset, size, 1, &src) < 0) + if (crec_flash_dataptr((int)offset, size, 1, &src) < 0) return NULL; /* Once the flash offset is validated, lock the flash for the caller */ - flash_lock_mapped_storage(1); + crec_flash_lock_mapped_storage(1); return src; } @@ -59,11 +59,11 @@ const void *init_rom_map(const void *addr, int size) void init_rom_unmap(const void *addr, int size) { if (IS_ENABLED(CONFIG_CHIP_INIT_ROM_REGION)) - flash_lock_mapped_storage(0); + crec_flash_lock_mapped_storage(0); } int init_rom_copy(int offset, int size, char *data) { - return flash_read(offset, size, data); + return crec_flash_read(offset, size, data); } |