summaryrefslogtreecommitdiff
path: root/common/ec_features.c
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@chromium.org>2017-10-11 09:16:15 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-10-13 14:45:16 -0700
commit7f472114fb3c0c2cc48ec4490ec9cc3d5b41eeef (patch)
tree351a55bf057dbdad4f7fbd886feffcc668c7378a /common/ec_features.c
parenta7587bea86719c289ba58914c9dda36eca0acff0 (diff)
downloadchrome-ec-7f472114fb3c0c2cc48ec4490ec9cc3d5b41eeef.tar.gz
cleanup: Use CONFIG_BATTERY to indicate whether a board has a battery
BUG=b:35528297 BRANCH=None TEST=`make buildall -j` Change-Id: I9e4814b4172f20711f7edd691c9569f9130aec8e Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/713395 Commit-Ready: Shawn N <shawnn@chromium.org> Tested-by: Shawn N <shawnn@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'common/ec_features.c')
-rw-r--r--common/ec_features.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/ec_features.c b/common/ec_features.c
index 01d666a9dc..1340727f41 100644
--- a/common/ec_features.c
+++ b/common/ec_features.c
@@ -46,8 +46,7 @@ uint32_t get_feature_flags0(void)
#ifdef CONFIG_TEMP_SENSOR
| EC_FEATURE_MASK_0(EC_FEATURE_THERMAL)
#endif
-/* Hack to uniquely identify Samus ec */
-#if (defined CONFIG_BACKLIGHT_LID) || (defined CONFIG_BATTERY_SAMUS)
+#if (defined CONFIG_BACKLIGHT_LID) || (defined CONFIG_BACKLIGHT_REQ_GPIO)
| EC_FEATURE_MASK_0(EC_FEATURE_BKLIGHT_SWITCH)
#endif
#ifdef CONFIG_WIRELESS
@@ -65,7 +64,7 @@ uint32_t get_feature_flags0(void)
#ifdef CONFIG_CHARGER
| EC_FEATURE_MASK_0(EC_FEATURE_CHARGER)
#endif
-#if (defined CONFIG_BATTERY) || (defined CONFIG_BATTERY_SMART)
+#if (defined CONFIG_BATTERY)
| EC_FEATURE_MASK_0(EC_FEATURE_BATTERY)
#endif
#ifdef CONFIG_BATTERY_SMART