diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-07-21 10:05:07 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-07-23 05:55:04 +0000 |
| commit | 330293d53543cd9af5fbf85fb031f83a940b6d59 (patch) | |
| tree | b5ccec3765f6317e386d19f0d8cb69472bf03c34 /include | |
| parent | 916fa64ce70441acb9928fda963282d0d5772b63 (diff) | |
| download | chrome-ec-330293d53543cd9af5fbf85fb031f83a940b6d59.tar.gz | |
keyboard: Use __override for keyboard_scan_config
Currently keyboard_scan_config is defined by each board using
CONFIG_KEYBOARD_BOARD_CONFIG. This patch makes it defined as
__override hence removes CONFIG_KEYBOARD_BOARD_CONFIG.
BUG=None
BRANCH=None
TEST=buildall
Change-Id: I53a356741ba4d00e829ca59b74ee6dc704188728
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3044403
Tested-by: Gwendal Grignou <gwendal@chromium.org>
Commit-Queue: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 6 | ||||
| -rw-r--r-- | include/keyboard_scan.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/config.h b/include/config.h index 3136dd18fe..d16a4a0388 100644 --- a/include/config.h +++ b/include/config.h @@ -2718,12 +2718,6 @@ #undef CONFIG_KEYBOARD_FACTORY_TEST /* - * Keyboard config (struct keyboard_scan_config) is in board.c. If this is - * not defined, default values from common/keyboard_scan.c will be used. - */ -#undef CONFIG_KEYBOARD_BOARD_CONFIG - -/* * Support for boot key combinations (e.g. refresh key being held on boot to * trigger recovery). */ diff --git a/include/keyboard_scan.h b/include/keyboard_scan.h index e74bfcea33..46215da218 100644 --- a/include/keyboard_scan.h +++ b/include/keyboard_scan.h @@ -46,7 +46,7 @@ struct keyboard_scan_config *keyboard_scan_get_config(void); /* * Which is probably this. */ -extern struct keyboard_scan_config keyscan_config; +__override_proto extern struct keyboard_scan_config keyscan_config; /* Key held down at keyboard-controlled reset boot time. */ enum boot_key { |