diff options
author | Mary Ruthven <mruthven@chromium.org> | 2021-11-22 14:15:01 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-11-22 20:50:43 +0000 |
commit | 62bbd1cd7626e6f59c5447b8f55dd8d4243349b7 (patch) | |
tree | dce9f2932700096044953f6b2d3383bead503e41 /include | |
parent | 08b6aaa308a0a5196746550616efae2557cc270f (diff) | |
download | chrome-ec-62bbd1cd7626e6f59c5447b8f55dd8d4243349b7.tar.gz |
Revert "console_channel.inc: Add more ifdef to reduce number of channels"
This reverts commit b5cebbaadb4966e9d1820b0dcabd690d3e5d762e.
BUG=b:207391162
TEST=The chan output is the same on ToT and mp images.
Change-Id: Ief9bc6f6c9b027284b423e46681c313fd3fd73aa
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3296743
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Commit-Queue: Andrey Pronin <apronin@chromium.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/config.h | 1 | ||||
-rw-r--r-- | include/console_channel.inc | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/include/config.h b/include/config.h index 288a3e480d..b37144331f 100644 --- a/include/config.h +++ b/include/config.h @@ -4342,7 +4342,6 @@ */ #ifndef HAS_TASK_CHIPSET -#undef CONFIG_AP_HANG_DETECT #undef CONFIG_CHIPSET_APOLLOLAKE #undef CONFIG_CHIPSET_BRASWELL #undef CONFIG_CHIPSET_CANNONLAKE diff --git a/include/console_channel.inc b/include/console_channel.inc index 9e2c37c91e..86289b43f6 100644 --- a/include/console_channel.inc +++ b/include/console_channel.inc @@ -20,16 +20,12 @@ CONSOLE_CHANNEL(CC_EXTENSION, "extension") CONSOLE_CHANNEL(CC_CCD, "ccd") #endif CONSOLE_CHANNEL(CC_CHARGER, "charger") -#ifdef HAS_TASK_CHIPSET CONSOLE_CHANNEL(CC_CHIPSET, "chipset") -#endif CONSOLE_CHANNEL(CC_CLOCK, "clock") #ifdef CONFIG_DMA CONSOLE_CHANNEL(CC_DMA, "dma") #endif -#if defined(CONFIG_DEVICE_EVENT) || defined(CONFIG_HOSTCMD_EVENTS) CONSOLE_CHANNEL(CC_EVENTS, "events") -#endif #ifdef HAS_TASK_FPSENSOR CONSOLE_CHANNEL(CC_FP, "fingerprint") #endif @@ -47,12 +43,8 @@ CONSOLE_CHANNEL(CC_I2C, "i2c") CONSOLE_CHANNEL(CC_IPI, "ipi") #endif CONSOLE_CHANNEL(CC_KEYBOARD, "keyboard") -#ifdef HAS_TASK_KEYSCAN CONSOLE_CHANNEL(CC_KEYSCAN, "keyscan") -#endif -#ifdef CONFIG_LID_ANGLE_UPDATE CONSOLE_CHANNEL(CC_LIDANGLE, "lidangle") -#endif #ifdef HAS_TASK_LIGHTBAR CONSOLE_CHANNEL(CC_LIGHTBAR, "lightbar") #endif @@ -94,9 +86,7 @@ CONSOLE_CHANNEL(CC_DPTF, "dptf") CONSOLE_CHANNEL(CC_ALS, "als") #endif CONSOLE_CHANNEL(CC_THERMAL, "thermal") -#ifdef CHIP_G CONSOLE_CHANNEL(CC_TPM, "tpm") -#endif CONSOLE_CHANNEL(CC_USB, "usb") CONSOLE_CHANNEL(CC_USBCHARGE, "usbcharge") #if defined(CONFIG_USB_POWER_DELIVERY) || defined(CONFIG_USB_PD_TCPC) |