summaryrefslogtreecommitdiff
path: root/chip/ish
diff options
context:
space:
mode:
authorTim Lin <tim2.lin@ite.corp-partner.google.com>2021-06-04 14:11:25 +0800
committerCommit Bot <commit-bot@chromium.org>2021-06-09 18:54:47 +0000
commit670bd7e258d352a2ea197e055e46b60690935afc (patch)
tree9a223dbbdde5e822f63475fdb0a39c0dc1300112 /chip/ish
parent3bf7cf9dfe738f1f156d6b9dc5ade87290d1d78e (diff)
downloadchrome-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 'chip/ish')
-rw-r--r--chip/ish/flash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/chip/ish/flash.c b/chip/ish/flash.c
index 8ef4d1a73c..2a1b9c0793 100644
--- a/chip/ish/flash.c
+++ b/chip/ish/flash.c
@@ -12,7 +12,7 @@
*
* Applies at-boot protection settings if necessary.
*/
-int flash_pre_init(void)
+int crec_flash_pre_init(void)
{
return EC_SUCCESS;
}