From cd49cce7b70e80b4acc49b56bb2bb94370b4d867 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 5 Mar 2019 16:53:33 -0800 Subject: coreboot: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX) This patch is a raw application of find src/ -type f | xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g' Change-Id: I6262d6d5c23cabe23c242b4f38d446b74fe16b88 Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/c/coreboot/+/31774 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/include/device/device.h | 6 +++--- src/include/device/dram/common.h | 2 +- src/include/device/dram/ddr3.h | 2 +- src/include/device/early_smbus.h | 2 +- src/include/device/pci.h | 2 +- src/include/device/pci_ehci.h | 2 +- src/include/device/pci_mmio_cfg.h | 2 +- src/include/device/smbus.h | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/include/device') diff --git a/src/include/device/device.h b/src/include/device/device.h index 4c6706489a..2e2cda9d94 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -52,12 +52,12 @@ struct device_operations { void (*disable)(struct device *dev); void (*set_link)(struct device *dev, unsigned int link); void (*reset_bus)(struct bus *bus); -#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES) +#if CONFIG(GENERATE_SMBIOS_TABLES) int (*get_smbios_data)(struct device *dev, int *handle, unsigned long *current); void (*get_smbios_strings)(struct device *dev, struct smbios_type11 *t); #endif -#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) +#if CONFIG(HAVE_ACPI_TABLES) unsigned long (*write_acpi_tables)(struct device *dev, unsigned long start, struct acpi_rsdp *rsdp); void (*acpi_fill_ssdt_generator)(struct device *dev); @@ -158,7 +158,7 @@ extern struct bus *free_links; extern const char mainboard_name[]; -#if IS_ENABLED(CONFIG_GFXUMA) +#if CONFIG(GFXUMA) /* IGD UMA memory */ extern uint64_t uma_memory_base; extern uint64_t uma_memory_size; diff --git a/src/include/device/dram/common.h b/src/include/device/dram/common.h index 31cdb2bb5b..b1677c8a07 100644 --- a/src/include/device/dram/common.h +++ b/src/include/device/dram/common.h @@ -52,7 +52,7 @@ * disabled. * @{ */ -#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) +#if CONFIG(DEBUG_RAM_SETUP) #define printram(x, ...) printk(BIOS_DEBUG, x, ##__VA_ARGS__) #else #define printram(x, ...) diff --git a/src/include/device/dram/ddr3.h b/src/include/device/dram/ddr3.h index 5643787c01..0f9373e220 100644 --- a/src/include/device/dram/ddr3.h +++ b/src/include/device/dram/ddr3.h @@ -56,7 +56,7 @@ * disabled. * @{ */ -#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) +#if CONFIG(DEBUG_RAM_SETUP) #define printram(x, ...) printk(BIOS_DEBUG, x, ##__VA_ARGS__) #else #define printram(x, ...) diff --git a/src/include/device/early_smbus.h b/src/include/device/early_smbus.h index c9073967b1..651dc18fbf 100644 --- a/src/include/device/early_smbus.h +++ b/src/include/device/early_smbus.h @@ -52,7 +52,7 @@ /** * \brief printk macro for SMBus debugging */ -#if IS_ENABLED(CONFIG_DEBUG_SMBUS) +#if CONFIG(DEBUG_SMBUS) #define printsmbus(x, ...) printk(BIOS_DEBUG, x, ##__VA_ARGS__) #else #define printsmbus(x, ...) diff --git a/src/include/device/pci.h b/src/include/device/pci.h index c1aea43f78..2fefb39a92 100644 --- a/src/include/device/pci.h +++ b/src/include/device/pci.h @@ -15,7 +15,7 @@ #ifndef PCI_H #define PCI_H -#if IS_ENABLED(CONFIG_PCI) +#if CONFIG(PCI) #include #include diff --git a/src/include/device/pci_ehci.h b/src/include/device/pci_ehci.h index 146946ce75..6e5985448a 100644 --- a/src/include/device/pci_ehci.h +++ b/src/include/device/pci_ehci.h @@ -32,7 +32,7 @@ u8 *pci_ehci_base_regs(pci_devfn_t dev); void pci_ehci_dbg_set_port(pci_devfn_t dev, unsigned int port); #ifndef __PRE_RAM__ -#if !IS_ENABLED(CONFIG_USBDEBUG) +#if !CONFIG(USBDEBUG) #define pci_ehci_read_resources pci_dev_read_resources #else /* Relocation of EHCI Debug Port BAR diff --git a/src/include/device/pci_mmio_cfg.h b/src/include/device/pci_mmio_cfg.h index a13c18b2e1..aaa21813ce 100644 --- a/src/include/device/pci_mmio_cfg.h +++ b/src/include/device/pci_mmio_cfg.h @@ -69,7 +69,7 @@ void pci_mmio_write_config32(pci_devfn_t dev, unsigned int where, u32 value) write32(addr, value); } -#if IS_ENABLED(CONFIG_MMCONF_SUPPORT) +#if CONFIG(MMCONF_SUPPORT) /* Avoid name collisions as different stages have different signature * for these functions. The _s_ stands for simple, fundamental IO or diff --git a/src/include/device/smbus.h b/src/include/device/smbus.h index de6cf40c79..2953b25bbb 100644 --- a/src/include/device/smbus.h +++ b/src/include/device/smbus.h @@ -54,7 +54,7 @@ static inline int smbus_write_byte(struct device *const dev, u8 addr, u8 val) int smbus_block_read(struct device *dev, u8 cmd, u8 bytes, u8 *buffer); int smbus_block_write(struct device *dev, u8 cmd, u8 bytes, const u8 *buffer); -#if IS_ENABLED(CONFIG_SMBUS_HAS_AUX_CHANNELS) +#if CONFIG(SMBUS_HAS_AUX_CHANNELS) void smbus_switch_to_channel(uint8_t channel_number); uint8_t smbus_get_current_channel(void); #endif -- cgit v1.2.3