diff --git a/configs/ipq807x_defconfig b/configs/ipq807x_defconfig
index 0bcd5f5c29..15363753cd 100644
--- a/configs/ipq807x_defconfig
+++ b/configs/ipq807x_defconfig
@@ -71,7 +71,6 @@ CONFIG_CMD_FLASH=y
 # CONFIG_CMD_I2C is not set
 # CONFIG_CMD_USB is not set
 CONFIG_CMD_FPGA=y
-CONFIG_CMD_MMC=y
 
 #
 # Shell scripting commands
@@ -194,9 +193,6 @@ CONFIG_SIMPLE_BUS=y
 # MMC Host controller Support
 #
 # CONFIG_DM_MMC is not set
-CONFIG_GENERIC_MMC=y
-CONFIG_SDHCI=y
-CONFIG_SDHCI_QCA=y
 
 #
 # NAND Device Support
diff --git a/include/configs/ipq807x.h b/include/configs/ipq807x.h
index bad69d47b6..c5c46c0a90 100644
--- a/include/configs/ipq807x.h
+++ b/include/configs/ipq807x.h
@@ -160,6 +160,10 @@ extern loff_t board_env_size;
 
 #ifdef CONFIG_QCA_MMC
 #define CONFIG_MMC
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_SDHCI
+#define CONFIG_SDHCI_QCA
 #define CONFIG_EFI_PARTITION
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV	0