summaryrefslogtreecommitdiff
path: root/board/garg
diff options
context:
space:
mode:
authordnojiri <dnojiri@chromium.org>2019-12-04 14:52:18 -0800
committerCommit Bot <commit-bot@chromium.org>2019-12-10 02:14:55 +0000
commit3973af40f9ca5dd7ba06629b6968b39e912d1c40 (patch)
tree7ce8b99d8c1b4264709287c6e12bd580495aa4ff /board/garg
parent2cb4d29ad22831110d1b5adec820794b6d76fae9 (diff)
downloadchrome-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/garg')
-rw-r--r--board/garg/board.c7
-rw-r--r--board/garg/board.h2
2 files changed, 1 insertions, 8 deletions
diff --git a/board/garg/board.c b/board/garg/board.c
index 6d740e6650..180b20daac 100644
--- a/board/garg/board.c
+++ b/board/garg/board.c
@@ -248,7 +248,7 @@ static void cbi_init(void)
}
DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1);
-uint32_t board_override_feature_flags0(uint32_t flags0)
+__override uint32_t board_override_feature_flags0(uint32_t flags0)
{
/*
* Remove keyboard backlight feature for devices that don't support it.
@@ -259,11 +259,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;
-}
-
void board_hibernate_late(void)
{
int i;
diff --git a/board/garg/board.h b/board/garg/board.h
index 218f794b0d..79871f0af6 100644
--- a/board/garg/board.h
+++ b/board/garg/board.h
@@ -22,8 +22,6 @@
#define CONFIG_LED_COMMON
-#define CONFIG_EC_FEATURE_BOARD_OVERRIDE
-
/* Sensors */
#define CONFIG_ACCEL_KX022 /* Lid accel */
#define CONFIG_ACCELGYRO_BMI160 /* Base accel */