From 670bd7e258d352a2ea197e055e46b60690935afc Mon Sep 17 00:00:00 2001 From: Tim Lin Date: Fri, 4 Jun 2021 14:11:25 +0800 Subject: 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 Change-Id: If1fd0ea28fa9f5cec1c1daa8f72f63eb7a0e6500 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2931749 Commit-Queue: Keith Short Reviewed-by: Keith Short Reviewed-by: Denis Brockus --- common/usb_pd_policy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'common/usb_pd_policy.c') diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c index f79da52863..3ba2ea0c5c 100644 --- a/common/usb_pd_policy.c +++ b/common/usb_pd_policy.c @@ -917,9 +917,9 @@ int pd_custom_flash_vdm(int port, int cnt, uint32_t *payload) pd_log_event(PD_EVENT_ACC_RW_ERASE, 0, 0, NULL); flash_offset = CONFIG_EC_WRITABLE_STORAGE_OFF + CONFIG_RW_STORAGE_OFF; - flash_physical_erase(CONFIG_EC_WRITABLE_STORAGE_OFF + - CONFIG_RW_STORAGE_OFF, - CONFIG_RW_SIZE); + crec_flash_physical_erase(CONFIG_EC_WRITABLE_STORAGE_OFF + + CONFIG_RW_STORAGE_OFF, + CONFIG_RW_SIZE); rw_flash_changed = 1; break; case VDO_CMD_FLASH_WRITE: @@ -928,7 +928,7 @@ int pd_custom_flash_vdm(int port, int cnt, uint32_t *payload) (flash_offset < CONFIG_EC_WRITABLE_STORAGE_OFF + CONFIG_RW_STORAGE_OFF)) break; - flash_physical_write(flash_offset, 4 * (cnt - 1), + crec_flash_physical_write(flash_offset, 4 * (cnt - 1), (const char *)(payload + 1)); flash_offset += 4 * (cnt - 1); rw_flash_changed = 1; @@ -941,7 +941,7 @@ int pd_custom_flash_vdm(int port, int cnt, uint32_t *payload) /* zeroes the area containing the RSA signature */ for (offset = FW_RW_END - RSANUMBYTES; offset < FW_RW_END; offset += 4) - flash_physical_write(offset, 4, + crec_flash_physical_write(offset, 4, (const char *)&zero); } break; -- cgit v1.2.1