diff options
| author | Eric Yilun Lin <yllin@chromium.org> | 2021-04-09 15:55:35 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-23 21:41:36 +0000 |
| commit | 4e074a16c5703f0cdd7b7d780a8ae1bea53a445a (patch) | |
| tree | ee55f33d67210001d31d852ba380a27778cbe379 /include | |
| parent | d1156aae265e671c6779026ce52716f42847f9f9 (diff) | |
| download | chrome-ec-4e074a16c5703f0cdd7b7d780a8ae1bea53a445a.tar.gz | |
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 <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2816622
Tested-by: Eric Yilun Lin <yllin@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/config.h b/include/config.h index 3de3ab11f0..afa6b777f6 100644 --- a/include/config.h +++ b/include/config.h @@ -1784,7 +1784,7 @@ /* Flash configuration */ /* This enables console commands and higher-level features */ -#define CONFIG_FLASH +#define CONFIG_FLASH_CROS /* This enables chip-specific access functions */ #define CONFIG_FLASH_PHYSICAL #undef CONFIG_FLASH_BANK_SIZE @@ -5940,8 +5940,8 @@ */ #ifdef CONFIG_CHIP_INIT_ROM_REGION -#ifndef CONFIG_FLASH -#error CONFIG_CHIP_INIT_ROM_REGION requires CONFIG_FLASH +#ifndef CONFIG_FLASH_CROS +#error CONFIG_CHIP_INIT_ROM_REGION requires CONFIG_FLASH_CROS #endif #ifndef CONFIG_RO_ROM_RESIDENT_SIZE |