summaryrefslogtreecommitdiff
path: root/zephyr/shim/include
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2021-07-21 10:05:07 -0700
committerCommit Bot <commit-bot@chromium.org>2021-07-23 05:55:04 +0000
commit330293d53543cd9af5fbf85fb031f83a940b6d59 (patch)
treeb5ccec3765f6317e386d19f0d8cb69472bf03c34 /zephyr/shim/include
parent916fa64ce70441acb9928fda963282d0d5772b63 (diff)
downloadchrome-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 'zephyr/shim/include')
-rw-r--r--zephyr/shim/include/config_chip.h5
1 files changed, 0 insertions, 5 deletions
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