diff --git a/common/autoboot.c b/common/autoboot.c
index 3407fcd3d5..806ca2a234 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -429,7 +429,7 @@ void autoboot_command(const char *s)
 	puts("\nNet:   ");
 	eth_initialize();
 #endif
-#if defined(CONFIG_IPQ9574)
+#ifdef CONFIG_IPQ_PCI_INIT_DEFER
 	pci_init();
 #endif
 }
diff --git a/common/board_r.c b/common/board_r.c
index eeb5caf944..ed12ce9a9c 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -249,7 +249,7 @@ static int initr_unlock_ram_in_cache(void)
 #ifdef CONFIG_PCI
 static int initr_pci(void)
 {
-#if !defined(CONFIG_DM_PCI) && !defined(CONFIG_IPQ9574)
+#if !defined(CONFIG_DM_PCI) && !defined(CONFIG_IPQ_PCI_INIT_DEFER)
 	pci_init();
 #endif
 
diff --git a/include/configs/ipq5332.h b/include/configs/ipq5332.h
index d717b46be9..fa4262e646 100644
--- a/include/configs/ipq5332.h
+++ b/include/configs/ipq5332.h
@@ -351,6 +351,7 @@ extern loff_t board_env_size;
 #define CONFIG_PCI
 #define CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
+#define CONFIG_IPQ_PCI_INIT_DEFER
 #endif
 
 /*
diff --git a/include/configs/ipq9574.h b/include/configs/ipq9574.h
index 0d9ee30e35..c44fdc9cf3 100644
--- a/include/configs/ipq9574.h
+++ b/include/configs/ipq9574.h
@@ -184,6 +184,7 @@ extern loff_t board_env_size;
 #define CONFIG_PCI
 #define CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
+#define CONFIG_IPQ_PCI_INIT_DEFER
 #endif
 
 /*