diff --git a/src/drivers/xpowers/Kconfig b/src/drivers/xpowers/Kconfig
deleted file mode 100644
index 3ac2748a03..0000000000
--- a/src/drivers/xpowers/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
-source src/drivers/xpowers/axp209/Kconfig
diff --git a/src/drivers/xpowers/Makefile.inc b/src/drivers/xpowers/Makefile.inc
deleted file mode 100644
index ef6dffca9d..0000000000
--- a/src/drivers/xpowers/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-$(CONFIG_DRIVER_XPOWERS_AXP209) += axp209
diff --git a/src/drivers/xpowers/axp209/Makefile.inc b/src/drivers/xpowers/axp209/Makefile.inc
index 5ac691e06d..e08a8e21a6 100644
--- a/src/drivers/xpowers/axp209/Makefile.inc
+++ b/src/drivers/xpowers/axp209/Makefile.inc
@@ -1,3 +1,7 @@
-bootblock-$(CONFIG_DRIVER_XPOWERS_AXP209_BOOTBLOCK)	+= axp209.c
-romstage-$(CONFIG_DRIVER_XPOWERS_AXP209)		+= axp209.c
-ramstage-$(CONFIG_DRIVER_XPOWERS_AXP209)		+= axp209.c
+ifeq ($(CONFIG_DRIVER_XPOWERS_AXP209),y)
+
+bootblock-$(CONFIG_DRIVER_XPOWERS_AXP209_BOOTBLOCK) += axp209.c
+romstage-y += axp209.c
+ramstage-y += axp209.c
+
+endif