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 /common | |
| 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 'common')
| -rw-r--r-- | common/keyboard_scan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index 3349566b55..3e7e1c1d87 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -53,9 +53,7 @@ #define CONFIG_KEYBOARD_POST_SCAN_CLOCKS 16000 #endif -#ifndef CONFIG_KEYBOARD_BOARD_CONFIG -/* Use default keyboard scan config, because board didn't supply one */ -struct keyboard_scan_config keyscan_config = { +__overridable struct keyboard_scan_config keyscan_config = { #ifdef CONFIG_KEYBOARD_COL2_INVERTED /* * CONFIG_KEYBOARD_COL2_INVERTED is defined for passing the column 2 @@ -78,7 +76,6 @@ struct keyboard_scan_config keyscan_config = { 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */ }, }; -#endif /* Boot key list. Must be in same order as enum boot_key. */ struct boot_key_entry { |