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/meep/board.c | 7 +------ board/meep/board.h | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'board/meep') diff --git a/board/meep/board.c b/board/meep/board.c index d9b80d36d9..75dfb069c3 100644 --- a/board/meep/board.c +++ b/board/meep/board.c @@ -312,7 +312,7 @@ void board_overcurrent_event(int port, int is_overcurrented) gpio_set_level(GPIO_USB_C_OC, !is_overcurrented); } -uint32_t board_override_feature_flags0(uint32_t flags0) +__override uint32_t board_override_feature_flags0(uint32_t flags0) { /* * We always compile in backlight support for Meep/Dorp, but only some @@ -326,8 +326,3 @@ uint32_t board_override_feature_flags0(uint32_t flags0) /* Report that there is no keyboard backlight */ 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/meep/board.h b/board/meep/board.h index 9cf6b2845f..4ea92674c7 100644 --- a/board/meep/board.h +++ b/board/meep/board.h @@ -24,8 +24,6 @@ #define CONFIG_LED_COMMON #define CONFIG_LED_POWER_LED -#define CONFIG_EC_FEATURE_BOARD_OVERRIDE - /* Sensors */ #define CONFIG_ACCEL_KX022 /* Lid accel */ #define CONFIG_ACCELGYRO_LSM6DSM /* Base accel */ -- cgit v1.2.1