summaryrefslogtreecommitdiff
path: root/board/rainier/board.h
diff options
context:
space:
mode:
authorAseda Aboagye <aaboagye@google.com>2017-12-15 15:55:27 -0800
committerchrome-bot <chrome-bot@chromium.org>2017-12-18 22:55:02 -0800
commita6509d28ab33aedce55c12a081582fbe38b79235 (patch)
tree406362243bd819a1c853af1192cac941d045a66a /board/rainier/board.h
parentf889d14d4e08c9826c92dd2fa81d65908c97f6cd (diff)
downloadchrome-ec-a6509d28ab33aedce55c12a081582fbe38b79235.tar.gz
config: Add CONFIG_BUTTON_TRIGGERED_RECOVERY.
The CONFIG_BUTTON_RECOVERY option was a little confusing especially when we have the CONFIG_DEDICATED_RECOVERY_BUTTON option. This commit renames CONFIG_BUTTON_RECOVERY to CONFIG_BUTTON_TRIGGERED_RECOVERY to help make things a little clearer. Additionally, to avoid copy paste, defining CONFIG_BUTTON_TRIGGERED_RECOVERY will populate the recovery_buttons table with either the volume buttons or a dedicated recovery button depending what the board is configured for. Lastly, if CONFIG_DEDICATED_RECOVERY_BUTTON is defined, CONFIG_BUTTON_TRIGGERED_RECOVERY is defined as well since it's implicit. BUG=chromium:783371 BRANCH=None TEST=make -j buildall Change-Id: Idccaa4d049ace0df3b98b35bdd38ac9dbd843200 Signed-off-by: Aseda Aboagye <aaboagye@google.com> Reviewed-on: https://chromium-review.googlesource.com/830917 Commit-Ready: Aseda Aboagye <aaboagye@chromium.org> Tested-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/rainier/board.h')
-rw-r--r--board/rainier/board.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/rainier/board.h b/board/rainier/board.h
index 4b6e4fb97a..6b06f4efbd 100644
--- a/board/rainier/board.h
+++ b/board/rainier/board.h
@@ -43,7 +43,7 @@
#define CONFIG_BOARD_PRE_INIT
#define CONFIG_BOARD_SPECIFIC_VERSION
#define CONFIG_BOARD_VERSION
-#define CONFIG_BUTTON_RECOVERY
+#define CONFIG_BUTTON_TRIGGERED_RECOVERY
#define CONFIG_CHARGER_ILIM_PIN_DISABLED
#define CONFIG_FORCE_CONSOLE_RESUME
#define CONFIG_HOST_COMMAND_STATUS