diff options
| author | dnojiri <dnojiri@chromium.org> | 2019-12-04 14:52:18 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-10 02:14:55 +0000 |
| commit | 3973af40f9ca5dd7ba06629b6968b39e912d1c40 (patch) | |
| tree | 7ce8b99d8c1b4264709287c6e12bd580495aa4ff /board/dratini | |
| parent | 2cb4d29ad22831110d1b5adec820794b6d76fae9 (diff) | |
| download | chrome-ec-3973af40f9ca5dd7ba06629b6968b39e912d1c40.tar.gz | |
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 <dnojiri@chromium.org>
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 <jettrink@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Auto-Submit: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'board/dratini')
| -rw-r--r-- | board/dratini/board.c | 7 | ||||
| -rw-r--r-- | board/dratini/board.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/board/dratini/board.c b/board/dratini/board.c index 4a1ff9a6e1..d8c673e2e8 100644 --- a/board/dratini/board.c +++ b/board/dratini/board.c @@ -428,7 +428,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; @@ -436,11 +436,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/dratini/board.h b/board/dratini/board.h index bdf50e7a2c..a16165f6d9 100644 --- a/board/dratini/board.h +++ b/board/dratini/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 |