From fc1832097b9bbe40eb128828876803993a331ecb Mon Sep 17 00:00:00 2001 From: Jeremy Bettis Date: Tue, 27 Apr 2021 13:40:37 -0600 Subject: 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 Change-Id: I5b5e58b30d936b5232e049827f458d9a2ed06340 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2855320 Commit-Queue: Jeremy Bettis Commit-Queue: Keith Short Tested-by: Jeremy Bettis Auto-Submit: Jeremy Bettis Reviewed-by: Jack Rosenthal Reviewed-by: Keith Short --- 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 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 -- cgit v1.2.1