diff options
| -rw-r--r-- | src/vendorcode/amd/agesa/f10/Include/Ids.h | 2 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/chromeos.h | 6 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/ramoops.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/vendorcode/amd/agesa/f10/Include/Ids.h b/src/vendorcode/amd/agesa/f10/Include/Ids.h index 2607b3dd43..df3ddc0d16 100644 --- a/src/vendorcode/amd/agesa/f10/Include/Ids.h +++ b/src/vendorcode/amd/agesa/f10/Include/Ids.h @@ -400,7 +400,7 @@ typedef enum { //vv- for debug reference only #define IDS_HDT_CONSOLE_INIT(x) #define IDS_HDT_CONSOLE_EXIT(x) #ifdef __GNUC__ - #if CONFIG_REDIRECT_IDS_HDT_CONSOLE_TO_SERIAL + #if IS_ENABLED(CONFIG_REDIRECT_IDS_HDT_CONSOLE_TO_SERIAL) #define IDS_HDT_CONSOLE(s, args...) do_printk(BIOS_DEBUG, s, ##args) ///#define IDS_HDT_CONSOLE(f, s, args...) printk(((MEM_FLOW) - (f) + (BIOS_DEBUG)), s, ##args) #else 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 <vboot/misc.h> #include <vboot/vboot_common.h> -#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 */ |