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 --- chip/mt8192_scp/config_chip.h | 2 +- chip/mt_scp/config_chip.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'chip') diff --git a/chip/mt8192_scp/config_chip.h b/chip/mt8192_scp/config_chip.h index 7b428d6a09..ac53d51732 100644 --- a/chip/mt8192_scp/config_chip.h +++ b/chip/mt8192_scp/config_chip.h @@ -29,7 +29,7 @@ /* Unsupported features/commands */ #undef CONFIG_CMD_FLASHINFO #undef CONFIG_CMD_POWER_AP -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FLASH_PHYSICAL #undef CONFIG_FMAP #undef CONFIG_HIBERNATE diff --git a/chip/mt_scp/config_chip.h b/chip/mt_scp/config_chip.h index 89311cda38..e0710a908b 100644 --- a/chip/mt_scp/config_chip.h +++ b/chip/mt_scp/config_chip.h @@ -43,7 +43,7 @@ /* Unsupported features/commands */ #undef CONFIG_CMD_FLASHINFO #undef CONFIG_CMD_POWER_AP -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FLASH_PHYSICAL #undef CONFIG_FMAP #undef CONFIG_HIBERNATE -- cgit v1.2.1