From 330293d53543cd9af5fbf85fb031f83a940b6d59 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 21 Jul 2021 10:05:07 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3044403 Tested-by: Gwendal Grignou Commit-Queue: Gwendal Grignou Reviewed-by: Gwendal Grignou --- board/herobrine_npcx9/board.c | 2 +- board/herobrine_npcx9/board.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'board/herobrine_npcx9') diff --git a/board/herobrine_npcx9/board.c b/board/herobrine_npcx9/board.c index eaf6ed0399..620880b607 100644 --- a/board/herobrine_npcx9/board.c +++ b/board/herobrine_npcx9/board.c @@ -43,7 +43,7 @@ const enum gpio_signal hibernate_wake_pins[] = { const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins); /* 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/herobrine_npcx9/board.h b/board/herobrine_npcx9/board.h index 1800d1255f..14a8366684 100644 --- a/board/herobrine_npcx9/board.h +++ b/board/herobrine_npcx9/board.h @@ -20,7 +20,7 @@ /* Keyboard */ #define CONFIG_KEYBOARD_PROTOCOL_MKBP -#define CONFIG_KEYBOARD_BOARD_CONFIG + #define CONFIG_PWM_KBLIGHT /* Battery */ -- cgit v1.2.1