From 65822a5222457d9c53a2bf1822c9e3586e700c04 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 25 Jun 2017 11:49:10 -0600 Subject: src/vendorcode: add IS_ENABLED() around Kconfig symbol references Change-Id: I891cb4f799aaafcf4a0dd91b5533d2f8db7f3d61 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/20357 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/vendorcode/google/chromeos/chromeos.h | 6 +++--- src/vendorcode/google/chromeos/ramoops.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/vendorcode/google/chromeos') diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index e535751719..a739ab7b37 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -24,7 +24,7 @@ #include #include -#if CONFIG_CHROMEOS +#if IS_ENABLED(CONFIG_CHROMEOS) /* functions implemented in watchdog.c */ void mark_watchdog_tombstone(void); void reboot_from_watchdog(void); @@ -38,9 +38,9 @@ struct romstage_handoff; #include "gnvs.h" struct device; -#if CONFIG_CHROMEOS_RAMOOPS +#if IS_ENABLED(CONFIG_CHROMEOS_RAMOOPS) void chromeos_ram_oops_init(chromeos_acpi_t *chromeos); -#if CONFIG_CHROMEOS_RAMOOPS_DYNAMIC +#if IS_ENABLED(CONFIG_CHROMEOS_RAMOOPS_DYNAMIC) static inline void chromeos_reserve_ram_oops(struct device *dev, int idx) {} #else /* CONFIG_CHROMEOS_RAMOOPS_DYNAMIC */ void chromeos_reserve_ram_oops(struct device *dev, int idx); diff --git a/src/vendorcode/google/chromeos/ramoops.c b/src/vendorcode/google/chromeos/ramoops.c index 313025ddb7..c72af00c54 100644 --- a/src/vendorcode/google/chromeos/ramoops.c +++ b/src/vendorcode/google/chromeos/ramoops.c @@ -50,7 +50,7 @@ static void reserve_ram_oops_dynamic(chromeos_acpi_t *chromeos) set_ramoops(chromeos, ram_oops, size); } -#if CONFIG_CHROMEOS_RAMOOPS_DYNAMIC +#if IS_ENABLED(CONFIG_CHROMEOS_RAMOOPS_DYNAMIC) static inline void set_global_chromeos_pointer(chromeos_acpi_t *chromeos) {} #else /* !CONFIG_CHROMEOS_RAMOOPS_DYNAMIC */ -- cgit v1.2.3