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 /zephyr/Kconfig.flash | |
| 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 'zephyr/Kconfig.flash')
| -rw-r--r-- | zephyr/Kconfig.flash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zephyr/Kconfig.flash b/zephyr/Kconfig.flash index 74ec9521ed..e79732d928 100644 --- a/zephyr/Kconfig.flash +++ b/zephyr/Kconfig.flash @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -if PLATFORM_EC_FLASH +if PLATFORM_EC_FLASH_CROS config PLATFORM_EC_SPI_FLASH_REGS bool "Enable SPI flash registers" @@ -110,4 +110,4 @@ config PLATFORM_EC_MAPPED_STORAGE If this is not defined, the flash driver must implement flash_physical_read(). -endif # PLATFORM_EC_FLASH +endif # PLATFORM_EC_FLASH_CROS |