diff options
Diffstat (limited to 'zephyr')
| -rw-r--r-- | zephyr/Kconfig.keyboard | 10 | ||||
| -rw-r--r-- | zephyr/projects/volteer/volteer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | zephyr/projects/volteer/volteer/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 5 |
4 files changed, 0 insertions, 18 deletions
diff --git a/zephyr/Kconfig.keyboard b/zephyr/Kconfig.keyboard index 14514427dc..fc303c737d 100644 --- a/zephyr/Kconfig.keyboard +++ b/zephyr/Kconfig.keyboard @@ -48,16 +48,6 @@ config PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP endchoice # PLATFORM_EC_KEYBOARD -config PLATFORM_EC_KEYBOARD_BOARD_CONFIG - bool "Use custom keyboard config" - help - Enable support for custom keyboard config. in which case - keyscan_config must be defined by the board, using - struct keyboard_scan_config. - - If this is not enabled, default values in common/keyboard_scan.c are - used. - config PLATFORM_EC_KEYBOARD_KEYPAD bool "Support a numeric keypad" help diff --git a/zephyr/projects/volteer/volteer/CMakeLists.txt b/zephyr/projects/volteer/volteer/CMakeLists.txt index fddf517597..c749cfc340 100644 --- a/zephyr/projects/volteer/volteer/CMakeLists.txt +++ b/zephyr/projects/volteer/volteer/CMakeLists.txt @@ -39,8 +39,6 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_BATTERY "${PLATFORM_EC_BOARD}/battery.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CBI_EEPROM "${PLATFORM_EC_BOARD}/cbi.c") -zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_KEYBOARD_BOARD_CONFIG - "${PLATFORM_EC_BOARD}/keyboard.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON "${PLATFORM_EC_BOARD}/led.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC diff --git a/zephyr/projects/volteer/volteer/prj.conf b/zephyr/projects/volteer/volteer/prj.conf index 2a0cd5cc44..ac39a72846 100644 --- a/zephyr/projects/volteer/volteer/prj.conf +++ b/zephyr/projects/volteer/volteer/prj.conf @@ -29,7 +29,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHGRAMP=n # Keyboard CONFIG_PLATFORM_EC_KEYBOARD=y CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y -CONFIG_PLATFORM_EC_KEYBOARD_BOARD_CONFIG=y CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD=y CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI2=y CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index a7346e6c8a..01ab43d779 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -469,11 +469,6 @@ #define CONFIG_KEYBOARD_COL2_INVERTED #endif /* CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED */ -#undef CONFIG_KEYBOARD_BOARD_CONFIG -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_BOARD_CONFIG -#define CONFIG_KEYBOARD_BOARD_CONFIG -#endif - #undef CONFIG_KEYBOARD_KEYPAD #ifdef CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD #define CONFIG_KEYBOARD_KEYPAD |