diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-12 15:39:36 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:55:52 +0000 |
| commit | 52318b441a55f43e93598665c01b797b9c25c877 (patch) | |
| tree | 45daa02f131d6da435fd232fb05b16d87f7e3f61 | |
| parent | 97fe893736f280026e15dc1e7543cf6db6235eab (diff) | |
| download | chrome-ec-52318b441a55f43e93598665c01b797b9c25c877.tar.gz | |
Revert "ec_features / coral: Allow disabling keyboard backlight feature"
This reverts commit 09136dea764dbe482392c29b3c8d1763149df3e6.
BUG=b:200823466
TEST=make buildall -j
Change-Id: Ibd86be5017c3c984ba10c59a8c0cca6e5c392af5
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3285823
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
| -rw-r--r-- | common/ec_features.c | 11 | ||||
| -rw-r--r-- | include/board_config.h | 6 | ||||
| -rw-r--r-- | include/config.h | 6 |
3 files changed, 1 insertions, 22 deletions
diff --git a/common/ec_features.c b/common/ec_features.c index 309ba3cb37..d817e8ccbc 100644 --- a/common/ec_features.c +++ b/common/ec_features.c @@ -6,13 +6,11 @@ /* Present Chrome EC device features to the outside world */ #include "common.h" -#include "config.h" #include "ec_commands.h" -#include "board_config.h" uint32_t get_feature_flags0(void) { - uint32_t result = 0 + return 0 #ifdef CONFIG_FW_LIMITED_IMAGE | EC_FEATURE_MASK_0(EC_FEATURE_LIMITED) #endif @@ -107,10 +105,6 @@ uint32_t get_feature_flags0(void) | EC_FEATURE_MASK_0(EC_FEATURE_DEVICE_EVENT) #endif ; -#ifdef CONFIG_EC_FEATURE_BOARD_OVERRIDE - result = board_override_feature_flags0(result); -#endif - return result; } uint32_t get_feature_flags1(void) @@ -138,8 +132,5 @@ uint32_t get_feature_flags1(void) | EC_FEATURE_MASK_1(EC_FEATURE_ISH) #endif ; -#ifdef CONFIG_EC_FEATURE_BOARD_OVERRIDE - result = board_override_feature_flags1(result); -#endif return result; } diff --git a/include/board_config.h b/include/board_config.h index 76b92ac50b..4c062e2a55 100644 --- a/include/board_config.h +++ b/include/board_config.h @@ -61,10 +61,4 @@ void board_before_rsmrst(int rsmrst); */ void chip_pre_init(void); -#ifdef CONFIG_EC_FEATURE_BOARD_OVERRIDE -/* function for board specific overrides to default feature flags */ -uint32_t board_override_feature_flags0(uint32_t flags0); -uint32_t board_override_feature_flags1(uint32_t flags1); -#endif - #endif /* __CROS_EC_BOARD_CONFIG_H */ diff --git a/include/config.h b/include/config.h index 525f15b61d..86145babd6 100644 --- a/include/config.h +++ b/include/config.h @@ -1435,12 +1435,6 @@ /* Usually, EC capable of sensor speeds up to 200000 mHz */ #define CONFIG_EC_MAX_SENSOR_FREQ_DEFAULT_MILLIHZ 200000 -/* - * Allow board to override the feature bitmap provided through host command - * and ACPI. - */ -#undef CONFIG_EC_FEATURE_BOARD_OVERRIDE - /* Support EC chip internal data EEPROM */ #undef CONFIG_EEPROM |