diff options
| author | Nicolas Boichat <drinkcat@chromium.org> | 2018-05-23 13:54:06 +0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-06-01 06:22:05 +0000 |
| commit | 29db6c1226288ea3eca333503a0d4a70c2729388 (patch) | |
| tree | 2c9e1dd2fad77adf163087101602927f1e505c5f | |
| parent | 795c889d419e555803f6cd215c07bd208e250753 (diff) | |
| download | chrome-ec-29db6c1226288ea3eca333503a0d4a70c2729388.tar.gz | |
console_channel.inc: Add more ifdef to reduce number of channels
There are still more ifdef than can be added: this just takes out
the low hanging fruits.
BRANCH=poppy
BUG=b:35647963
TEST=make buildall -j, see that we gain from 0 to 64 bytes on many
boards.
Conflicts:
board/nocturne/board.c => Does not exist on FW branch
Change-Id: Ibe85b8bfa5d5c22c160e4a6656104256067beee9
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1070948
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1080582
| -rw-r--r-- | common/throttle_ap.c | 4 | ||||
| -rw-r--r-- | include/config.h | 1 | ||||
| -rw-r--r-- | include/console_channel.inc | 10 | ||||
| -rw-r--r-- | test/console_edit.c | 8 |
4 files changed, 17 insertions, 6 deletions
diff --git a/common/throttle_ap.c b/common/throttle_ap.c index ef11302881..209948a482 100644 --- a/common/throttle_ap.c +++ b/common/throttle_ap.c @@ -14,8 +14,8 @@ #include "util.h" /* Console output macros */ -#define CPUTS(outstr) cputs(CC_CHIPSET, outstr) -#define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args) +#define CPUTS(outstr) cputs(CC_THERMAL, outstr) +#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args) /*****************************************************************************/ /* This enforces the virtual OR of all throttling sources. */ diff --git a/include/config.h b/include/config.h index 6993264c3d..8c12e53715 100644 --- a/include/config.h +++ b/include/config.h @@ -3458,6 +3458,7 @@ */ #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 b8412cf335..113c8ca11d 100644 --- a/include/console_channel.inc +++ b/include/console_channel.inc @@ -23,12 +23,16 @@ 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 @@ -43,8 +47,12 @@ CONSOLE_CHANNEL(CC_HOSTCMD, "hostcmd") CONSOLE_CHANNEL(CC_I2C, "i2c") #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 @@ -82,7 +90,9 @@ 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) diff --git a/test/console_edit.c b/test/console_edit.c index b6ca3cad6e..5a1b8d4d76 100644 --- a/test/console_edit.c +++ b/test/console_edit.c @@ -254,8 +254,8 @@ static int test_output_channel(void) UART_INJECT("chan 0\n"); msleep(30); test_capture_console(1); - cprintf(CC_CHARGER, "shouldn't see this\n"); - cputs(CC_CHIPSET, "shouldn't see this either\n"); + cprintf(CC_SYSTEM, "shouldn't see this\n"); + cputs(CC_TASK, "shouldn't see this either\n"); cflush(); test_capture_console(0); TEST_ASSERT(compare_multiline_string(test_get_captured_console(), @@ -263,8 +263,8 @@ static int test_output_channel(void) UART_INJECT("chan restore\n"); msleep(30); test_capture_console(1); - cprintf(CC_CHARGER, "see me\n"); - cputs(CC_CHIPSET, "me as well\n"); + cprintf(CC_SYSTEM, "see me\n"); + cputs(CC_TASK, "me as well\n"); cflush(); test_capture_console(0); TEST_ASSERT(compare_multiline_string(test_get_captured_console(), |