summaryrefslogtreecommitdiff
path: root/board/trogdor
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 /board/trogdor
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 'board/trogdor')
-rw-r--r--board/trogdor/board.c2
-rw-r--r--board/trogdor/board.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/trogdor/board.c b/board/trogdor/board.c
index 0d7eccdc57..a9b72a560d 100644
--- a/board/trogdor/board.c
+++ b/board/trogdor/board.c
@@ -32,7 +32,7 @@
#include "gpio_list.h"
/* Keyboard scan setting */
-struct keyboard_scan_config keyscan_config = {
+__override struct keyboard_scan_config keyscan_config = {
/* Use 80 us, because KSO_02 passes through the H1. */
.output_settle_us = 80,
/*
diff --git a/board/trogdor/board.h b/board/trogdor/board.h
index 16bc508b2d..346b135ea4 100644
--- a/board/trogdor/board.h
+++ b/board/trogdor/board.h
@@ -23,7 +23,7 @@
/* Keyboard */
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
-#define CONFIG_KEYBOARD_BOARD_CONFIG
+
#define CONFIG_PWM_KBLIGHT
/* Battery */