From 4e074a16c5703f0cdd7b7d780a8ae1bea53a445a Mon Sep 17 00:00:00 2001 From: Eric Yilun Lin Date: Fri, 9 Apr 2021 15:55:35 +0800 Subject: config: rename CONFIG_FLASH to CONFIG_FLASH_CROS The config name collides with the same config name in zephyr. Also, renames zephyr Kconfig CONFIG_PLATFORM_EC_FLASH to CONFIG_PLATFORM_EC_FLASH_CROS as the corresponding change at Kconfig side. BUG=b:180980668 TEST=make buildall BRANCH=none Change-Id: Ibac008ddff8c041aae04dca0bbf973823abe7640 Signed-off-by: Eric Yilun Lin Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2816622 Tested-by: Eric Yilun Lin Reviewed-by: Keith Short Commit-Queue: Keith Short --- board/arcada_ish/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/arcada_ish') diff --git a/board/arcada_ish/board.h b/board/arcada_ish/board.h index 13c62c6195..ce735bd268 100644 --- a/board/arcada_ish/board.h +++ b/board/arcada_ish/board.h @@ -82,7 +82,7 @@ #undef CONFIG_CMD_SHMEM #undef CONFIG_EXTPOWER #undef CONFIG_KEYBOARD_KSO_BASE -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FMAP #undef CONFIG_SWITCH -- cgit v1.2.1