From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3] pci: Move CONFIG_PCI_PNP to Kconfig
Date: Fri, 28 Oct 2016 07:13:37 -0400 [thread overview]
Message-ID: <1477653217-32415-1-git-send-email-trini@konsulko.com> (raw)
In-Reply-To: <1476686118-3594-1-git-send-email-bmeng.cn@gmail.com>
From: Bin Meng <bmeng.cn@gmail.com>
Introduce CONFIG_PCI_PNP in Kconfig and move over boards' defconfig
to use that.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
[trini: Re-generate configs and include/configs/ changes]
Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/bamboo_defconfig | 1 +
configs/gdppc440etx_defconfig | 1 +
configs/yellowstone_defconfig | 1 +
configs/yosemite_defconfig | 1 +
drivers/pci/Kconfig | 7 +++++++
include/configs/B4860QDS.h | 1 -
include/configs/BSC9132QDS.h | 2 --
include/configs/C29XPCIE.h | 2 --
include/configs/CPCI2DP.h | 1 -
include/configs/CPCI4052.h | 1 -
include/configs/M54455EVB.h | 1 -
include/configs/M5475EVB.h | 1 -
include/configs/M5485EVB.h | 1 -
include/configs/MIP405.h | 1 -
include/configs/MPC8308RDB.h | 2 --
include/configs/MPC8313ERDB.h | 1 -
include/configs/MPC8315ERDB.h | 2 --
include/configs/MPC8323ERDB.h | 1 -
include/configs/MPC832XEMDS.h | 1 -
include/configs/MPC8349EMDS.h | 1 -
include/configs/MPC8349ITX.h | 2 --
include/configs/MPC837XEMDS.h | 2 --
include/configs/MPC837XERDB.h | 1 -
include/configs/MPC8536DS.h | 3 ---
include/configs/MPC8540ADS.h | 3 ---
include/configs/MPC8541CDS.h | 1 -
include/configs/MPC8544DS.h | 2 --
include/configs/MPC8548CDS.h | 3 ---
include/configs/MPC8555CDS.h | 1 -
include/configs/MPC8560ADS.h | 3 ---
include/configs/MPC8568MDS.h | 3 ---
include/configs/MPC8569MDS.h | 3 ---
include/configs/MPC8572DS.h | 2 --
include/configs/MPC8610HPCD.h | 1 -
include/configs/MPC8641HPCN.h | 2 --
include/configs/P1010RDB.h | 2 --
include/configs/P1022DS.h | 1 -
include/configs/P1023RDB.h | 1 -
include/configs/P2041RDB.h | 1 -
include/configs/PIP405.h | 1 -
include/configs/PLU405.h | 1 -
include/configs/PMC405DE.h | 1 -
include/configs/PMC440.h | 1 -
include/configs/T102xQDS.h | 1 -
include/configs/T102xRDB.h | 1 -
include/configs/T1040QDS.h | 2 --
include/configs/T104xRDB.h | 2 --
include/configs/T208xQDS.h | 1 -
include/configs/T208xRDB.h | 1 -
include/configs/T4240RDB.h | 1 -
include/configs/TQM5200.h | 1 -
include/configs/TQM834x.h | 1 -
include/configs/UCP1020.h | 1 -
include/configs/a4m072.h | 1 -
include/configs/advantech_dms-ba16.h | 1 -
include/configs/apalis_t30.h | 1 -
include/configs/aria.h | 2 --
include/configs/bamboo.h | 1 -
include/configs/bayleybay.h | 2 --
include/configs/beaver.h | 1 -
include/configs/boston.h | 1 -
include/configs/bubinga.h | 1 -
include/configs/canyonlands.h | 1 -
include/configs/cardhu.h | 1 -
include/configs/cei-tk1-som.h | 1 -
include/configs/clearfog.h | 1 -
include/configs/conga-qeval20-qa3-e3845.h | 2 --
include/configs/controlcenterd.h | 1 -
include/configs/corenet_ds.h | 1 -
include/configs/cougarcanyon2.h | 2 --
include/configs/crownbay.h | 2 --
include/configs/cyrus.h | 1 -
include/configs/db-88f6820-amc.h | 1 -
include/configs/db-88f6820-gp.h | 1 -
include/configs/db-mv784mp-gp.h | 1 -
include/configs/dfi-bt700.h | 2 --
include/configs/digsy_mtc.h | 1 -
include/configs/galileo.h | 2 --
include/configs/gdppc440etx.h | 1 -
include/configs/ge_bx50v3.h | 1 -
include/configs/gw_ventana.h | 1 -
include/configs/hrcon.h | 2 --
include/configs/icon.h | 1 -
include/configs/inka4x0.h | 1 -
include/configs/integratorap.h | 1 -
include/configs/intip.h | 1 -
include/configs/ipek01.h | 1 -
include/configs/jetson-tk1.h | 1 -
include/configs/jupiter.h | 1 -
include/configs/katmai.h | 1 -
include/configs/kilauea.h | 1 -
include/configs/km/kmp204x-common.h | 1 -
include/configs/ls1012aqds.h | 1 -
include/configs/ls1012ardb.h | 1 -
include/configs/ls1021aqds.h | 1 -
include/configs/ls1021atwr.h | 1 -
include/configs/ls1043a_common.h | 1 -
include/configs/ls2080aqds.h | 1 -
include/configs/ls2080ardb.h | 1 -
include/configs/luan.h | 1 -
include/configs/makalu.h | 1 -
include/configs/malta.h | 1 -
include/configs/minnowmax.h | 1 -
include/configs/mpc5121ads.h | 2 --
include/configs/mpc8308_p1m.h | 2 --
include/configs/mx6sabresd.h | 1 -
include/configs/mx6sxsabresd.h | 1 -
include/configs/nitrogen6x.h | 1 -
include/configs/novena.h | 1 -
include/configs/o2dnt-common.h | 1 -
include/configs/p1_p2_rdb_pc.h | 1 -
include/configs/p1_twr.h | 1 -
include/configs/p2371-2180.h | 1 -
include/configs/p2771-0000.h | 1 -
include/configs/pcm030.h | 1 -
include/configs/qemu-ppce500.h | 1 -
include/configs/qemu-x86.h | 2 --
include/configs/r2dplus.h | 1 -
include/configs/r7780mp.h | 1 -
include/configs/sandbox.h | 1 -
include/configs/sbc8349.h | 2 --
include/configs/sbc8548.h | 3 ---
include/configs/sbc8641d.h | 2 --
include/configs/sequoia.h | 1 -
include/configs/sh7785lcr.h | 1 -
include/configs/socrates.h | 1 -
include/configs/som-6896.h | 2 --
include/configs/som-db5800-som-6867.h | 1 -
include/configs/strider.h | 2 --
include/configs/t3corp.h | 1 -
include/configs/t4qds.h | 1 -
include/configs/tbs2910.h | 1 -
include/configs/theadorable.h | 1 -
include/configs/trimslice.h | 1 -
include/configs/ve8313.h | 1 -
include/configs/vme8349.h | 1 -
include/configs/walnut.h | 1 -
include/configs/x86-chromebook.h | 2 --
include/configs/xpedite1000.h | 1 -
include/configs/xpedite517x.h | 1 -
include/configs/xpedite520x.h | 1 -
include/configs/xpedite537x.h | 1 -
include/configs/xpedite550x.h | 1 -
include/configs/yosemite.h | 1 -
include/configs/yucca.h | 1 -
include/configs/zc5202.h | 1 -
146 files changed, 11 insertions(+), 183 deletions(-)
diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig
index 0d00e24..e47d4ec 100644
--- a/configs/bamboo_defconfig
+++ b/configs/bamboo_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_SNTP=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
+# CONFIG_PCI_PNP is not set
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
diff --git a/configs/gdppc440etx_defconfig b/configs/gdppc440etx_defconfig
index 4f6d328..3fc9261 100644
--- a/configs/gdppc440etx_defconfig
+++ b/configs/gdppc440etx_defconfig
@@ -17,5 +17,6 @@ CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
+# CONFIG_PCI_PNP is not set
CONFIG_SYS_NS16550=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/yellowstone_defconfig b/configs/yellowstone_defconfig
index a00f47f..5b1e4bc 100644
--- a/configs/yellowstone_defconfig
+++ b/configs/yellowstone_defconfig
@@ -15,5 +15,6 @@ CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
+# CONFIG_PCI_PNP is not set
CONFIG_SYS_NS16550=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/yosemite_defconfig b/configs/yosemite_defconfig
index 08b6d66..0d15583 100644
--- a/configs/yosemite_defconfig
+++ b/configs/yosemite_defconfig
@@ -18,6 +18,7 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
+# CONFIG_PCI_PNP is not set
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 9a2745b..b8376b4 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -26,6 +26,13 @@ config DM_PCI_COMPAT
measure when porting a board to use driver model for PCI. Once the
board is fully supported, this option should be disabled.
+config PCI_PNP
+ bool "Enable Plug & Play support for PCI"
+ depends on PCI || DM_PCI
+ default y
+ help
+ Enable PCI memory and I/O space resource allocation and assignment.
+
config PCI_SANDBOX
bool "Sandbox PCI support"
depends on SANDBOX && DM_PCI
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 2ee9fae..5f8b99e 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -683,7 +683,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 430ba3a..0e0eefb 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -103,8 +103,6 @@
#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000 /* 64k */
#define CONFIG_SYS_PCIE1_IO_PHYS 0xC0010000
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
#endif
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 98c091e..41dde82 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -102,8 +102,6 @@
#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000 /* 64k */
#define CONFIG_SYS_PCIE1_IO_PHYS 0xfffc00000ull
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
#endif
diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h
index 2c0f5fe..55e48e2 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -107,7 +107,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
#define CONFIG_PCI_HOST PCI_HOST_AUTO /* select pci host function */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
/* resource configuration */
#define CONFIG_PCI_SCAN_SHOW /* print pci devices @ startup */
diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 1d7f5ac..fb6e0ef 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -125,7 +125,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
#define CONFIG_PCI_HOST PCI_HOST_AUTO /* select pci host function */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
/* resource configuration */
#define CONFIG_PCI_SCAN_SHOW /* print pci devices @ startup */
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index db5c7b8..abec373 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -172,7 +172,6 @@
/* PCI */
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
#define CONFIG_SYS_PCI_CACHE_LINE_SIZE 4
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 266e21d..3b40cd0 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -94,7 +94,6 @@
/* PCI */
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
#define CONFIG_SYS_PCI_CACHE_LINE_SIZE 8
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 7b078e8..2c18e98 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -91,7 +91,6 @@
/* PCI */
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
#define CONFIG_SYS_PCI_MEM_BUS 0x80000000
diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index f0b906d..f7fc652 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -159,7 +159,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
#define CONFIG_PCI_HOST PCI_HOST_FORCE /* configure as pci-host */
-#define CONFIG_PCI_PNP /* pci plug-and-play */
/* resource configuration */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x0000 /* PCI Vendor ID: to-do!!! */
#define CONFIG_SYS_PCI_SUBSYS_DEVICEID 0x0000 /* PCI Device ID: to-do!!! */
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 2cb59fc..6335c55 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -369,8 +369,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCIE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
#define CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES 1
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index f1c3478..4b0b352 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -393,7 +393,6 @@
#define CONFIG_SYS_PCI1_IO_PHYS 0xE2000000
#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000 /* 1M */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1057 /* Motorola */
/*
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index a500fd1..bd25c0b 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -360,8 +360,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCIE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_EEPRO100
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 7de40df..53f8a66 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -254,7 +254,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCI_SKIP_HOST_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#undef CONFIG_EEPRO100
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 5881e1f..12a47b2 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -338,7 +338,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index b31d4ff..12b1ce5 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -390,7 +390,6 @@
#undef PCI_ONE_PCI1
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 9860064..5f7eca0 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -399,8 +399,6 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_SYS_PCI2_IO_SIZE 0x01000000 /* 16M */
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#ifndef CONFIG_PCI_PNP
#define PCI_ENET0_IOADDR 0x00000000
#define PCI_ENET0_MEMADDR CONFIG_SYS_PCI2_MEM_BASE
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 0f3e01d..adc3193 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -381,8 +381,6 @@ extern int board_pci_host_broken(void);
#define CONFIG_USB_EHCI_FSL
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 82b5557..48e06af 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -395,7 +395,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index f1a5d32..0f29863 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -492,9 +492,6 @@
#define CONFIG_SYS_PCIE3_IO_SIZE 0x00010000 /* 64k */
#if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
/*PCIE video card used*/
#define VIDEO_IO_OFFSET CONFIG_SYS_PCIE3_IO_VIRT
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 207cfa5..af3e85e 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -255,9 +255,6 @@
#define CONFIG_SYS_PCI1_IO_SIZE 0x100000 /* 1M */
#if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 3f27c33..134add5 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -300,7 +300,6 @@ extern unsigned long get_clock_freq(void);
#if defined(CONFIG_PCI)
#define CONFIG_MPC85XX_PCI2
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 06fc1da..d868ce2 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -282,8 +282,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 589a031..fa114b3 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -403,9 +403,6 @@ extern unsigned long get_clock_freq(void);
#endif
#if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 9a8e1cf..908b7ed 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -296,7 +296,6 @@ extern unsigned long get_clock_freq(void);
#if defined(CONFIG_PCI)
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_MPC85XX_PCI2
#undef CONFIG_EEPRO100
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index e58987e..25227e5 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -250,9 +250,6 @@
#define CONFIG_SYS_PCI1_IO_SIZE 0x100000 /* 1M */
#if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 6ea2aa1..62f06db 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -314,9 +314,6 @@ extern unsigned long get_clock_freq(void);
#endif /* CONFIG_QE */
#if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index fb865eb..a2ec52b 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -424,9 +424,6 @@ extern unsigned long get_clock_freq(void);
#endif /* CONFIG_QE */
#if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index d94f763..d4be140 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -469,8 +469,6 @@
#define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 7c3fcb5..2529d8a 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -270,7 +270,6 @@
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_CMD_REGINFO
#define CONFIG_ULI526X
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 0461580..b35bbd4 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -350,8 +350,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 8d9b7e9..c45b091 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -198,8 +198,6 @@
#define CONFIG_SYS_PCIE2_IO_PHYS 0xffc10000
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
#endif
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 590aaec..6a4937b 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -492,7 +492,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#endif
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index 489075f..eba66ec 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -229,7 +229,6 @@ extern unsigned long get_clock_freq(void);
#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000 /* 64k */
#if defined(CONFIG_PCI)
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#endif /* CONFIG_PCI */
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 0edbb6f..350756b 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -541,7 +541,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 7362d2b..3dcb6ac 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -155,7 +155,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
#define CONFIG_PCI_HOST PCI_HOST_FORCE /* configure as pci-host */
-#define CONFIG_PCI_PNP /* pci plug-and-play */
/* resource configuration */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x0000 /* PCI Vendor ID: to-do!!! */
#define CONFIG_SYS_PCI_SUBSYS_DEVICEID 0x0000 /* PCI Device ID: to-do!!! */
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 5ef14a1..0967577 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -141,7 +141,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
#define CONFIG_PCI_HOST PCI_HOST_FORCE /* select pci host function */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
/* resource configuration */
#define CONFIG_PCI_SCAN_SHOW /* print pci devices @ startup */
diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index 961ed8e..d7af4e0 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -100,7 +100,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
#define CONFIG_PCI_HOST PCI_HOST_AUTO /* select pci host function */
-#define CONFIG_PCI_PNP /* do (not) pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index ea698f0..2e7f6e4 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -313,7 +313,6 @@
*----------------------------------------------------------------------*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP /* do (not) pci plug-and-play */
#define CONFIG_SYS_PCI_CACHE_LINE_SIZE 0 /* to avoid problems with PNP */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_TARGBASE 0x80000000 /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE */
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 7417ff4..c290101 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -630,7 +630,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_PCIE3_IO_SIZE 0x00010000 /* 64k */
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
#endif /* CONFIG_PCI */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 75ca1d2..5b233bc 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -648,7 +648,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_PCIE4_IO_SIZE 0x00010000 /* 64k */
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
#endif /* CONFIG_PCI */
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 20a30f4..ba1c38b 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -516,8 +516,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_PCIE4_IO_SIZE 0x00010000 /* 64k */
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
#endif /* CONFIG_PCI */
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index b0b8b09..7731809 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -632,8 +632,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
#define CONFIG_SYS_PCIE4_IO_SIZE 0x00010000 /* 64k */
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
#endif /* CONFIG_PCI */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index b680976..8702a45 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -599,7 +599,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
#endif
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 31e66b1..bca6a5b 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -536,7 +536,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata LSZ ADD */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
#endif
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index b94a26d..2fac19f 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -249,7 +249,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index eb03bc4..708eb76 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -76,7 +76,6 @@
* 0x50000000 - 0x50ffffff - PCI IO Space
*/
#if defined(CONFIG_CHARON) || defined(CONFIG_STK52XX)
-#define CONFIG_PCI_PNP 1
/* #define CONFIG_PCI_SCAN_SHOW 1 */
#define CONFIG_PCI_MEM_BUS 0x40000000
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 2191f91..68e5990 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -228,7 +228,6 @@
#if defined(CONFIG_PCI)
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
/* PCI1 host bridge */
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 1648c47..ce1cf97 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -390,7 +390,6 @@
#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc00000
#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000 /* 64k */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index 2544eee..b41ebe0 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -44,7 +44,6 @@
*/
#if defined(CONFIG_PCI)
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCI_SCAN_SHOW 1
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 0026163..df8ebfe 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -287,7 +287,6 @@
#undef CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 898c5c7..d38302d 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -43,7 +43,6 @@
#define CONFIG_USB_EHCI_TEGRA
/* PCI host support */
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
/* PCI networking support */
diff --git a/include/configs/aria.h b/include/configs/aria.h
index b08e90c..f385852 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -337,8 +337,6 @@
#define CONFIG_SYS_PCI_IO_PHYS 0x84000000
#define CONFIG_SYS_PCI_IO_SIZE 0x01000000 /* 16M */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#endif
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 9537f74..1b22a37 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -204,7 +204,6 @@
*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#undef CONFIG_PCI_PNP /* do (not) pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_TARGBASE 0x80000000 /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE*/
diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index 40b13d1..408c0f5 100644
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -16,8 +16,6 @@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_PCI_PNP
-
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \
"stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0"
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 1f25adf..ab1ab14 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -53,7 +53,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/boston.h b/include/configs/boston.h
index 829f92b..aad87c6 100644
--- a/include/configs/boston.h
+++ b/include/configs/boston.h
@@ -15,7 +15,6 @@
/*
* PCI
*/
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
/*
diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index 5e9d053..c989023 100644
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -136,7 +136,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
#define CONFIG_PCI_HOST PCI_HOST_FORCE /* select pci host function */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
/* resource configuration */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 1bd1bd6..1d189d2 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -405,7 +405,6 @@
*----------------------------------------------------------------------*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_PCI_CONFIG_HOST_BRIDGE
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 28cc7ab..462b784 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -56,7 +56,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 18ee207..f3bb279 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -54,7 +54,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 49d77ec..a8cda40 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -82,7 +82,6 @@
/* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_MVEBU
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#endif
diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 652e073..5ef999c 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -19,8 +19,6 @@
#define CONFIG_ARCH_EARLY_INIT_R
#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_PCI_PNP
-
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \
"stdout=serial\0" \
"stderr=serial\0"
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 3bddf88..5e1f1b0 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -233,7 +233,6 @@
*/
#define CONFIG_PCIE1 /* PCIE controller 1 (slot 1) */
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
#define CONFIG_CMD_PCI
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 2b98ca8..3807d45 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -554,7 +554,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h
index d20ad96..2e9fa07 100644
--- a/include/configs/cougarcanyon2.h
+++ b/include/configs/cougarcanyon2.h
@@ -14,8 +14,6 @@
#define CONFIG_SMSC_SIO1007
-#define CONFIG_PCI_PNP
-
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \
"stdout=serial,vga\0" \
"stderr=serial,vga\0"
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index 64ad736..55aa03b 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -19,8 +19,6 @@
#define CONFIG_SMSC_LPC47M
-#define CONFIG_PCI_PNP
-
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd,usbkbd\0" \
"stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0"
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index da103a4..4a11092 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -385,7 +385,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_NET_MULTI
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index 7112b13..4834828 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -63,7 +63,6 @@
/* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_MVEBU
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#endif
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 76370aa..72c38e2 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -83,7 +83,6 @@
/* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_MVEBU
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#endif
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index f35f096..26508c2 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -71,7 +71,6 @@
/* PCIe support */
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_MVEBU
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#endif
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 23d8a0a..75e1d1c 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -21,8 +21,6 @@
#undef CONFIG_SYS_NS16550_PORT_MAPPED
#endif
-#define CONFIG_PCI_PNP
-
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \
"stdout=serial\0" \
"stderr=serial\0"
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index a15f6ca..b2120b9 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -50,7 +50,6 @@
* 0x40000000 - 0x4fffffff - PCI Memory
* 0x50000000 - 0x50ffffff - PCI IO Space
*/
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCI_SCAN_SHOW 1
#define CONFIG_PCI_BOOTDELAY 250
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index 034142c..6d25035 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -21,8 +21,6 @@
/* ns16550 UART is memory-mapped in Quark SoC */
#undef CONFIG_SYS_NS16550_PORT_MAPPED
-#define CONFIG_PCI_PNP
-
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \
"stdout=serial\0" \
"stderr=serial\0"
diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h
index 8049b0a..12bf95f 100644
--- a/include/configs/gdppc440etx.h
+++ b/include/configs/gdppc440etx.h
@@ -156,7 +156,6 @@
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#undef CONFIG_PCI_PNP /* do (not) pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup*/
#define CONFIG_SYS_PCI_TARGBASE 0x80000000 /* PCIaddr mapped to \
CONFIG_SYS_PCI_MEMBASE*/
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index e28c235..b1c61e2 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -322,7 +322,6 @@
#undef CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 9658610..8f6d9bb 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -124,7 +124,6 @@
*/
#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCI_FIXUP_DEV
#define CONFIG_PCIE_IMX
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 57d6130..9677aab 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -477,8 +477,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCIE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
#define CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES 1
diff --git a/include/configs/icon.h b/include/configs/icon.h
index e76f009..b15016b 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -207,7 +207,6 @@
*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_PCI_CONFIG_HOST_BRIDGE
#define CONFIG_PCI_BOOTDELAY 1000 /* enable pci bootdelay variable*/
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 1afb8aa..79a716e 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -47,7 +47,6 @@
* 0x40000000 - 0x4fffffff - PCI Memory
* 0x50000000 - 0x50ffffff - PCI IO Space
*/
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCI_SCAN_SHOW 1
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index f550b73..1d1b8b3 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -45,7 +45,6 @@
*/
#define CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_TULIP
#define CONFIG_EEPRO100
diff --git a/include/configs/intip.h b/include/configs/intip.h
index 3ecf47d..e61005b 100644
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -289,7 +289,6 @@
*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_PCI_CONFIG_HOST_BRIDGE
#define CONFIG_PCI_DISABLE_PCIE
diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 343c5d5..3bd938e 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -63,7 +63,6 @@
* 0x40000000 - 0x4fffffff - PCI Memory
* 0x50000000 - 0x50ffffff - PCI IO Space
*/
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCI_SCAN_SHOW 1
#define CONFIG_PCI_MEM_BUS 0x40000000
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 50d846a..90e282f 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -50,7 +50,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 14ceff2..e073528 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -46,7 +46,6 @@
*/
#if defined(CONFIG_PCI)
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCI_SCAN_SHOW 1
#define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE 1
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 7c38ece..a41c127 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -215,7 +215,6 @@
*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP 1 /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */
#define CONFIG_PCI_CONFIG_HOST_BRIDGE
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index d081689..2254eca 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -391,7 +391,6 @@
* PCI stuff
*----------------------------------------------------------------------*/
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP 1 /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */
#define CONFIG_PCI_CONFIG_HOST_BRIDGE
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index c1c23bf..f557ee2 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -352,7 +352,6 @@ int get_scl(void);
#define CONFIG_PHY_MARVELL /* there is a marvell phy */
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index a8ffd6a..0cc1791 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -174,7 +174,6 @@
#define CONFIG_SYS_PCIE_MEM_SIZE 0x80000000 /* 128M */
#define CONFIG_NET_MULTI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_CMD_PCI
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 33ef198..15410dd 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -87,7 +87,6 @@
#define CONFIG_SYS_PCIE_MEM_SIZE 0x80000000 /* 128M */
#define CONFIG_NET_MULTI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_CMD_PCI
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 2da6fba..53f0368 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -522,7 +522,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_SYS_PCIE_MEM_SIZE 0x08000000 /* 128M */
#ifdef CONFIG_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_CMD_PCI
#endif
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 831b4db..4a579b1 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -395,7 +395,6 @@
#define CONFIG_SYS_PCIE_MEM_SIZE 0x08000000 /* 128M */
#ifdef CONFIG_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_CMD_PCI
#endif
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 8555d5b..64682b1 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -140,7 +140,6 @@
#ifdef CONFIG_PCI
#define CONFIG_NET_MULTI
-#define CONFIG_PCI_PNP
#define CONFIG_E1000
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_CMD_PCI
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index d9388e4..838568f 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -350,7 +350,6 @@ unsigned long get_board_ddr_clk(void);
#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */
#ifdef CONFIG_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_CMD_PCI
#endif
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 0fa431b..b9cb6d3 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -293,7 +293,6 @@ unsigned long get_board_sys_clk(void);
#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */
#ifdef CONFIG_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_CMD_PCI
#endif
diff --git a/include/configs/luan.h b/include/configs/luan.h
index 0eac45d..2ab6f58 100644
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -160,7 +160,6 @@
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP /* do (not) pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
/* Board-specific PCI */
diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index 2c7382c..7c358bc 100644
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -256,7 +256,6 @@
* PCI stuff
*----------------------------------------------------------------------*/
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP 1 /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */
#define CONFIG_PCI_CONFIG_HOST_BRIDGE
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 32f78a0..65cd321 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -17,7 +17,6 @@
#define CONFIG_PCI_GT64120
#define CONFIG_PCI_MSC01
-#define CONFIG_PCI_PNP
#define CONFIG_PCNET
#define CONFIG_PCNET_79C973
#define PCNET_HAS_PROM
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 935c88d..3aa22d2 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -19,7 +19,6 @@
#define CONFIG_SMSC_LPC47M
-#define CONFIG_PCI_PNP
#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,serial\0" \
"stdout=vidconsole,serial\0" \
"stderr=vidconsole,serial\0"
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index 3fc6566..c36141a 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -326,8 +326,6 @@
#define CONFIG_SYS_PCI_IO_PHYS 0x84000000
#define CONFIG_SYS_PCI_IO_SIZE 0x01000000 /* 16M */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#endif
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index f85b717..76667d7 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -330,8 +330,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCIE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
#define CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES 1
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 1664159..417eae1 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -29,7 +29,6 @@
#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 402a7d1..d423880 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -183,7 +183,6 @@
#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0)
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 14c179f..c22fed7 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -305,7 +305,6 @@
* PCI express
*/
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#endif
diff --git a/include/configs/novena.h b/include/configs/novena.h
index f79ad17..51b6687 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -110,7 +110,6 @@
/* PCI express */
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(3, 29)
diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
index f3a5f22..c51ea3d 100644
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -49,7 +49,6 @@
* 0x40000000 - 0x4fffffff - PCI Memory
* 0x50000000 - 0x50ffffff - PCI IO Space
*/
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCI_MEM_BUS 0x40000000
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 188f56b..523af52 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -712,7 +712,6 @@
#endif
#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000 /* 64k */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 995c227..ef32181 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -279,7 +279,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc00000
#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000 /* 64k */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index d834449..9cf697f 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -46,7 +46,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index ed3a980..67a1603 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -29,7 +29,6 @@
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
/* PCI host support */
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
#include "tegra-common-post.h"
diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 0d5217b..4fb9966 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -113,7 +113,6 @@ IPB Bus clocking configuration.
* 0x40000000 - 0x4fffffff - PCI Memory
* 0x50000000 - 0x50ffffff - PCI IO Space
* -----------------------------------------------------------------------*/
-#define CONFIG_PCI_PNP 1
#define CONFIG_PCI_SCAN_SHOW 1
#define CONFIG_PCI_MEM_BUS 0x40000000
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 2c9a4aa..a7f2a9d 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -117,7 +117,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index a2dd79b..4783563 100644
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -16,8 +16,6 @@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
#define CONFIG_ARCH_EARLY_INIT_R
-#define CONFIG_PCI_PNP
-
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \
"stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0"
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 753705d..477f035 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -90,7 +90,6 @@
*/
#define CONFIG_SH4_PCI
#define CONFIG_SH7751_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW 1
#define __io
#define __mem_pci
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index c422a0f..d4f200a 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -99,7 +99,6 @@
#define CONFIG_SH7780_PCI_LSR 0x07f00001
#define CONFIG_SH7780_PCI_LAR CONFIG_SYS_SDRAM_SIZE
#define CONFIG_SH7780_PCI_BAR CONFIG_SYS_SDRAM_SIZE
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW 1
#define __io
#define __mem_pci
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 31ab765..2daf02d 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -35,7 +35,6 @@
#define CONFIG_ANDROID_BOOT_IMAGE
#define CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_IO
#define CONFIG_FS_FAT
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 221ca32..ca1797d 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -330,8 +330,6 @@
#undef PCI_ONE_PCI1
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index ec9ad45..e9f9d30 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -461,9 +461,6 @@
#endif
#if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index ffc76f0..361c96c 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -296,8 +296,6 @@
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index fbfaadf..ed8a51c 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -272,7 +272,6 @@
*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_SYS_PCI_CACHE_LINE_SIZE 0 /* to avoid problems with PNP */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_TARGBASE 0x80000000 /* PCIaddr mapped to */
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 11a4cc0..a49e839 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -117,7 +117,6 @@
#define CONFIG_SH7780_PCI_LAR CONFIG_SYS_SDRAM_SIZE
#define CONFIG_SH7780_PCI_BAR CONFIG_SYS_SDRAM_SIZE
#endif
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW 1
#define CONFIG_PCI_MEM_BUS 0xFD000000 /* Memory space base addr */
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 35eb2ea..753ccfb 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -244,7 +244,6 @@
#define CONFIG_SYS_PCI1_IO_SIZE 0x01000000 /* 16M */
#if defined(CONFIG_PCI)
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#endif /* CONFIG_PCI */
diff --git a/include/configs/som-6896.h b/include/configs/som-6896.h
index d058603..b4a4fb0 100644
--- a/include/configs/som-6896.h
+++ b/include/configs/som-6896.h
@@ -20,8 +20,6 @@
#define CONFIG_SCSI_DEV_LIST \
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_AHCI}
-#define CONFIG_PCI_PNP
-
#define VIDEO_IO_OFFSET 0
#define CONFIG_X86EMU_RAW_IO
diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index a13be14..6235518 100644
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -18,7 +18,6 @@
#define CONFIG_ARCH_EARLY_INIT_R
#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_PCI_PNP
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \
"stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0"
diff --git a/include/configs/strider.h b/include/configs/strider.h
index e597546..6604cec 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -511,8 +511,6 @@ void fpga_control_clear(unsigned int bus, int pin);
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCIE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
-
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
#define CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES 1
diff --git a/include/configs/t3corp.h b/include/configs/t3corp.h
index 85f25b8..e0c7674 100644
--- a/include/configs/t3corp.h
+++ b/include/configs/t3corp.h
@@ -360,7 +360,6 @@
*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_PCI_CONFIG_HOST_BRIDGE
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index 2dca83f..0aba18b 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -213,7 +213,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 4d5fdc7..0dc4a28 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -85,7 +85,6 @@
/* PCI */
#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 57e1a21..281593a 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -86,7 +86,6 @@
#ifdef CONFIG_CMD_PCI
#ifndef CONFIG_SPL_BUILD
#define CONFIG_PCI_MVEBU
-#define CONFIG_PCI_PNP
#define CONFIG_BOARD_LATE_INIT /* for PEX switch test */
#endif
#endif
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 75a7650..cfc8451 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -49,7 +49,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_PCI_PNP
#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 5dcd13a..e293f12 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -268,7 +268,6 @@
#define CONFIG_SYS_PCI1_IO_PHYS 0xE2000000
#define CONFIG_SYS_PCI1_IO_SIZE 0x00100000 /* 1M */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957 /* Freescale */
#endif
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 78bf8ee..f1bd313 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -266,7 +266,6 @@
#ifndef VME_CADDY2
#endif
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#undef CONFIG_EEPRO100
#undef CONFIG_TULIP
diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index f18ba07..2edc0b0 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -94,7 +94,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
#define CONFIG_PCI_HOST PCI_HOST_FORCE /* select pci host function */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
/* resource configuration */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 4bcebfc..46a11ef 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -36,8 +36,6 @@
#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS
#define CONFIG_PCI_IO_SIZE 0xefff
-#define CONFIG_PCI_PNP
-
#define CONFIG_BIOSEMU
#define VIDEO_IO_OFFSET 0
#define CONFIG_X86EMU_RAW_IO
diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index 85a1745..bfe68f0 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -144,7 +144,6 @@ extern void out32(unsigned int, unsigned long);
*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_TARGBASE 0x80000000 /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE */
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 6843887..027440a 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -26,7 +26,6 @@
#define CONFIG_SYS_TEXT_BASE 0xfff00000
-#define CONFIG_PCI_PNP 1 /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */
#define CONFIG_PCIE1 1 /* PCIE controller 1 */
#define CONFIG_PCIE2 1 /* PCIE controller 2 */
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 1b5e834..d980c15 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -26,7 +26,6 @@
#define CONFIG_SYS_TEXT_BASE 0xfff80000
#endif
-#define CONFIG_PCI_PNP 1 /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */
#define CONFIG_PCI1 1 /* PCI controller 1 */
#define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index c60d54b..a82eef5 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -26,7 +26,6 @@
#define CONFIG_SYS_TEXT_BASE 0xfff80000
#endif
-#define CONFIG_PCI_PNP 1 /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */
#define CONFIG_PCIE1 1 /* PCIE controller 1 */
#define CONFIG_PCIE2 1 /* PCIE controller 2 */
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index bb5c266..973089b 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -27,7 +27,6 @@
#define CONFIG_SYS_TEXT_BASE 0xfff80000
#endif
-#define CONFIG_PCI_PNP 1 /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */
#define CONFIG_PCIE1 1 /* PCIE controller 1 (PEX8112 or XMC) */
#define CONFIG_FSL_PCI_INIT 1 /* Use common FSL init code */
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index 3788b3c..a355112 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -200,7 +200,6 @@
*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#undef CONFIG_PCI_PNP /* do (not) pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_TARGBASE 0x80000000 /* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE*/
diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index f90e904..0a3e4b3 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -182,7 +182,6 @@
*/
/* General PCI */
#define CONFIG_PCI_INDIRECT_BRIDGE /* indirect PCI bridge support */
-#define CONFIG_PCI_PNP 1 /* do pci plug-and-play */
#define CONFIG_PCI_SCAN_SHOW 1 /* show pci devices on startup */
#define CONFIG_PCI_CONFIG_HOST_BRIDGE
diff --git a/include/configs/zc5202.h b/include/configs/zc5202.h
index 1798fcc..c9a9c04 100644
--- a/include/configs/zc5202.h
+++ b/include/configs/zc5202.h
@@ -29,7 +29,6 @@
#define CONFIG_MV88E6352_SWITCH
#define CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
--
2.1.4
next prev parent reply other threads:[~2016-10-28 11:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-17 6:35 [U-Boot] [PATCH] pci: Move CONFIG_PCI_PNP to Kconfig Bin Meng
2016-10-17 11:50 ` Tom Rini
2016-10-25 1:08 ` Bin Meng
2016-10-25 1:09 ` Tom Rini
2016-10-28 11:13 ` Tom Rini [this message]
2016-10-28 13:07 ` [U-Boot] [PATCH v3] " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477653217-32415-1-git-send-email-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.