diff options
| author | Martin Roth <martinroth@google.com> | 2017-06-24 21:53:37 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-07-06 00:19:56 +0000 |
| commit | 356b519049e6d40e15b2e4a85cae654e2e8df8ba (patch) | |
| tree | 734c42399af1d7ee2f25588e2bd962922e514f0a /src/mainboard/lippert/hurricane-lx | |
| parent | f95911ad3765c0f94db241b0c95a6c0a8c608077 (diff) | |
mainboard/[g-l]: add IS_ENABLED() around Kconfig symbol references
Change-Id: I1f906c8c465108017bc4d08534653233078ef32d
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/20343
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/lippert/hurricane-lx')
| -rw-r--r-- | src/mainboard/lippert/hurricane-lx/mainboard.c | 4 | ||||
| -rw-r--r-- | src/mainboard/lippert/hurricane-lx/romstage.c | 8 |
2 files changed, 6 insertions, 6 deletions
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 <device/pci_ids.h> /* 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))) { |