summaryrefslogtreecommitdiff
path: root/board/hadoken
diff options
context:
space:
mode:
authorEric Yilun Lin <yllin@chromium.org>2021-04-09 15:55:35 +0800
committerCommit Bot <commit-bot@chromium.org>2021-04-23 21:41:36 +0000
commit4e074a16c5703f0cdd7b7d780a8ae1bea53a445a (patch)
treeee55f33d67210001d31d852ba380a27778cbe379 /board/hadoken
parentd1156aae265e671c6779026ce52716f42847f9f9 (diff)
downloadchrome-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 'board/hadoken')
-rw-r--r--board/hadoken/board.h2
1 files changed, 1 insertions, 1 deletions
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