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 /board/npcx_evb | |
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 'board/npcx_evb')
-rw-r--r-- | board/npcx_evb/board.c | 2 | ||||
-rw-r--r-- | board/npcx_evb/board.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/npcx_evb/board.c b/board/npcx_evb/board.c index cee9acfeef..c86f35f487 100644 --- a/board/npcx_evb/board.c +++ b/board/npcx_evb/board.c @@ -126,7 +126,7 @@ const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins); /******************************************************************************/ /* Keyboard scan setting */ -struct keyboard_scan_config keyscan_config = { +__override struct keyboard_scan_config keyscan_config = { .output_settle_us = 40, .debounce_down_us = 6 * MSEC, .debounce_up_us = 30 * MSEC, diff --git a/board/npcx_evb/board.h b/board/npcx_evb/board.h index b97bf43047..fc12b6d80a 100644 --- a/board/npcx_evb/board.h +++ b/board/npcx_evb/board.h @@ -24,7 +24,7 @@ #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_POWER_BUTTON #define CONFIG_VBOOT_HASH |