GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/ec: add IS_ENABLED() around Kconfig symbol references 

Change-Id: Ic2cdfa08cdae9f698eb2f8fa4c4ae061f1a7d903
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/20340
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Martin Roth 2017-06-24 14:09:38 -06:00
parent b3b114c28f
commit f5c3518f0e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ec/google/chromeec/acpi/ec.asl
View File

@ -56,7 +56,7 @@ Device (EC0)
TBMD, 1, // Tablet mode TBMD, 1, // Tablet mode
} }
#if CONFIG_EC_GOOGLE_CHROMEEC_ACPI_MEMMAP #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC_ACPI_MEMMAP)
OperationRegion (EMEM, EmbeddedControl, OperationRegion (EMEM, EmbeddedControl,
EC_ACPI_MEM_MAPPED_BEGIN, EC_ACPI_MEM_MAPPED_SIZE) EC_ACPI_MEM_MAPPED_BEGIN, EC_ACPI_MEM_MAPPED_SIZE)
Field (EMEM, ByteAcc, Lock, Preserve) Field (EMEM, ByteAcc, Lock, Preserve)

2
src/ec/google/chromeec/ec.c
View File

@ -466,7 +466,7 @@ u32 google_chromeec_get_wake_mask(void)
void google_chromeec_log_events(u32 mask) void google_chromeec_log_events(u32 mask)
{ {
#if CONFIG_ELOG #if IS_ENABLED(CONFIG_ELOG)
u8 event; u8 event;
u32 wake_mask; u32 wake_mask;

8
src/ec/google/chromeec/ec_lpc.c
View File

@ -38,7 +38,7 @@ static void read_bytes(u16 port, unsigned int length, u8 *dest, u8 *csum)
{ {
int i; int i;
#if CONFIG_EC_GOOGLE_CHROMEEC_MEC #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC_MEC)
/* Access desired range though EMI interface */ /* Access desired range though EMI interface */
if (port >= MEC_EMI_RANGE_START && port <= MEC_EMI_RANGE_END) { if (port >= MEC_EMI_RANGE_START && port <= MEC_EMI_RANGE_END) {
mec_io_bytes(0, port, length, dest, csum); mec_io_bytes(0, port, length, dest, csum);
@ -73,7 +73,7 @@ static void write_bytes(u16 port, unsigned int length, u8 *msg, u8 *csum)
{ {
int i; int i;
#if CONFIG_EC_GOOGLE_CHROMEEC_MEC #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC_MEC)
/* Access desired range though EMI interface */ /* Access desired range though EMI interface */
if (port >= MEC_EMI_RANGE_START && port <= MEC_EMI_RANGE_END) { if (port >= MEC_EMI_RANGE_START && port <= MEC_EMI_RANGE_END) {
mec_io_bytes(1, port, length, msg, csum); mec_io_bytes(1, port, length, msg, csum);
@ -124,7 +124,7 @@ static int google_chromeec_wait_ready(u16 port)
EC_LPC_CMDR_BUSY, 0); EC_LPC_CMDR_BUSY, 0);
} }
#if CONFIG_EC_GOOGLE_CHROMEEC_ACPI_MEMMAP #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC_ACPI_MEMMAP)
/* Read memmap data through ACPI port 66/62 */ /* Read memmap data through ACPI port 66/62 */
static int read_memmap(u8 *data, u8 offset) static int read_memmap(u8 *data, u8 offset)
{ {
@ -158,7 +158,7 @@ static int google_chromeec_command_version(void)
{ {
u8 id1, id2, flags; u8 id1, id2, flags;
#if CONFIG_EC_GOOGLE_CHROMEEC_ACPI_MEMMAP #if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC_ACPI_MEMMAP)
if (read_memmap(&id1, EC_MEMMAP_ID) || if (read_memmap(&id1, EC_MEMMAP_ID) ||
read_memmap(&id2, EC_MEMMAP_ID + 1) || read_memmap(&id2, EC_MEMMAP_ID + 1) ||
read_memmap(&flags, EC_MEMMAP_HOST_CMD_FLAGS)) { read_memmap(&flags, EC_MEMMAP_HOST_CMD_FLAGS)) {

2
src/ec/quanta/ene_kb3940q/ec.c
View File

@ -129,7 +129,7 @@ void ec_mem_write(u8 addr, u8 data)
#ifndef __SMM__ #ifndef __SMM__
static void ene_kb3940q_log_events(void) static void ene_kb3940q_log_events(void)
{ {
#if CONFIG_ELOG #if IS_ENABLED(CONFIG_ELOG)
u8 reason = ec_mem_read(EC_SHUTDOWN_REASON); u8 reason = ec_mem_read(EC_SHUTDOWN_REASON);
if (reason) if (reason)
elog_add_event_byte(ELOG_TYPE_EC_SHUTDOWN, reason); elog_add_event_byte(ELOG_TYPE_EC_SHUTDOWN, reason);