diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-04-24 15:29:41 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-24 19:34:04 +0000 |
| commit | 4ac1d81e1430dbfbfba1376a23ab19dfa845d7ef (patch) | |
| tree | 1c4ed92d40e0c4e93c1253d79e11f574d7ee1e7d /include/config.h | |
| parent | f0be771092e47854664c6028c56d1499ca412f8a (diff) | |
| download | chrome-ec-4ac1d81e1430dbfbfba1376a23ab19dfa845d7ef.tar.gz | |
Revert "config: rename CONFIG_FLASH to CONFIG_FLASH_CROS"stabilize-13935.B-main
This reverts commit 4e074a16c5703f0cdd7b7d780a8ae1bea53a445a.
Reason for revert: responsible for CQ failures (crbug.com/1202406)
BUG=chromium:1202406
BRANCH=none
TEST=CQ
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Original change's description:
> 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>
Bug: b:180980668
Change-Id: Idc5e799d3b0ea8cc76dbbb49a91b3758ce6e9719
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2847274
Auto-Submit: Jack Rosenthal <jrosenth@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'include/config.h')
| -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 afa6b777f6..3de3ab11f0 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_CROS +#define CONFIG_FLASH /* 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_CROS -#error CONFIG_CHIP_INIT_ROM_REGION requires CONFIG_FLASH_CROS +#ifndef CONFIG_FLASH +#error CONFIG_CHIP_INIT_ROM_REGION requires CONFIG_FLASH #endif #ifndef CONFIG_RO_ROM_RESIDENT_SIZE |