From 3973af40f9ca5dd7ba06629b6968b39e912d1c40 Mon Sep 17 00:00:00 2001 From: dnojiri Date: Wed, 4 Dec 2019 14:52:18 -0800 Subject: Define board_override_features_flags APIs as overridable Currently board_override_features_flags0/1 are enabled by CONFIG_EC_FEATURE_BOARD_OVERRIDE. This patch defines the callbacks as overridable. It will allow us to remove CONFIG_EC_FEATURE_BOARD_OVERRIDE and the redundancy it incurs. Signed-off-by: dnojiri BUG=none BRANCH=none TEST=buildall Change-Id: I0c2870b746879b272ada35b9615b611627a9f426 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1951810 Reviewed-by: Jett Rink Commit-Queue: Daisuke Nojiri Tested-by: Daisuke Nojiri Auto-Submit: Daisuke Nojiri --- board/jinlon/board.c | 7 +------ board/jinlon/board.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'board/jinlon') diff --git a/board/jinlon/board.c b/board/jinlon/board.c index b735dfd554..797900ab1e 100644 --- a/board/jinlon/board.c +++ b/board/jinlon/board.c @@ -443,7 +443,7 @@ bool board_has_kb_backlight(void) return sku_id == 2 || sku_id == 3 || sku_id == 22 || sku_id == 255; } -uint32_t board_override_feature_flags0(uint32_t flags0) +__override uint32_t board_override_feature_flags0(uint32_t flags0) { if (board_has_kb_backlight()) return flags0; @@ -451,11 +451,6 @@ uint32_t board_override_feature_flags0(uint32_t flags0) return (flags0 & ~EC_FEATURE_MASK_0(EC_FEATURE_PWM_KEYB)); } -uint32_t board_override_feature_flags1(uint32_t flags1) -{ - return flags1; -} - #ifdef CONFIG_KEYBOARD_FACTORY_TEST /* * Map keyboard connector pins to EC GPIO pins for factory test. diff --git a/board/jinlon/board.h b/board/jinlon/board.h index 9f831006ad..db87e9e952 100644 --- a/board/jinlon/board.h +++ b/board/jinlon/board.h @@ -11,7 +11,6 @@ /* Baseboard features */ #include "baseboard.h" -#define CONFIG_EC_FEATURE_BOARD_OVERRIDE #define CONFIG_POWER_BUTTON #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 -- cgit v1.2.1