diff options
| author | Jeremy Bettis <jbettis@google.com> | 2021-04-27 13:40:37 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-27 22:12:03 +0000 |
| commit | fc1832097b9bbe40eb128828876803993a331ecb (patch) | |
| tree | 267f6dea59195a54ad45518dcd09fd6d7d2c5e33 /common | |
| parent | 99feee9047810e75c7beffa962d88956735f8654 (diff) | |
| download | chrome-ec-fc1832097b9bbe40eb128828876803993a331ecb.tar.gz | |
config: rename CONFIG_FLASH to CONFIG_FLASH_CROS
This reverts commit 4ac1d81e1430dbfbfba1376a23ab19dfa845d7ef.
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=chromium:1202406,b:180980668
TEST=make -j16 runhosttests buildall && zmake testall && \
/mnt/host/source/src/platform/ec/zephyr/firmware_builder.py --metrics \
/tmp/tmplt8ty8ci test ; echo $?
BRANCH=none
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I5b5e58b30d936b5232e049827f458d9a2ed06340
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2855320
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Auto-Submit: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/build.mk | 2 | ||||
| -rw-r--r-- | common/ec_features.c | 2 | ||||
| -rw-r--r-- | common/system.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/common/build.mk b/common/build.mk index a52f465c94..9df9cd24bd 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 diff --git a/common/ec_features.c b/common/ec_features.c index 9655e17fe6..a7e097e733 100644 --- a/common/ec_features.c +++ b/common/ec_features.c @@ -17,7 +17,7 @@ uint32_t get_feature_flags0(void) #ifdef CONFIG_FW_LIMITED_IMAGE | EC_FEATURE_MASK_0(EC_FEATURE_LIMITED) #endif -#ifdef CONFIG_FLASH +#ifdef CONFIG_FLASH_CROS | EC_FEATURE_MASK_0(EC_FEATURE_FLASH) #endif #ifdef CONFIG_FANS diff --git a/common/system.c b/common/system.c index 2085cad731..0e4f9848d9 100644 --- a/common/system.c +++ b/common/system.c @@ -176,7 +176,7 @@ int system_is_locked(void) is_locked = 0; return 0; -#elif defined(CONFIG_FLASH) +#elif defined(CONFIG_FLASH_CROS) /* * Unlocked if write protect pin deasserted or read-only firmware * is not protected. |