From 62bbd1cd7626e6f59c5447b8f55dd8d4243349b7 Mon Sep 17 00:00:00 2001 From: Mary Ruthven Date: Mon, 22 Nov 2021 14:15:01 -0600 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3296743 Reviewed-by: Andrey Pronin Commit-Queue: Andrey Pronin --- include/config.h | 1 - include/console_channel.inc | 10 ---------- 2 files changed, 11 deletions(-) (limited to 'include') 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) -- cgit v1.2.1