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 --- test/flash_write_protect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/flash_write_protect.c') diff --git a/test/flash_write_protect.c b/test/flash_write_protect.c index 2b69484e93..2bf801c9b0 100644 --- a/test/flash_write_protect.c +++ b/test/flash_write_protect.c @@ -42,8 +42,8 @@ test_static int test_flash_write_protect_enable(void) TEST_EQ(check_image_and_hardware_write_protect(), EC_SUCCESS, "%d"); /* Equivalent of ectool --name=cros_fp flashprotect enable */ - rv = flash_set_protect(EC_FLASH_PROTECT_RO_AT_BOOT, - EC_FLASH_PROTECT_RO_AT_BOOT); + rv = crec_flash_set_protect(EC_FLASH_PROTECT_RO_AT_BOOT, + EC_FLASH_PROTECT_RO_AT_BOOT); return rv; } @@ -55,7 +55,7 @@ test_static int test_flash_write_protect_disable(void) TEST_EQ(check_image_and_hardware_write_protect(), EC_SUCCESS, "%d"); /* Equivalent of ectool --name=cros_fp flashprotect disable */ - rv = flash_set_protect(EC_FLASH_PROTECT_RO_AT_BOOT, 0); + rv = crec_flash_set_protect(EC_FLASH_PROTECT_RO_AT_BOOT, 0); TEST_NE(rv, EC_SUCCESS, "%d"); return EC_SUCCESS; -- cgit v1.2.1