diff options
| author | Stefan Adolfsson <sadolfsson@google.com> | 2018-04-24 10:08:14 +0200 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-06-19 19:54:45 +0000 |
| commit | f3d3fc6f8b25932391934dbee701b63d5919373b (patch) | |
| tree | 73f04e251a72682348ac45f1c2f197a9428e615c | |
| parent | f97d375d3c2d98ace3701343d5c955cdde64f5e6 (diff) | |
| download | chrome-ec-f3d3fc6f8b25932391934dbee701b63d5919373b.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
Reviewed-on: https://chromium-review.googlesource.com/1030214
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Change-Id: I23bb50d9456a07de7a9e7ea8bfc71f42c5e52778
Reviewed-on: https://chromium-review.googlesource.com/1055688
Tested-by: Stefan Adolfsson <sadolfsson@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Stefan Adolfsson <sadolfsson@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 6491f15f3b..8955643f85 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 2d7cd658ee..72ee8d82f6 100644 --- a/include/config.h +++ b/include/config.h @@ -457,6 +457,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 0d3f7a07f9..54363ba3e1 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 |