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/kindred | |
| 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/kindred')
| -rw-r--r-- | board/kindred/board.c | 7 | ||||
| -rw-r--r-- | board/kindred/board.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/board/kindred/board.c b/board/kindred/board.c index 14244d9400..d0e52ae070 100644 --- a/board/kindred/board.c +++ b/board/kindred/board.c @@ -470,15 +470,10 @@ bool board_has_kb_backlight(void) return (sku_id >= 1) && (sku_id <= 4); } -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; else return (flags0 & ~EC_FEATURE_MASK_0(EC_FEATURE_PWM_KEYB)); } - -uint32_t board_override_feature_flags1(uint32_t flags1) -{ - return flags1; -} diff --git a/board/kindred/board.h b/board/kindred/board.h index 2c4875a8de..93406c245f 100644 --- a/board/kindred/board.h +++ b/board/kindred/board.h @@ -22,8 +22,6 @@ #undef CONFIG_UART_TX_BUF_SIZE #define CONFIG_UART_TX_BUF_SIZE 4096 -#define CONFIG_EC_FEATURE_BOARD_OVERRIDE - /* Keyboard features */ #define CONFIG_PWM #define CONFIG_PWM_KBLIGHT |