From 356b519049e6d40e15b2e4a85cae654e2e8df8ba Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sat, 24 Jun 2017 21:53:37 -0600 Subject: mainboard/[g-l]: add IS_ENABLED() around Kconfig symbol references Change-Id: I1f906c8c465108017bc4d08534653233078ef32d Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/20343 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/mainboard/lippert/frontrunner/romstage.c | 2 +- src/mainboard/lippert/hurricane-lx/mainboard.c | 4 ++-- src/mainboard/lippert/hurricane-lx/romstage.c | 8 ++++---- src/mainboard/lippert/literunner-lx/mainboard.c | 2 +- src/mainboard/lippert/literunner-lx/romstage.c | 6 +++--- src/mainboard/lippert/roadrunner-lx/mainboard.c | 2 +- src/mainboard/lippert/roadrunner-lx/romstage.c | 2 +- src/mainboard/lippert/spacerunner-lx/mainboard.c | 2 +- src/mainboard/lippert/spacerunner-lx/romstage.c | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/mainboard/lippert') diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c index d44cbf3259..e7fcbda8da 100644 --- a/src/mainboard/lippert/frontrunner/romstage.c +++ b/src/mainboard/lippert/frontrunner/romstage.c @@ -50,7 +50,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) if (device != DIMM0) return 0xFF; /* No DIMM1, don't even try. */ -#if CONFIG_DEBUG_SMBUS +#if IS_ENABLED(CONFIG_DEBUG_SMBUS) if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF) { printk(BIOS_ERR, "ERROR: spd_read_byte(DIMM0, 0x%02x) " "returns 0xff\n", address); diff --git a/src/mainboard/lippert/hurricane-lx/mainboard.c b/src/mainboard/lippert/hurricane-lx/mainboard.c index 3d32113858..0f210cb200 100644 --- a/src/mainboard/lippert/hurricane-lx/mainboard.c +++ b/src/mainboard/lippert/hurricane-lx/mainboard.c @@ -25,7 +25,7 @@ #include /* Bit1 switches Com1 to RS485, bit2 same for Com2. */ -#if CONFIG_ONBOARD_UARTS_RS485 +#if IS_ENABLED(CONFIG_ONBOARD_UARTS_RS485) #define SIO_GP1X_CONFIG 0x06 #else #define SIO_GP1X_CONFIG 0x00 @@ -54,7 +54,7 @@ static void init(struct device *dev) outl(0x00000040, gpio_base + 0x04); // GPIO6 output 1 - LAN_PD# outl(0x00000400, gpio_base + 0x34); // GPIO10 in aux1 1 - THRM_ALRM# outl(0x00000400, gpio_base + 0x20); // GPIO10 input 1 - THRM_ALRM# -#if !CONFIG_BOARD_OLD_REVISION +#if !IS_ENABLED(CONFIG_BOARD_OLD_REVISION) outl(0x00000800, gpio_base + 0x94); // GPIO27 out aux2 1 - 32kHz outl(0x00000800, gpio_base + 0x84); // GPIO27 output 1 - 32kHz #endif diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c index b76960f95f..9d7b565da1 100644 --- a/src/mainboard/lippert/hurricane-lx/romstage.c +++ b/src/mainboard/lippert/hurricane-lx/romstage.c @@ -48,7 +48,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#if !CONFIG_BOARD_OLD_REVISION +#if !IS_ENABLED(CONFIG_BOARD_OLD_REVISION) /* Send config data to System Management Controller via SMB. */ static int smc_send_config(unsigned char config_data) { @@ -79,7 +79,7 @@ static const u16 sio_init_table[] = { // hi = data, lo = index 0x042C, // disable ATXPG; VIN6 enabled, FAN4/5 disabled, VIN7,VIN3 enabled 0x1423, // don't delay PoWeROK1/2 0x9072, // watchdog triggers PWROK, counts seconds -#if !CONFIG_USE_WATCHDOG_ON_BOOT +#if !IS_ENABLED(CONFIG_USE_WATCHDOG_ON_BOOT) 0x0073, 0x0074, // disarm watchdog by changing 56 s timeout to 0 #endif 0xBF25, 0x172A, 0xF326, // select GPIO function for most pins @@ -88,7 +88,7 @@ static const u16 sio_init_table[] = { // hi = data, lo = index 0x07C0, // enable Simple-I/O for GP12-10= RS485_EN2,1, WD_ACTIVE 0x06C8, // config GP12,11 as output, GP10 as input 0x2DF5, // map Hw Monitor Thermal Output to GP55 -#if CONFIG_BOARD_OLD_REVISION +#if IS_ENABLED(CONFIG_BOARD_OLD_REVISION) 0x1F2A, 0xC072, // switch GP13 to GPIO, WDT output from PWROK to KRST #endif }; @@ -132,7 +132,7 @@ void asmlinkage mainboard_romstage_entry(unsigned long bist) cpuRegInit(0, DIMM0, DIMM1, DRAM_TERMINATED); -#if !CONFIG_BOARD_OLD_REVISION +#if !IS_ENABLED(CONFIG_BOARD_OLD_REVISION) int err; /* bit0 = Spread Spectrum */ if ((err = smc_send_config(SMC_CONFIG))) { diff --git a/src/mainboard/lippert/literunner-lx/mainboard.c b/src/mainboard/lippert/literunner-lx/mainboard.c index e4084b5cbc..11f9e1420a 100644 --- a/src/mainboard/lippert/literunner-lx/mainboard.c +++ b/src/mainboard/lippert/literunner-lx/mainboard.c @@ -25,7 +25,7 @@ #include /* Bit0 turns off the Live LED, bit1 switches Com1 to RS485, bit2 same for Com2. */ -#if CONFIG_ONBOARD_UARTS_RS485 +#if IS_ENABLED(CONFIG_ONBOARD_UARTS_RS485) #define SIO_GP1X_CONFIG 0x07 #else #define SIO_GP1X_CONFIG 0x01 diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c index e83924cb71..1474ecd7db 100644 --- a/src/mainboard/lippert/literunner-lx/romstage.c +++ b/src/mainboard/lippert/literunner-lx/romstage.c @@ -38,7 +38,7 @@ #define GPIO_DEV PNP_DEV(0x2e, IT8712F_GPIO) /* Bit0 enables Spread Spectrum, bit1 makes on-board CF slot act as IDE slave. */ -#if CONFIG_ONBOARD_IDE_SLAVE +#if IS_ENABLED(CONFIG_ONBOARD_IDE_SLAVE) #define SMC_CONFIG 0x03 #else #define SMC_CONFIG 0x01 @@ -79,7 +79,7 @@ int spd_read_byte(unsigned int device, unsigned int address) if (device != DIMM0) return 0xFF; /* No DIMM1, don't even try. */ -#if CONFIG_DEBUG_SMBUS +#if IS_ENABLED(CONFIG_DEBUG_SMBUS) if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF) printk(BIOS_ERR, "ERROR: spd_read_byte(DIMM0, 0x%02x) " "returns 0xff\n", address); @@ -118,7 +118,7 @@ static const u16 sio_init_table[] = { // hi = data, lo = index 0x072C, // VIN6 enabled, FAN4/5 disabled, VIN7,VIN3 internal 0x1423, // don't delay PoWeROK1/2 0x9072, // watchdog triggers PWROK, counts seconds -#if !CONFIG_USE_WATCHDOG_ON_BOOT +#if !IS_ENABLED(CONFIG_USE_WATCHDOG_ON_BOOT) 0x0073, 0x0074, // disarm watchdog by changing 56 s timeout to 0 #endif 0xBF25, 0x172A, 0xF326, // select GPIO function for most pins diff --git a/src/mainboard/lippert/roadrunner-lx/mainboard.c b/src/mainboard/lippert/roadrunner-lx/mainboard.c index 1d35ebe464..b922e7872b 100644 --- a/src/mainboard/lippert/roadrunner-lx/mainboard.c +++ b/src/mainboard/lippert/roadrunner-lx/mainboard.c @@ -25,7 +25,7 @@ #include /* Bit1 switches Com1 to RS485, bit2 same for Com2, bit5 turns off the Live LED. */ -#if CONFIG_ONBOARD_UARTS_RS485 +#if IS_ENABLED(CONFIG_ONBOARD_UARTS_RS485) #define SIO_GP1X_CONFIG 0x26 #else #define SIO_GP1X_CONFIG 0x20 diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c index 6ba90d7773..8341178f82 100644 --- a/src/mainboard/lippert/roadrunner-lx/romstage.c +++ b/src/mainboard/lippert/roadrunner-lx/romstage.c @@ -55,7 +55,7 @@ static const u16 sio_init_table[] = { // hi = data, lo = index 0x1E2C, // disable ATXPG; VIN6,FAN4/5,VIN3 enabled, VIN7 internal 0x1423, // don't delay PoWeROK1/2 - triggers 2nd reset 0x9072, // watchdog triggers PWROK, counts seconds -#if !CONFIG_USE_WATCHDOG_ON_BOOT +#if !IS_ENABLED(CONFIG_USE_WATCHDOG_ON_BOOT) 0x0073, 0x0074, // disarm watchdog by changing 56 s timeout to 0 #endif 0xBF25, 0x372A, 0xF326, // select GPIO function for most pins diff --git a/src/mainboard/lippert/spacerunner-lx/mainboard.c b/src/mainboard/lippert/spacerunner-lx/mainboard.c index b0bc74e9f6..594545d146 100644 --- a/src/mainboard/lippert/spacerunner-lx/mainboard.c +++ b/src/mainboard/lippert/spacerunner-lx/mainboard.c @@ -25,7 +25,7 @@ #include /* Bit0 turns off the Live LED, bit1 switches Com1 to RS485, bit2 same for Com2. */ -#if CONFIG_ONBOARD_UARTS_RS485 +#if IS_ENABLED(CONFIG_ONBOARD_UARTS_RS485) #define SIO_GP1X_CONFIG 0x07 #else #define SIO_GP1X_CONFIG 0x01 diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c index c77d82f813..a73276edb0 100644 --- a/src/mainboard/lippert/spacerunner-lx/romstage.c +++ b/src/mainboard/lippert/spacerunner-lx/romstage.c @@ -38,7 +38,7 @@ #define GPIO_DEV PNP_DEV(0x2e, IT8712F_GPIO) /* Bit0 enables Spread Spectrum, bit1 makes on-board SSD act as IDE slave. */ -#if CONFIG_ONBOARD_IDE_SLAVE +#if IS_ENABLED(CONFIG_ONBOARD_IDE_SLAVE) #define SMC_CONFIG 0x03 #else #define SMC_CONFIG 0x01 @@ -79,7 +79,7 @@ int spd_read_byte(unsigned int device, unsigned int address) if (device != DIMM0) return 0xFF; /* No DIMM1, don't even try. */ -#if CONFIG_DEBUG_SMBUS +#if IS_ENABLED(CONFIG_DEBUG_SMBUS) if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF) { printk(BIOS_ERR, "ERROR: spd_read_byte(DIMM0, 0x%02x) " "returns 0xff\n", address); @@ -119,7 +119,7 @@ static const u16 sio_init_table[] = { // hi = data, lo = index 0x072C, // VIN6 enabled, FAN4/5 disabled, VIN7,VIN3 internal 0x1423, // don't delay PoWeROK1/2 0x9072, // watchdog triggers PWROK, counts seconds -#if !CONFIG_USE_WATCHDOG_ON_BOOT +#if !IS_ENABLED(CONFIG_USE_WATCHDOG_ON_BOOT) 0x0073, 0x0074, // disarm watchdog by changing 56 s timeout to 0 #endif 0xBF25, 0x172A, 0xF326, // select GPIO function for most pins -- cgit v1.2.3