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 /baseboard/intelrvp | |
| 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 'baseboard/intelrvp')
| -rw-r--r-- | baseboard/intelrvp/baseboard.h | 2 | ||||
| -rw-r--r-- | baseboard/intelrvp/ite_ec.c | 2 | ||||
| -rw-r--r-- | baseboard/intelrvp/mchp_ec.c | 2 | ||||
| -rw-r--r-- | baseboard/intelrvp/npcx_ec.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/baseboard/intelrvp/baseboard.h b/baseboard/intelrvp/baseboard.h index 1ca3739d88..de4cb671ac 100644 --- a/baseboard/intelrvp/baseboard.h +++ b/baseboard/intelrvp/baseboard.h @@ -76,7 +76,7 @@ #define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON 15001 /* Keyboard */ -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2 diff --git a/baseboard/intelrvp/ite_ec.c b/baseboard/intelrvp/ite_ec.c index d76d22bb63..bafddc5f9e 100644 --- a/baseboard/intelrvp/ite_ec.c +++ b/baseboard/intelrvp/ite_ec.c @@ -15,7 +15,7 @@ #include "usb_pd_tcpm.h" /* Keyboard scan setting */ -struct keyboard_scan_config keyscan_config = { +__override struct keyboard_scan_config keyscan_config = { .output_settle_us = 35, .debounce_down_us = 5 * MSEC, .debounce_up_us = 40 * MSEC, diff --git a/baseboard/intelrvp/mchp_ec.c b/baseboard/intelrvp/mchp_ec.c index adaba23d3a..2d6c203ef2 100644 --- a/baseboard/intelrvp/mchp_ec.c +++ b/baseboard/intelrvp/mchp_ec.c @@ -14,7 +14,7 @@ #include "usb_pd_tcpm.h" /* Keyboard scan setting */ -struct keyboard_scan_config keyscan_config = { +__override struct keyboard_scan_config keyscan_config = { /* * F3 key scan cycle completed but scan input is not * charging to logic high when EC start scan next diff --git a/baseboard/intelrvp/npcx_ec.c b/baseboard/intelrvp/npcx_ec.c index c48e202f87..d6eca2e55b 100644 --- a/baseboard/intelrvp/npcx_ec.c +++ b/baseboard/intelrvp/npcx_ec.c @@ -12,7 +12,7 @@ #include "time.h" /* Keyboard scan setting */ -struct keyboard_scan_config keyscan_config = { +__override struct keyboard_scan_config keyscan_config = { .output_settle_us = 35, .debounce_down_us = 5 * MSEC, .debounce_up_us = 40 * MSEC, |