diff --git a/board/qca/arm/ipq807x/ipq807x.c b/board/qca/arm/ipq807x/ipq807x.c
index aa17e8cd19..86dfbbcf12 100644
--- a/board/qca/arm/ipq807x/ipq807x.c
+++ b/board/qca/arm/ipq807x/ipq807x.c
@@ -459,15 +459,19 @@ int board_mmc_init(bd_t *bis)
 
 void board_nand_init(void)
 {
+#ifdef CONFIG_QCA_SPI
 	int gpio_node;
+#endif
 
 	qpic_nand_init();
 
+#ifdef CONFIG_QCA_SPI
 	gpio_node = fdt_path_offset(gd->fdt_blob, "/spi/spi_gpio");
 	if (gpio_node >= 0) {
 		qca_gpio_init(gpio_node);
 		ipq_spi_init(CONFIG_IPQ_SPI_NOR_INFO_IDX);
 	}
+#endif
 }
 
 static void pcie_clock_init(int id)
@@ -526,6 +530,7 @@ static void pcie_clock_deinit(int id)
 	}
 }
 
+#ifdef CONFIG_PCI_IPQ
 void board_pci_init(int id)
 {
 	int node, gpio_node;
@@ -576,7 +581,9 @@ void board_pci_deinit()
 
 	return ;
 }
+#endif
 
+#ifdef CONFIG_USB_XHCI_IPQ
 void board_usb_deinit(int id)
 {
 	void __iomem *boot_clk_ctl, *usb_bcr, *qusb2_phy_bcr;
@@ -868,6 +875,7 @@ int ipq_board_usb_init(void)
 	}
 	return 0;
 }
+#endif
 
 void ipq_fdt_fixup_socinfo(void *blob)
 {
diff --git a/board/qca/arm/ipq807x/ipq807x.h b/board/qca/arm/ipq807x/ipq807x.h
index 58c222fe5b..a1ceef5f83 100644
--- a/board/qca/arm/ipq807x/ipq807x.h
+++ b/board/qca/arm/ipq807x/ipq807x.h
@@ -236,7 +236,9 @@ extern const char *del_node[];
 extern const add_node_t add_node[];
 
 void reset_crashdump(void);
+#ifdef CONFIG_PCI_IPQ
 void board_pci_init(int id);
+#endif
 void ipq_fdt_fixup_socinfo(void *blob);
 int ipq_board_usb_init(void);
 
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