scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-12 19:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

console_channel.inc: Add more ifdef to reduce number of channels

Browse Source 
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.

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>
This commit is contained in:
Nicolas Boichat
2018-05-23 13:54:06 +08:00
committed by chrome-bot
parent 920d4bc14b
commit b5cebbaadb
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/nocturne/board.c
View File

@@ -449,7 +449,7 @@ void board_reset_pd_mcu(void)
void board_rtc_reset(void)
{
cprints(CC_CHIPSET, "Asserting RTCRST# to PCH");
cprints(CC_SYSTEM, "Asserting RTCRST# to PCH");
gpio_set_level(GPIO_EC_PCH_RTCRST, 1);
udelay(100);
gpio_set_level(GPIO_EC_PCH_RTCRST, 0);

4
common/throttle_ap.c
View File

@@ -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. */

1
include/config.h
View File

@@ -3600,6 +3600,7 @@
*/
#ifndef HAS_TASK_CHIPSET
#undef CONFIG_AP_HANG_DETECT
#undef CONFIG_CHIPSET_APOLLOLAKE
#undef CONFIG_CHIPSET_BRASWELL
#undef CONFIG_CHIPSET_CANNONLAKE

10
include/console_channel.inc
View File

@@ -26,12 +26,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
@@ -46,8 +50,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
@@ -85,7 +93,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)

8
test/console_edit.c
View File

@@ -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(),