From 4ac1d81e1430dbfbfba1376a23ab19dfa845d7ef Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Sat, 24 Apr 2021 15:29:41 +0000 Subject: Revert "config: rename CONFIG_FLASH to CONFIG_FLASH_CROS" 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 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 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2816622 > Tested-by: Eric Yilun Lin > Reviewed-by: Keith Short > Commit-Queue: Keith Short Bug: b:180980668 Change-Id: Idc5e799d3b0ea8cc76dbbb49a91b3758ce6e9719 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2847274 Auto-Submit: Jack Rosenthal Bot-Commit: Rubber Stamper Commit-Queue: Jack Rosenthal --- board/stm32f446e-eval/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/stm32f446e-eval') diff --git a/board/stm32f446e-eval/board.h b/board/stm32f446e-eval/board.h index aa498d6caa..656d372766 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_CROS +#define CONFIG_FLASH /* * Allow dangerous commands all the time, since we don't have a write protect -- cgit v1.2.1