diff options
| author | Stefan Adolfsson <sadolfsson@google.com> | 2018-04-24 10:08:14 +0200 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-05-09 22:36:19 -0700 |
| commit | 221ecb5dd0a6bce5ab82c21c36964557d7b3744b (patch) | |
| tree | 06dfeed978e90e0c7b93b7aee4def23320b4a3db | |
| parent | f04ec041b21b44a94cb4c59f73249424bb276b71 (diff) | |
| download | chrome-ec-221ecb5dd0a6bce5ab82c21c36964557d7b3744b.tar.gz | |
CEC: Add CONFIG_CEC
Turning on CONFIG_CEC enables the CEC feature code and the
CEC console.
Signed-off-by: Stefan Adolfsson <sadolfsson@chromium.org>
BUG=b:76467407
BRANCH=none
TEST=Build ec-utils and chromeos-ec with CONFIG_CEC set
CQ-DEPEND=CL:995440
Change-Id: I23bb50d9456a07de7a9e7ea8bfc71f42c5e52778
Reviewed-on: https://chromium-review.googlesource.com/1030214
Commit-Ready: Stefan Adolfsson <sadolfsson@chromium.org>
Tested-by: Stefan Adolfsson <sadolfsson@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | common/ec_features.c | 3 | ||||
| -rw-r--r-- | include/config.h | 4 | ||||
| -rw-r--r-- | include/console_channel.inc | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/common/ec_features.c b/common/ec_features.c index ff97df44cf..28ed2a1364 100644 --- a/common/ec_features.c +++ b/common/ec_features.c @@ -122,6 +122,9 @@ uint32_t get_feature_flags1(void) #ifdef CONFIG_EXTERNAL_STORAGE | EC_FEATURE_MASK_1(EC_FEATURE_EXEC_IN_RAM) #endif +#ifdef CONFIG_CEC + | EC_FEATURE_MASK_1(EC_FEATURE_CEC) +#endif ; #ifdef CONFIG_EC_FEATURE_BOARD_OVERRIDE result = board_override_feature_flags1(result); diff --git a/include/config.h b/include/config.h index 360e8ccc7e..83a9dbf7df 100644 --- a/include/config.h +++ b/include/config.h @@ -484,6 +484,10 @@ #undef CONFIG_CAPSENSE /*****************************************************************************/ +/* Support CEC */ +#undef CONFIG_CEC + +/*****************************************************************************/ /* Compile charge manager */ #undef CONFIG_CHARGE_MANAGER diff --git a/include/console_channel.inc b/include/console_channel.inc index b8412cf335..080da34821 100644 --- a/include/console_channel.inc +++ b/include/console_channel.inc @@ -16,6 +16,9 @@ CONSOLE_CHANNEL(CC_BLUETOOTH_LL, "bluetooth_ll") CONSOLE_CHANNEL(CC_BLUETOOTH_HCI,"bluetooth_hci") #endif #endif /* CONFIG_BLUETOOTH_LE */ +#ifdef CONFIG_CEC +CONSOLE_CHANNEL(CC_CEC, "cec") +#endif #ifdef CONFIG_EXTENSION_COMMAND CONSOLE_CHANNEL(CC_EXTENSION, "extension") #endif |