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 | |
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')
-rw-r--r-- | baseboard/brya/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/dragonegg/baseboard.c | 2 | ||||
-rw-r--r-- | baseboard/dragonegg/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/grunt/baseboard.c | 2 | ||||
-rw-r--r-- | baseboard/grunt/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/guybrush/baseboard.c | 2 | ||||
-rw-r--r-- | baseboard/guybrush/baseboard.h | 2 | ||||
-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 | ||||
-rw-r--r-- | baseboard/ite_evb/baseboard.c | 4 | ||||
-rw-r--r-- | baseboard/ite_evb/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/kukui/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/octopus/baseboard.c | 2 | ||||
-rw-r--r-- | baseboard/octopus/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/volteer/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/zork/baseboard.c | 2 | ||||
-rw-r--r-- | baseboard/zork/baseboard.h | 2 |
19 files changed, 19 insertions, 21 deletions
diff --git a/baseboard/brya/baseboard.h b/baseboard/brya/baseboard.h index 9f7b817278..6a4efe942e 100644 --- a/baseboard/brya/baseboard.h +++ b/baseboard/brya/baseboard.h @@ -117,7 +117,7 @@ /* Common Keyboard Defines */ #define CONFIG_CMD_KEYBOARD -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_KEYPAD #define CONFIG_KEYBOARD_PROTOCOL_8042 diff --git a/baseboard/dragonegg/baseboard.c b/baseboard/dragonegg/baseboard.c index 2301a9cb0f..acbeadcf32 100644 --- a/baseboard/dragonegg/baseboard.c +++ b/baseboard/dragonegg/baseboard.c @@ -42,7 +42,7 @@ /******************************************************************************/ /* 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/dragonegg/baseboard.h b/baseboard/dragonegg/baseboard.h index a22ad924e9..47edb8f314 100644 --- a/baseboard/dragonegg/baseboard.h +++ b/baseboard/dragonegg/baseboard.h @@ -44,7 +44,7 @@ /* Common Keyboard Defines */ #define CONFIG_CMD_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/grunt/baseboard.c b/baseboard/grunt/baseboard.c index 35997db8d5..9d06fd4b78 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -482,7 +482,7 @@ void board_set_charge_limit(int port, int supplier, int charge_ma, } /* 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/grunt/baseboard.h b/baseboard/grunt/baseboard.h index 5206b0a5a2..c97ece285f 100644 --- a/baseboard/grunt/baseboard.h +++ b/baseboard/grunt/baseboard.h @@ -101,7 +101,7 @@ */ #define CONFIG_BOARD_RESET_AFTER_POWER_ON -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_8042 diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c index e20528f288..18da982b99 100644 --- a/baseboard/guybrush/baseboard.c +++ b/baseboard/guybrush/baseboard.c @@ -465,7 +465,7 @@ BUILD_ASSERT(ARRAY_SIZE(ioex_config) == USBC_PORT_COUNT); BUILD_ASSERT(CONFIG_IO_EXPANDER_PORT_COUNT == USBC_PORT_COUNT); /* 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/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h index 1f8bf58094..abe5dddf0b 100644 --- a/baseboard/guybrush/baseboard.h +++ b/baseboard/guybrush/baseboard.h @@ -102,7 +102,7 @@ /* Keyboard Config */ #define CONFIG_KEYBOARD_BACKLIGHT -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_KEYBOARD_VIVALDI 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, diff --git a/baseboard/ite_evb/baseboard.c b/baseboard/ite_evb/baseboard.c index 0bd537ef4f..00459b12bc 100644 --- a/baseboard/ite_evb/baseboard.c +++ b/baseboard/ite_evb/baseboard.c @@ -106,9 +106,8 @@ const struct fan_tach_t fan_tach[] = { BUILD_ASSERT(ARRAY_SIZE(fan_tach) == PWM_HW_CH_TOTAL); #endif /* defined(CONFIG_FANS) || defined(CONFIG_PWM) */ -#if defined(CONFIG_KEYBOARD_BOARD_CONFIG) /* 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, @@ -120,7 +119,6 @@ struct keyboard_scan_config keyscan_config = { 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */ }, }; -#endif #if defined(CONFIG_SPI_FLASH_PORT) /* SPI devices */ diff --git a/baseboard/ite_evb/baseboard.h b/baseboard/ite_evb/baseboard.h index dfe289e3a6..7fe309491c 100644 --- a/baseboard/ite_evb/baseboard.h +++ b/baseboard/ite_evb/baseboard.h @@ -17,7 +17,7 @@ #define CONFIG_IT83XX_ENABLE_MOUSE_DEVICE #define CONFIG_IT83XX_SMCLK2_ON_GPC7 #define CONFIG_IT83XX_VCC_3P3V -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_KEYBOARD_PROTOCOL_8042 #define CONFIG_LOW_POWER_IDLE #define CONFIG_LOW_POWER_S0 diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h index 90a3e3dd05..66b88cd534 100644 --- a/baseboard/kukui/baseboard.h +++ b/baseboard/kukui/baseboard.h @@ -104,7 +104,7 @@ #define CONFIG_IO_EXPANDER_IT8801 #define CONFIG_IO_EXPANDER_PORT_COUNT 1 #define CONFIG_KEYBOARD_NOT_RAW -#define CONFIG_KEYBOARD_BOARD_CONFIG + #endif #define CONFIG_KEYBOARD_COL2_INVERTED diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c index c9a3094e2e..89da53e6dc 100644 --- a/baseboard/octopus/baseboard.c +++ b/baseboard/octopus/baseboard.c @@ -32,7 +32,7 @@ /******************************************************************************/ /* 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/octopus/baseboard.h b/baseboard/octopus/baseboard.h index 059dec29d9..8b05c30f4c 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -264,7 +264,7 @@ /* Common Keyboard Defines */ #define CONFIG_CMD_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/volteer/baseboard.h b/baseboard/volteer/baseboard.h index 4ea3d81676..38a464813a 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -64,7 +64,7 @@ /* Common Keyboard Defines */ #define CONFIG_CMD_KEYBOARD -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_KEYPAD #define CONFIG_KEYBOARD_PROTOCOL_8042 diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c index 5bbb0cc65a..41c859ad7b 100644 --- a/baseboard/zork/baseboard.c +++ b/baseboard/zork/baseboard.c @@ -105,7 +105,7 @@ __overridable void board_set_charge_limit(int port, int supplier, int charge_ma, } /* 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/zork/baseboard.h b/baseboard/zork/baseboard.h index 60db6e1cb2..d84ebbcef8 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -122,7 +122,7 @@ #define CONFIG_IO_EXPANDER #define CONFIG_IO_EXPANDER_NCT38XX -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_PROTOCOL_8042 #undef CONFIG_KEYBOARD_VIVALDI |