diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2016-10-16 23:35:18 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-28 07:13:52 -0400 |
| commit | c4762157cf49ae6556016267ec0a87d4aee9e572 (patch) | |
| tree | 7e83a8d3528952c72071b064cf62b94e451ffe70 | |
| parent | af27382e2d6f7b4966e6932c9820939259498c1b (diff) | |
| download | u-boot-c4762157cf49ae6556016267ec0a87d4aee9e572.tar.gz | |
pci: Move CONFIG_PCI_PNP to Kconfig
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>
146 files changed, 11 insertions, 183 deletions
diff --git a/configs/bamboo_defconfig b/configs/bamboo_defconfig index 0d00e24156..e47d4ecfe9 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 4f6d328acf..3fc9261b5e 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 a00f47f0de..5b1e4bc5ea 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 08b6d66473..0d15583ae5 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 9a2745b8c6..b8376b4f47 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 2ee9fae2ba..5f8b99e28a 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 430ba3a533..0e0eefb8b9 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 98c091ed84..41dde8213f 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 2c0f5fe2bb..55e48e24cb 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 1d7f5ac069..fb6e0ef473 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 db5c7b8dd3..abec3737a4 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 266e21d9a4..3b40cd00c8 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 7b078e8e31..2c18e98bfe 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 f0b906dc26..f7fc652b4e 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 2cb59fc409..6335c553c1 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 f1c3478e3b..4b0b35206c 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 a500fd1d8d..bd25c0b462 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 7de40dfda4..53f8a664c0 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 5881e1f54e..12a47b215f 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 b31d4ffe44..12b1ce5c08 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 986006450d..5f7eca05fa 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 0f3e01d015..adc3193c4f 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 82b5557a64..48e06af22a 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 f1a5d3235b..0f29863a96 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 207cfa52ef..af3e85e984 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 3f27c333fd..134add5a5d 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 06fc1daa57..d868ce2315 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 589a03154d..fa114b3f15 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 9a8e1cfae5..908b7eddd3 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 e58987efe5..25227e5bcb 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 6ea2aa12fe..62f06db3f3 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 fb865ebc14..a2ec52b730 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 d94f763002..d4be14007f 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 7c3fcb5682..2529d8a71e 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 0461580ca4..b35bbd4eb8 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 8d9b7e9d32..c45b091227 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 590aaec9f6..6a4937bf1e 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 489075fd88..eba66ec932 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 0edbb6f781..350756b6df 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 7362d2b0df..3dcb6acc17 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 5ef14a1d6b..0967577e47 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 961ed8ebf9..d7af4e008c 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 ea698f0bd8..2e7f6e4803 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 7417ff4d31..c290101101 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 75ca1d2efc..5b233bc70f 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 20a30f4800..ba1c38bf36 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 b0b8b09719..77318091df 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 b68097651f..8702a4512c 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 31e66b11b9..bca6a5b95c 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 b94a26d0a3..2fac19fc22 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 eb03bc45c3..708eb76638 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 2191f91a5d..68e59900c0 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 1648c47fd8..ce1cf97cf0 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 2544eee3f1..b41ebe0e59 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 0026163252..df8ebfe881 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 898c5c7dfb..d38302d6c4 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 b08e90c678..f385852cdc 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 9537f74594..1b22a3717e 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 40b13d19ed..408c0f52d9 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 1f25adf422..ab1ab14103 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 829f92b591..aad87c6f37 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 5e9d053239..c9890239b7 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 1bd1bd6ebb..1d189d22a1 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 28cc7abdb5..462b7841b6 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 18ee207c80..f3bb279b30 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 49d77ecdad..a8cda40f68 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 652e07323e..5ef999c674 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 3bddf88f75..5e1f1b0139 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 2b98ca883f..3807d456c7 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 d20ad96562..2e9fa075de 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 64ad736d8a..55aa03bead 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 da103a437d..4a11092687 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 7112b13747..483482844c 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 76370aa615..72c38e2407 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 f35f096b10..26508c2eac 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 23d8a0af69..75e1d1ce66 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 a15f6ca53a..b2120b9b33 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 034142cf7c..6d25035d13 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 8049b0a63e..12bf95f5dd 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 e28c2357b0..b1c61e2974 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 96586105a8..8f6d9bb873 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 57d61303ae..9677aab4b4 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 e76f009175..b15016b5a3 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 1afb8aa3e9..79a716e558 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 f550b7361c..1d1b8b31c2 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 3ecf47d866..e61005be1c 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 343c5d5268..3bd938efd9 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 50d846ac41..90e282feaf 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 14ceff26b9..e073528633 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 7c38ece05f..a41c127b08 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 d081689748..2254eca5a4 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 c1c23bf3ca..f557ee2117 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 a8ffd6abd8..0cc17910d3 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 33ef1984a6..15410ddfdf 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 2da6fba43d..53f0368814 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 831b4dbc48..4a579b1adb 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 8555d5b763..64682b1875 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 d9388e4f43..838568fd21 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 0fa431be84..b9cb6d3879 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 0eac45d43d..2ab6f58364 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 2c7382c25a..7c358bc8e8 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 32f78a0bb5..65cd3218a0 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 935c88df65..3aa22d2b52 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 3fc65667af..c36141a007 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 f85b71745a..76667d7703 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 166415988d..417eae1258 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 402a7d121c..d423880420 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 14c179f4bb..c22fed70a4 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 f79ad17677..51b668773c 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 f3a5f22cc0..c51ea3d689 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 188f56b6f4..523af5265f 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 995c227d97..ef32181277 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 d83444921a..9cf697f384 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 ed3a980de6..67a16039d1 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 0d5217b75d..4fb9966b44 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 2c9a4aa39d..a7f2a9dc9c 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 a2dd79b21c..4783563fc7 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 753705d8a8..477f035936 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 c422a0ff58..d4f200a516 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 31ab7652ab..2daf02dcfd 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 221ca328b7..ca1797d093 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 ec9ad45567..e9f9d30d52 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 ffc76f059a..361c96c0fb 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 fbfaadfade..ed8a51c663 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 11a4cc0c56..a49e839463 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 35eb2ea209..753ccfb01e 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 d058603b14..b4a4fb01d4 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 a13be14bbb..6235518bed 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 e597546ff7..6604cecdcb 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 85f25b846a..e0c7674989 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 2dca83fda7..0aba18b749 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 4d5fdc7869..0dc4a28a43 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 57e1a214f6..281593a3df 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 75a76501ed..cfc8451481 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 5dcd13ab83..e293f12b4e 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 78bf8eeb26..f1bd31328f 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 f18ba07c73..2edc0b0e8e 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 4bcebfc3e0..46a11ef7e4 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 85a1745a9d..bfe68f01d1 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 684388723f..027440ae93 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 1b5e834e35..d980c1515e 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 c60d54b307..a82eef5b32 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 bb5c266a51..973089b5a9 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 3788b3c6cc..a355112ab6 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 f90e904cc3..0a3e4b3bea 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 1798fcce26..c9a9c0456f 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 |