Martin Roth has uploaded this change for review. ( https://review.coreboot.org/20340
Change subject: src/ec: add IS_ENABLED() around Kconfig symbol references ......................................................................
src/ec: add IS_ENABLED() around Kconfig symbol references
Change-Id: Ic2cdfa08cdae9f698eb2f8fa4c4ae061f1a7d903 Signed-off-by: Martin Roth martinroth@google.com --- M src/ec/google/chromeec/acpi/ec.asl M src/ec/google/chromeec/ec.c M src/ec/google/chromeec/ec_lpc.c M src/ec/quanta/ene_kb3940q/ec.c 4 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/20340/1
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index 43520f7..a532492 100644 --- a/src/ec/google/chromeec/acpi/ec.asl +++ b/src/ec/google/chromeec/acpi/ec.asl @@ -56,7 +56,7 @@ TBMD, 1, // Tablet mode }
-#if CONFIG_EC_GOOGLE_CHROMEEC_ACPI_MEMMAP +#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC_ACPI_MEMMAP) OperationRegion (EMEM, EmbeddedControl, EC_ACPI_MEM_MAPPED_BEGIN, EC_ACPI_MEM_MAPPED_SIZE) Field (EMEM, ByteAcc, Lock, Preserve) diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c index e622410..de17495 100644 --- a/src/ec/google/chromeec/ec.c +++ b/src/ec/google/chromeec/ec.c @@ -466,7 +466,7 @@
void google_chromeec_log_events(u32 mask) { -#if CONFIG_ELOG +#if IS_ENABLED(CONFIG_ELOG) u8 event; u32 wake_mask;
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c index 9ead8c8..42a18e4 100644 --- a/src/ec/google/chromeec/ec_lpc.c +++ b/src/ec/google/chromeec/ec_lpc.c @@ -38,7 +38,7 @@ { int i;
-#if CONFIG_EC_GOOGLE_CHROMEEC_MEC +#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC_MEC) /* Access desired range though EMI interface */ if (port >= MEC_EMI_RANGE_START && port <= MEC_EMI_RANGE_END) { mec_io_bytes(0, port, length, dest, csum); @@ -73,7 +73,7 @@ { int i;
-#if CONFIG_EC_GOOGLE_CHROMEEC_MEC +#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC_MEC) /* Access desired range though EMI interface */ if (port >= MEC_EMI_RANGE_START && port <= MEC_EMI_RANGE_END) { mec_io_bytes(1, port, length, msg, csum); @@ -124,7 +124,7 @@ 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 */ static int read_memmap(u8 *data, u8 offset) { @@ -158,7 +158,7 @@ { 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) || read_memmap(&id2, EC_MEMMAP_ID + 1) || read_memmap(&flags, EC_MEMMAP_HOST_CMD_FLAGS)) { diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c index 8558d3d..b25a51b 100644 --- a/src/ec/quanta/ene_kb3940q/ec.c +++ b/src/ec/quanta/ene_kb3940q/ec.c @@ -129,7 +129,7 @@ #ifndef __SMM__ static void ene_kb3940q_log_events(void) { -#if CONFIG_ELOG +#if IS_ENABLED(CONFIG_ELOG) u8 reason = ec_mem_read(EC_SHUTDOWN_REASON); if (reason) elog_add_event_byte(ELOG_TYPE_EC_SHUTDOWN, reason);