From 221ecb5dd0a6bce5ab82c21c36964557d7b3744b Mon Sep 17 00:00:00 2001 From: Stefan Adolfsson Date: Tue, 24 Apr 2018 10:08:14 +0200 Subject: CEC: Add CONFIG_CEC Turning on CONFIG_CEC enables the CEC feature code and the CEC console. Signed-off-by: Stefan Adolfsson 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 Tested-by: Stefan Adolfsson Reviewed-by: Randall Spangler --- common/ec_features.c | 3 +++ include/config.h | 4 ++++ include/console_channel.inc | 3 +++ 3 files changed, 10 insertions(+) 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 @@ -121,6 +121,9 @@ uint32_t get_feature_flags1(void) #endif #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 diff --git a/include/config.h b/include/config.h index 360e8ccc7e..83a9dbf7df 100644 --- a/include/config.h +++ b/include/config.h @@ -483,6 +483,10 @@ */ #undef CONFIG_CAPSENSE +/*****************************************************************************/ +/* Support CEC */ +#undef CONFIG_CEC + /*****************************************************************************/ /* Compile 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 -- cgit v1.2.1