diff --git a/src/southbridge/amd/agesa/hudson/spi.c b/src/southbridge/amd/agesa/hudson/spi.c
index 013bb21a08..573dd3d0d0 100644
--- a/src/southbridge/amd/agesa/hudson/spi.c
+++ b/src/southbridge/amd/agesa/hudson/spi.c
@@ -25,7 +25,7 @@
 #include <device/pci.h>
 #include <device/pci_ops.h>
 
-#if defined (CONFIG_HUDSON_IMC_FWM)
+#if IS_ENABLED (CONFIG_HUDSON_IMC_FWM)
 #include <Proc/Fch/FchPlatform.h>
 
 static int bus_claimed = 0;
@@ -138,7 +138,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout,
 }
 int spi_claim_bus(struct spi_slave *slave)
 {
-#if defined (CONFIG_HUDSON_IMC_FWM)
+#if IS_ENABLED (CONFIG_HUDSON_IMC_FWM)
 
 	if (slave->rw == SPI_WRITE_FLAG) {
 		bus_claimed++;
@@ -152,7 +152,7 @@ int spi_claim_bus(struct spi_slave *slave)
 
 void spi_release_bus(struct spi_slave *slave)
 {
-#if defined (CONFIG_HUDSON_IMC_FWM)
+#if IS_ENABLED (CONFIG_HUDSON_IMC_FWM)
 
 	if (slave->rw == SPI_WRITE_FLAG)  {
 		bus_claimed--;
diff --git a/src/southbridge/amd/cimx/sb800/spi.c b/src/southbridge/amd/cimx/sb800/spi.c
index 3b2f5562cc..a1cdf5565a 100644
--- a/src/southbridge/amd/cimx/sb800/spi.c
+++ b/src/southbridge/amd/cimx/sb800/spi.c
@@ -25,7 +25,7 @@
 #include <device/pci.h>
 #include <device/pci_ops.h>
 
-#if defined (CONFIG_SB800_IMC_FWM)
+#if IS_ENABLED (CONFIG_SB800_IMC_FWM)
 #include "SBPLATFORM.h"
 #include <vendorcode/amd/cimx/sb800/ECfan.h>
 
@@ -98,7 +98,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout,
 	return 0;
 }
 
-#if defined (CONFIG_SB800_IMC_FWM)
+#if IS_ENABLED (CONFIG_SB800_IMC_FWM)
 
 static void ImcSleep(void)
 {
@@ -130,7 +130,7 @@ static void ImcWakeup(void)
 
 int spi_claim_bus(struct spi_slave *slave)
 {
-#if defined (CONFIG_SB800_IMC_FWM)
+#if IS_ENABLED (CONFIG_SB800_IMC_FWM)
 
 	if (slave->rw == SPI_WRITE_FLAG) {
 		bus_claimed++;
@@ -144,7 +144,7 @@ int spi_claim_bus(struct spi_slave *slave)
 
 void spi_release_bus(struct spi_slave *slave)
 {
-#if defined (CONFIG_SB800_IMC_FWM)
+#if IS_ENABLED (CONFIG_SB800_IMC_FWM)
 
 	if (slave->rw == SPI_WRITE_FLAG)  {
 		bus_claimed--;