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 /board/zinger | |
| 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 'board/zinger')
| -rw-r--r-- | board/zinger/hardware.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/zinger/hardware.c b/board/zinger/hardware.c index 7e1f29da38..2aceb801e4 100644 --- a/board/zinger/hardware.c +++ b/board/zinger/hardware.c @@ -302,7 +302,7 @@ int adc_disable_watchdog(void) #define CR_LOCK BIT(7) #define OPTWRE BIT(9) -int flash_physical_write(int offset, int size, const char *data) +int crec_flash_physical_write(int offset, int size, const char *data) { uint16_t *address = (uint16_t *)(CONFIG_PROGRAM_MEMORY_BASE + offset); int res = EC_SUCCESS; @@ -354,7 +354,7 @@ exit_wr: return res; } -int flash_physical_erase(int offset, int size) +int crec_flash_physical_erase(int offset, int size) { int res = EC_SUCCESS; |