diff --git a/src/include/symbols.h b/src/include/symbols.h
index c35e19123b..b67286ac2d 100644
--- a/src/include/symbols.h
+++ b/src/include/symbols.h
@@ -71,7 +71,7 @@ DECLARE_REGION(bl31)
  * (Does not necessarily mean that the memory is accessible.) */
 static inline int preram_symbols_available(void)
 {
-	return !IS_ENABLED(CONFIG_CACHE_AS_RAM) || ENV_CACHE_AS_RAM;
+	return !CONFIG(CACHE_AS_RAM) || ENV_CACHE_AS_RAM;
 }
 
 #endif /* __SYMBOLS_H */
diff --git a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
index e34514679a..ec8f58ba16 100644
--- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
+++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c
@@ -264,8 +264,7 @@ static const struct pad_config gpio_table[] = {
 	/* H21 : GPPC_H_21 */
 	/* H22 : GPPC_H_22 */
 	PAD_CFG_GPI(GPP_H22, NONE, DEEP),
-#if IS_ENABLED(CONFIG_BOARD_INTEL_WHISKEYLAKE_RVP) || \
-		IS_ENABLED(CONFIG_BOARD_INTEL_COMETLAKE_RVP)
+#if CONFIG(BOARD_INTEL_WHISKEYLAKE_RVP) || CONFIG(BOARD_INTEL_COMETLAKE_RVP)
 	PAD_CFG_GPO(GPP_H22, 1, PLTRST),
 #else
 	PAD_CFG_GPI(GPP_H22, NONE, DEEP),
diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c
index 2688557d9b..b8dba184cb 100644
--- a/src/soc/intel/cannonlake/fsp_params.c
+++ b/src/soc/intel/cannonlake/fsp_params.c
@@ -64,7 +64,7 @@ static uint8_t get_param_value(const config_t *config, uint32_t dev_offset)
 	return PCH_SERIAL_IO_INDEX(config->SerialIoDevMode[dev_offset]);
 }
 
-#if IS_ENABLED(CONFIG_SOC_INTEL_COMETLAKE)
+#if CONFIG(SOC_INTEL_COMETLAKE)
 static void parse_devicetree_param(const config_t *config, FSP_S_CONFIG *params)
 {
 	uint32_t dev_offset = 0;
@@ -254,7 +254,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
 
 	/* Enable CNVi Wifi if enabled in device tree */
 	dev = dev_find_slot(0, PCH_DEVFN_CNViWIFI);
-#if IS_ENABLED(CONFIG_SOC_INTEL_COMETLAKE)
+#if CONFIG(SOC_INTEL_COMETLAKE)
 	params->CnviMode = dev->enabled;
 #else
 	params->PchCnviMode = dev->enabled;
diff --git a/src/soc/intel/cannonlake/include/soc/serialio.h b/src/soc/intel/cannonlake/include/soc/serialio.h
index 6c95356d4e..c92bd2d67a 100644
--- a/src/soc/intel/cannonlake/include/soc/serialio.h
+++ b/src/soc/intel/cannonlake/include/soc/serialio.h
@@ -17,7 +17,7 @@
 #ifndef _SERIALIO_H_
 #define _SERIALIO_H_
 
-#if IS_ENABLED(CONFIG_SOC_INTEL_COMETLAKE)
+#if CONFIG(SOC_INTEL_COMETLAKE)
 typedef enum {
 	PchSerialIoNotInitialized,
 	PchSerialIoDisabled,