diff mbox

[U-Boot] pci: Move CONFIG_PCI_PNP to Kconfig

Message ID 1476686118-3594-1-git-send-email-bmeng.cn@gmail.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Bin Meng Oct. 17, 2016, 6:35 a.m. UTC 
Introduce CONFIG_PCI_PNP in Kconfig and move over boards' defconfig
to use that.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

---

Changes in v2:
- Change PCI_PNP to "depends on" and "default y" if PCI || DM_PCI

 drivers/pci/Kconfig                       | 7 +++++++
 include/configs/B4860QDS.h                | 1 -
 include/configs/BSC9132QDS.h              | 2 --
 include/configs/C29XPCIE.h                | 2 --
 include/configs/CPCI2DP.h                 | 2 --
 include/configs/CPCI4052.h                | 2 --
 include/configs/M54455EVB.h               | 1 -
 include/configs/M5475EVB.h                | 1 -
 include/configs/M5485EVB.h                | 1 -
 include/configs/MIP405.h                  | 2 --
 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                  | 2 --
 include/configs/PLU405.h                  | 2 --
 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                 | 2 --
 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                  | 2 --
 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 -
 142 files changed, 7 insertions(+), 190 deletions(-)

Comments

Tom Rini Oct. 17, 2016, 11:50 a.m. UTC | #1 
On Sun, Oct 16, 2016 at 11:35:18PM -0700, Bin Meng wrote:

> Introduce CONFIG_PCI_PNP in Kconfig and move over boards' defconfig
> to use that.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> 
> ---
> 
> Changes in v2:
> - Change PCI_PNP to "depends on" and "default y" if PCI || DM_PCI

Thanks!

[snip]
> diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
> index 9a7c187..5252250 100644
> --- a/drivers/pci/Kconfig
> +++ b/drivers/pci/Kconfig
> @@ -18,6 +18,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 if PCI || DM_PCI

This should just be default y since we depend on those two options
directly.  I'll just fix it up when applying.

Reviewed-by: Tom Rini <trini@konsulko.com>
Bin Meng Oct. 25, 2016, 1:08 a.m. UTC | #2 
Hi Tom,

On Mon, Oct 17, 2016 at 7:50 PM, Tom Rini <trini@konsulko.com> wrote:
> On Sun, Oct 16, 2016 at 11:35:18PM -0700, Bin Meng wrote:
>
>> Introduce CONFIG_PCI_PNP in Kconfig and move over boards' defconfig
>> to use that.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>>
>> ---
>>
>> Changes in v2:
>> - Change PCI_PNP to "depends on" and "default y" if PCI || DM_PCI
>
> Thanks!
>
> [snip]
>> diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
>> index 9a7c187..5252250 100644
>> --- a/drivers/pci/Kconfig
>> +++ b/drivers/pci/Kconfig
>> @@ -18,6 +18,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 if PCI || DM_PCI
>
> This should just be default y since we depend on those two options
> directly.  I'll just fix it up when applying.
>
> Reviewed-by: Tom Rini <trini@konsulko.com>
>

Will this be picked up for the v2016.11 release?

Regards,
Bin
Tom Rini Oct. 25, 2016, 1:09 a.m. UTC | #3 
On Tue, Oct 25, 2016 at 09:08:04AM +0800, Bin Meng wrote:
> Hi Tom,
> 
> On Mon, Oct 17, 2016 at 7:50 PM, Tom Rini <trini@konsulko.com> wrote:
> > On Sun, Oct 16, 2016 at 11:35:18PM -0700, Bin Meng wrote:
> >
> >> Introduce CONFIG_PCI_PNP in Kconfig and move over boards' defconfig
> >> to use that.
> >>
> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> >>
> >> ---
> >>
> >> Changes in v2:
> >> - Change PCI_PNP to "depends on" and "default y" if PCI || DM_PCI
> >
> > Thanks!
> >
> > [snip]
> >> diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
> >> index 9a7c187..5252250 100644
> >> --- a/drivers/pci/Kconfig
> >> +++ b/drivers/pci/Kconfig
> >> @@ -18,6 +18,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 if PCI || DM_PCI
> >
> > This should just be default y since we depend on those two options
> > directly.  I'll just fix it up when applying.
> >
> > Reviewed-by: Tom Rini <trini@konsulko.com>
> >
> 
> Will this be picked up for the v2016.11 release?

PCI itself needs to be fully migrated first, it exists in
arch/sandbox/Kconfig which is why this patch doesn't totally blow up,
but it does get a lot of build failures :)
diff mbox

Patch

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 9a7c187..5252250 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -18,6 +18,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 if PCI || DM_PCI
+	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 3ec1c2a..7da5ee9 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -687,7 +687,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 1c8a77b..539ae1a 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -104,8 +104,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 a909611..7277728 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -103,8 +103,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 2e9512a..a6d5306 100644
--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@@ -110,8 +110,6 @@ 
 #define CONFIG_PCI			/* include pci support	        */
 #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 6232059..a24325a 100644
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -126,8 +126,6 @@ 
 #define CONFIG_PCI			/* include pci support	        */
 #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 c7a9e13..731fc3e 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -173,7 +173,6 @@ 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI		1
-#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 be863ec..58e4270 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -95,7 +95,6 @@ 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI		1
-#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 cb2ef75..abfcf57 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -92,7 +92,6 @@ 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI		1
-#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 bf75209..8d95bf1 100644
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -167,8 +167,6 @@ 
 #define CONFIG_PCI			/* include pci support		*/
 #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!!!	*/
 #define CONFIG_SYS_PCI_PTM1LA	0x00000000	/* point to sdram		*/
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index c72d36a..4983359 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -370,8 +370,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 74a4c88..2ca34cd 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -394,7 +394,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 92b93cc..83f540f 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -361,8 +361,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 fea5472..440a5b9 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -256,7 +256,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 7b6e8c2..cf507fd 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -391,7 +391,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 c2f79a3..76a0783 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -400,8 +400,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 c109488..26dde89 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -397,7 +397,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 2fe8483..afbd7ec 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -493,9 +493,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 d568107..4cf7206 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -256,9 +256,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 5abf0f2..732c045 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -301,7 +301,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 c8fec70..98e3a8d 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -287,8 +287,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 275c26e..ef3e310 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -404,9 +404,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 b0a343d..297dcab 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -297,7 +297,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 2938a39..5f0b18b 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -251,9 +251,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 de2b4d8..ef94504 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -315,9 +315,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 a40ce90..5174de5 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -425,9 +425,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 e4d55d0..7269337 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -474,8 +474,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 26f8d91..ae419b0 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -275,7 +275,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 bcbccd8..133843b 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -351,8 +351,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 efdffc4..f9602cb 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -199,8 +199,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 9820eca..0dd698f 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -501,7 +501,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 1ae1471..fadd806 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -230,7 +230,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 814aba4..63da23e 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -542,7 +542,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 7d08f0c..12d54f7 100644
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -163,8 +163,6 @@ 
 #define CONFIG_PCI			/* include pci support		*/
 #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!!!	*/
 #define CONFIG_SYS_PCI_PTM1LA	0x00000000	/* point to sdram		*/
diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index e49e5ce..6aa8c58 100644
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -144,8 +144,6 @@ 
 #define CONFIG_PCI			/* include pci support	        */
 #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 d5e521e..bbfbc09 100644
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -102,7 +102,6 @@ 
 #define CONFIG_PCI		/* include pci support			*/
 #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 b765fac..d7a5a44 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -316,7 +316,6 @@ 
 /* General PCI */
 #define CONFIG_PCI		/* include pci support          */
 #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 f24e902..4bceac0 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -635,7 +635,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 b457184..265385e 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -645,7 +645,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 c2d0fac..1137f17 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -523,8 +523,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 5629584..2d2b653 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -600,8 +600,6 @@  $(SRCTREE)/board/freescale/t104xrdb/t1042d4_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 f654e2c..e5177b6 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -590,7 +590,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 cae6a3d..25daee8 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -535,7 +535,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 a0580a8..d48acef 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -250,7 +250,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 df12dc1..6c5d44c 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -78,7 +78,6 @@ 
  */
 #if defined(CONFIG_CHARON) || defined(CONFIG_STK52XX)
 #define CONFIG_PCI		1
-#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 85cef31..b53affd 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -229,7 +229,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 d62c9b3..3b516e8 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -395,7 +395,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 b5be7b2..2796a95 100644
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -46,7 +46,6 @@ 
 #define CONFIG_PCI
 
 #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 14a7c9d..1d610e9 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -294,7 +294,6 @@ 
 #undef CONFIG_CMD_PCI
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_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 3fc1779..35e3636 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -44,7 +44,6 @@ 
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
 /* PCI networking support */
diff --git a/include/configs/aria.h b/include/configs/aria.h
index 278676e..8bfa872 100644
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -343,8 +343,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 6d97755..3e2372d 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -205,7 +205,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support	        */
 #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 e5fda5c..4faca30 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -54,7 +54,6 @@ 
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
 /* General networking support */
diff --git a/include/configs/boston.h b/include/configs/boston.h
index 516fd04..01be105 100644
--- a/include/configs/boston.h
+++ b/include/configs/boston.h
@@ -16,7 +16,6 @@ 
  * PCI
  */
 #define CONFIG_PCI
-#define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
 /*
diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index 51d4624..f1145d7 100644
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -137,8 +137,6 @@ 
 #define CONFIG_PCI			/* include pci support	        */
 #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  */
 
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x10e8	/* AMCC */
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index aac36b1..254d2e5 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -406,7 +406,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support	        */
 #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 5943b04..1a9fde3 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -57,7 +57,6 @@ 
 
 /* PCI host support */
 #define CONFIG_PCI
-#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 aebb10a..decb3d7 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -55,7 +55,6 @@ 
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
 /* General networking support */
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 3990900..921b414 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -83,7 +83,6 @@ 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_PCI
 #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 fbe9c82..d653024 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -237,7 +237,6 @@ 
 #define CONFIG_PCI			/* Enable PCI/PCIE */
 #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 5353258..4d969dc 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -555,7 +555,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 fb0b277..f42316f 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -386,7 +386,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 a6d0221..89a18bd 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -64,7 +64,6 @@ 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_PCI
 #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 48b4b2e..8d3baf8 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -84,7 +84,6 @@ 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_PCI
 #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 c43dece..7409475 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -73,7 +73,6 @@ 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_PCI
 #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 1b7651f..f50b649 100644
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -51,7 +51,6 @@ 
  * 0x50000000 - 0x50ffffff - PCI IO Space
  */
 #define CONFIG_PCI		1
-#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 2845a80..44bdafe 100644
--- a/include/configs/gdppc440etx.h
+++ b/include/configs/gdppc440etx.h
@@ -157,7 +157,6 @@ 
 /* General PCI */
 #define CONFIG_PCI				/* include pci support        */
 #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 9db75f3..412d3a1 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -329,7 +329,6 @@ 
 #undef CONFIG_CMD_PCI
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_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 0b05876..8b10fb8 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -125,7 +125,6 @@ 
 #define CONFIG_CMD_PCI
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_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 99dcb75..efb8c5e 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -478,8 +478,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 7e9e7e6..fbd28c9 100644
--- a/include/configs/icon.h
+++ b/include/configs/icon.h
@@ -213,7 +213,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support		*/
 #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 0d66764..6d263f8 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -48,7 +48,6 @@ 
  * 0x50000000 - 0x50ffffff - PCI IO Space
  */
 #define CONFIG_PCI		1
-#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 e7d058f..9fceeb3 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -46,7 +46,6 @@ 
 
 #define CONFIG_PCI
 #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 5aa8fae..dd065f2 100644
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -290,7 +290,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support	        */
 #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 9181695..55d2c2e 100644
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -70,7 +70,6 @@ 
  * 0x50000000 - 0x50ffffff - PCI IO Space
  */
 #define CONFIG_PCI		1
-#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 26c629f..32ec8d8 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -51,7 +51,6 @@ 
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
 /* General networking support */
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index aaff553..9e3559e 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -47,7 +47,6 @@ 
 /*#define CONFIG_PCI		*/
 
 #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 e3fede5..8147658 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -216,7 +216,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support		*/
 #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 227504f..c28ca6a 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -394,7 +394,6 @@ 
  *----------------------------------------------------------------------*/
 #define CONFIG_PCI			/* include pci support	        */
 #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 6a7f929..e76d7ef 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -353,7 +353,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 54abf30..ac009d8 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -175,7 +175,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 0c13dde..a73a285 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -88,7 +88,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 eefd93d..5014751 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -530,7 +530,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 da07329..0b42ec1 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -403,7 +403,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 0fd69bf..6b34d9b 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -141,7 +141,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 c3870e1..082f7ee 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -351,7 +351,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 ee0f5fc..91f18e2 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -294,7 +294,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 e22d0e8..f5dadbe 100644
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -161,7 +161,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support	        */
 #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 dcfe3d7..369c2cc 100644
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -259,7 +259,6 @@ 
  *----------------------------------------------------------------------*/
 #define CONFIG_PCI			/* include pci support	        */
 #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 775c30a..e3368ce 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -18,7 +18,6 @@ 
 #define CONFIG_PCI
 #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 0511d03..f752606 100644
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -331,8 +331,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 3075cf0..10d238a 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -331,8 +331,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 5c2734d..e6e3484 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -30,7 +30,6 @@ 
 #define CONFIG_CMD_PCI
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_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 4c61999..335393e 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -184,7 +184,6 @@ 
 #define CONFIG_CMD_PCI
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_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 6ad4a3e..9b872d3 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -313,7 +313,6 @@ 
  */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_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 8cb0282..30d90df 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -112,7 +112,6 @@ 
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_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 4d79165..27dfa1f 100644
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -50,7 +50,6 @@ 
  * 0x50000000 - 0x50ffffff - PCI IO Space
  */
 #undef CONFIG_PCI
-#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 276a693..b15a77c 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -713,7 +713,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 f672ffe..6356f2c 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -280,7 +280,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 ffd26db..8c91920 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -47,7 +47,6 @@ 
 
 /* PCI host support */
 #define CONFIG_PCI
-#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 1f64405..7e52f99 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -30,7 +30,6 @@ 
 
 /* PCI host support */
 #define CONFIG_PCI
-#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 dce5c25..bf8edcf 100644
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -114,7 +114,6 @@  IPB Bus clocking configuration.
  * 0x50000000 - 0x50ffffff - PCI IO Space
  * -----------------------------------------------------------------------*/
 #define CONFIG_PCI			1
-#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 072859e..7f1c453 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -118,7 +118,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 1fc919b..01ca912 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -91,7 +91,6 @@ 
 #define CONFIG_PCI
 #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 bc01ae9..0e1e5a4 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -100,7 +100,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 94e024b..25f80d8 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -37,7 +37,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 248785d..21724a2 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -297,8 +297,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 ac783d3..4b5928e 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -276,7 +276,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support		*/
 #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 80e61a4..74bdade 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -121,7 +121,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 dc6878c..7259ef7 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -251,7 +251,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 5cd37d7..fff9ba8 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -512,8 +512,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 64e200e..d881459 100644
--- a/include/configs/t3corp.h
+++ b/include/configs/t3corp.h
@@ -361,7 +361,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support	        */
 #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 61ef25a..87cfbb8 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -214,7 +214,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 d877336..f8a9e1e 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -97,7 +97,6 @@ 
 #define CONFIG_CMD_PCI
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_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 d27ab9c..3fffdb1 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -88,7 +88,6 @@ 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_PCI
 #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 a4ca7c7..ef30c38 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -50,7 +50,6 @@ 
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 
 /* General networking support */
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 7304d79..bb0a856 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -269,7 +269,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 c4c66a5..8021a11 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -267,7 +267,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 d07b74f..0bc287a 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -95,8 +95,6 @@ 
 #define CONFIG_PCI			/* include pci support		*/
 #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	*/
 
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x10e8	/* AMCC */
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 1a4bd75..27c7105 100644
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -145,7 +145,6 @@  extern void out32(unsigned int, unsigned long);
 /* General PCI */
 #define CONFIG_PCI				/* include pci support */
 #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 571ded8..a9b42fa 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -27,7 +27,6 @@ 
 #define	CONFIG_SYS_TEXT_BASE	0xfff00000
 
 #define CONFIG_PCI		1	/* Enable PCI/PCIE */
-#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 273c6d4..e7c152b 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -27,7 +27,6 @@ 
 #endif
 
 #define CONFIG_PCI		1	/* Enable PCI/PCIE */
-#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 8d595c9..6d9be6f 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -27,7 +27,6 @@ 
 #endif
 
 #define CONFIG_PCI		1	/* Enable PCI/PCIE */
-#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 213dfa7..b5474c3 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -28,7 +28,6 @@ 
 #endif
 
 #define CONFIG_PCI		1	/* Enable PCI/PCIE */
-#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 0707768..d78d398 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -201,7 +201,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support	        */
 #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 76717e4..cfe54c9 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -183,7 +183,6 @@ 
 /* General PCI */
 #define CONFIG_PCI			/* include pci support		*/
 #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 073a42c..22e4095 100644
--- a/include/configs/zc5202.h
+++ b/include/configs/zc5202.h
@@ -30,7 +30,6 @@ 
 
 #define CONFIG_CMD_PCI
 #define CONFIG_PCI
-#define CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_PCIE_IMX