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 /board | |
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 'board')
-rw-r--r-- | board/arcada_ish/board.h | 2 | ||||
-rw-r--r-- | board/atlas_ish/board.h | 2 | ||||
-rw-r--r-- | board/drallion_ish/board.h | 2 | ||||
-rw-r--r-- | board/hadoken/board.h | 2 | ||||
-rw-r--r-- | board/stm32f446e-eval/board.h | 2 | ||||
-rw-r--r-- | board/stm32l476g-eval/board.h | 2 | ||||
-rw-r--r-- | board/tglrvp_ish/board.h | 2 | ||||
-rw-r--r-- | board/volteer_ish/board.h | 2 | ||||
-rw-r--r-- | board/zinger/board.h | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/board/arcada_ish/board.h b/board/arcada_ish/board.h index 13c62c6195..ce735bd268 100644 --- a/board/arcada_ish/board.h +++ b/board/arcada_ish/board.h @@ -82,7 +82,7 @@ #undef CONFIG_CMD_SHMEM #undef CONFIG_EXTPOWER #undef CONFIG_KEYBOARD_KSO_BASE -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FMAP #undef CONFIG_SWITCH diff --git a/board/atlas_ish/board.h b/board/atlas_ish/board.h index 5e75cbe7c0..c9ee52395d 100644 --- a/board/atlas_ish/board.h +++ b/board/atlas_ish/board.h @@ -49,7 +49,7 @@ #undef CONFIG_CMD_TIMERINFO #undef CONFIG_EXTPOWER #undef CONFIG_KEYBOARD_KSO_BASE -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FMAP #undef CONFIG_LID_SWITCH #undef CONFIG_SWITCH diff --git a/board/drallion_ish/board.h b/board/drallion_ish/board.h index 483af9be22..dab93426a6 100644 --- a/board/drallion_ish/board.h +++ b/board/drallion_ish/board.h @@ -74,7 +74,7 @@ /* Undefined features */ #undef CONFIG_EXTPOWER #undef CONFIG_KEYBOARD_KSO_BASE -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FMAP #undef CONFIG_SWITCH diff --git a/board/hadoken/board.h b/board/hadoken/board.h index e8d71b7ee8..ef4b45640d 100644 --- a/board/hadoken/board.h +++ b/board/hadoken/board.h @@ -10,7 +10,7 @@ #ifndef __ASSEMBLER__ -#undef CONFIG_FLASH /* TODO: implement me */ +#undef CONFIG_FLASH_CROS /* TODO: implement me */ #undef CONFIG_FLASH_PHYSICAL /* TODO: implement me */ #undef CONFIG_FMAP /* TODO: implement me */ #undef CONFIG_WATCHDOG diff --git a/board/stm32f446e-eval/board.h b/board/stm32f446e-eval/board.h index 656d372766..aa498d6caa 100644 --- a/board/stm32f446e-eval/board.h +++ b/board/stm32f446e-eval/board.h @@ -58,7 +58,7 @@ /* Optional features */ #define CONFIG_STM_HWTIMER32 #define CONFIG_DMA_HELP -#define CONFIG_FLASH +#define CONFIG_FLASH_CROS /* * Allow dangerous commands all the time, since we don't have a write protect diff --git a/board/stm32l476g-eval/board.h b/board/stm32l476g-eval/board.h index 3124779fd7..e8ce99845f 100644 --- a/board/stm32l476g-eval/board.h +++ b/board/stm32l476g-eval/board.h @@ -50,7 +50,7 @@ #ifndef __ASSEMBLER__ -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FLASH_PHYSICAL /* Timer selection */ diff --git a/board/tglrvp_ish/board.h b/board/tglrvp_ish/board.h index 7ab88641ea..03044a5bb8 100644 --- a/board/tglrvp_ish/board.h +++ b/board/tglrvp_ish/board.h @@ -55,7 +55,7 @@ #undef CONFIG_CMD_SHMEM #undef CONFIG_EXTPOWER #undef CONFIG_KEYBOARD_KSO_BASE -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FMAP #undef CONFIG_LID_SWITCH #undef CONFIG_SWITCH diff --git a/board/volteer_ish/board.h b/board/volteer_ish/board.h index 6cc4057702..097ee25750 100644 --- a/board/volteer_ish/board.h +++ b/board/volteer_ish/board.h @@ -70,7 +70,7 @@ #undef CONFIG_CMD_SHMEM #undef CONFIG_EXTPOWER #undef CONFIG_KEYBOARD_KSO_BASE -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FMAP #undef CONFIG_LID_SWITCH #undef CONFIG_SWITCH diff --git a/board/zinger/board.h b/board/zinger/board.h index c8992816eb..82fb29f29e 100644 --- a/board/zinger/board.h +++ b/board/zinger/board.h @@ -37,7 +37,7 @@ #undef CONFIG_DEBUG_ASSERT #undef CONFIG_DEBUG_EXCEPTIONS #undef CONFIG_DEBUG_STACK_OVERFLOW -#undef CONFIG_FLASH +#undef CONFIG_FLASH_CROS #undef CONFIG_FLASH_PHYSICAL #undef CONFIG_FMAP /* Not using pstate but keep some space for the public key */ |