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 --- common/build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/build.mk') diff --git a/common/build.mk b/common/build.mk index 3ca7a0fa56..32585de11f 100644 --- a/common/build.mk +++ b/common/build.mk @@ -78,7 +78,7 @@ common-$(CONFIG_HOSTCMD_ESPI)+=espi.o common-$(CONFIG_EXTPOWER_GPIO)+=extpower_gpio.o common-$(CONFIG_EXTPOWER)+=extpower_common.o common-$(CONFIG_FANS)+=fan.o pwm.o -common-$(CONFIG_FLASH)+=flash.o +common-$(CONFIG_FLASH_CROS)+=flash.o common-$(CONFIG_FMAP)+=fmap.o common-$(CONFIG_GESTURE_SW_DETECTION)+=gesture.o common-$(CONFIG_HOSTCMD_EVENTS)+=host_event_commands.o -- cgit v1.2.1