summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-08-04 16:34:34 -0600
committerTom Rini <trini@konsulko.com>2017-08-11 15:41:50 -0400
commit6500ec7a5a2a2a59128dba6f49d9905fc1258811 (patch)
tree0280685798d10699e77ebaa07e3ec35a8b7a0f70 /include/configs
parentba7cc6c6c5c667f8510824cb0c47ea7ab3865de4 (diff)
downloadu-boot-6500ec7a5a2a2a59128dba6f49d9905fc1258811.tar.gz
Convert CONFIG_CMD_PCI to Kconfig
This converts the following to Kconfig: CONFIG_CMD_PCI Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/B4860QDS.h4
-rw-r--r--include/configs/BSC9132QDS.h2
-rw-r--r--include/configs/C29XPCIE.h2
-rw-r--r--include/configs/M5235EVB.h3
-rw-r--r--include/configs/M54455EVB.h3
-rw-r--r--include/configs/M5475EVB.h6
-rw-r--r--include/configs/M5485EVB.h6
-rw-r--r--include/configs/MPC8308RDB.h1
-rw-r--r--include/configs/MPC8313ERDB.h1
-rw-r--r--include/configs/MPC8315ERDB.h1
-rw-r--r--include/configs/MPC8323ERDB.h4
-rw-r--r--include/configs/MPC832XEMDS.h4
-rw-r--r--include/configs/MPC8349EMDS.h4
-rw-r--r--include/configs/MPC8349ITX.h4
-rw-r--r--include/configs/MPC837XEMDS.h4
-rw-r--r--include/configs/MPC837XERDB.h4
-rw-r--r--include/configs/MPC8536DS.h4
-rw-r--r--include/configs/MPC8540ADS.h4
-rw-r--r--include/configs/MPC8541CDS.h4
-rw-r--r--include/configs/MPC8544DS.h4
-rw-r--r--include/configs/MPC8548CDS.h4
-rw-r--r--include/configs/MPC8555CDS.h4
-rw-r--r--include/configs/MPC8560ADS.h4
-rw-r--r--include/configs/MPC8568MDS.h4
-rw-r--r--include/configs/MPC8569MDS.h4
-rw-r--r--include/configs/MPC8572DS.h4
-rw-r--r--include/configs/MPC8610HPCD.h4
-rw-r--r--include/configs/MPC8641HPCN.h4
-rw-r--r--include/configs/P1010RDB.h2
-rw-r--r--include/configs/P1022DS.h4
-rw-r--r--include/configs/P1023RDB.h4
-rw-r--r--include/configs/P2041RDB.h4
-rw-r--r--include/configs/T102xQDS.h4
-rw-r--r--include/configs/T102xRDB.h4
-rw-r--r--include/configs/T1040QDS.h4
-rw-r--r--include/configs/T104xRDB.h4
-rw-r--r--include/configs/T208xQDS.h4
-rw-r--r--include/configs/T208xRDB.h4
-rw-r--r--include/configs/T4240RDB.h4
-rw-r--r--include/configs/TQM834x.h7
-rw-r--r--include/configs/UCP1020.h2
-rw-r--r--include/configs/advantech_dms-ba16.h1
-rw-r--r--include/configs/apalis-tk1.h1
-rw-r--r--include/configs/apalis_t30.h1
-rw-r--r--include/configs/beaver.h1
-rw-r--r--include/configs/boston.h1
-rw-r--r--include/configs/cardhu.h1
-rw-r--r--include/configs/cei-tk1-som.h1
-rw-r--r--include/configs/clearfog.h1
-rw-r--r--include/configs/controlcenterd.h1
-rw-r--r--include/configs/controlcenterdc.h1
-rw-r--r--include/configs/corenet_ds.h4
-rw-r--r--include/configs/cyrus.h4
-rw-r--r--include/configs/db-88f6820-amc.h1
-rw-r--r--include/configs/db-88f6820-gp.h1
-rw-r--r--include/configs/db-mv784mp-gp.h5
-rw-r--r--include/configs/ds414.h1
-rw-r--r--include/configs/ge_bx50v3.h1
-rw-r--r--include/configs/gw_ventana.h1
-rw-r--r--include/configs/hrcon.h1
-rw-r--r--include/configs/integratorap.h2
-rw-r--r--include/configs/jetson-tk1.h1
-rw-r--r--include/configs/km/km83xx-common.h4
-rw-r--r--include/configs/km/kmp204x-common.h1
-rw-r--r--include/configs/ls1012aqds.h1
-rw-r--r--include/configs/ls1012ardb.h1
-rw-r--r--include/configs/ls1021aiot.h1
-rw-r--r--include/configs/ls1021aqds.h1
-rw-r--r--include/configs/ls1021atwr.h1
-rw-r--r--include/configs/ls1043a_common.h1
-rw-r--r--include/configs/ls1046a_common.h1
-rw-r--r--include/configs/ls2080aqds.h1
-rw-r--r--include/configs/ls2080ardb.h1
-rw-r--r--include/configs/malta.h1
-rw-r--r--include/configs/mpc8308_p1m.h1
-rw-r--r--include/configs/mvebu_armada-8k.h1
-rw-r--r--include/configs/mx6sabresd.h1
-rw-r--r--include/configs/mx6sxsabresd.h1
-rw-r--r--include/configs/novena.h1
-rw-r--r--include/configs/p1_p2_rdb_pc.h2
-rw-r--r--include/configs/p1_twr.h2
-rw-r--r--include/configs/p2371-2180.h1
-rw-r--r--include/configs/p2771-0000.h1
-rw-r--r--include/configs/qemu-ppce500.h4
-rw-r--r--include/configs/r2dplus.h1
-rw-r--r--include/configs/r7780mp.h1
-rw-r--r--include/configs/sandbox.h2
-rw-r--r--include/configs/sbc8349.h4
-rw-r--r--include/configs/sbc8548.h4
-rw-r--r--include/configs/sbc8641d.h4
-rw-r--r--include/configs/sh7785lcr.h1
-rw-r--r--include/configs/socrates.h4
-rw-r--r--include/configs/strider.h1
-rw-r--r--include/configs/t4qds.h4
-rw-r--r--include/configs/tbs2910.h1
-rw-r--r--include/configs/theadorable.h3
-rw-r--r--include/configs/trimslice.h1
-rw-r--r--include/configs/turris_omnia.h1
-rw-r--r--include/configs/ve8313.h1
-rw-r--r--include/configs/vining_2000.h1
-rw-r--r--include/configs/vme8349.h4
-rw-r--r--include/configs/x86-common.h1
-rw-r--r--include/configs/xpedite517x.h1
-rw-r--r--include/configs/xpedite520x.h1
-rw-r--r--include/configs/xpedite537x.h1
-rw-r--r--include/configs/xpedite550x.h1
-rw-r--r--include/configs/zc5202.h1
107 files changed, 0 insertions, 258 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 90296cdb3e..fe04a1f72a 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -694,10 +694,6 @@ unsigned long get_board_ddr_clk(void);
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* USB
*/
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 04a505398a..35ebdd28b3 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -77,8 +77,6 @@
#define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */
#define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
-#define CONFIG_CMD_PCI
-
/*
* PCI Windows
* Memory space is mapped 1-1, but I/O space must start from 0.
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 962bf4aa4c..466bab4823 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -77,8 +77,6 @@
#define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */
#define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
-#define CONFIG_CMD_PCI
-
/*
* PCI Windows
* Memory space is mapped 1-1, but I/O space must start from 0.
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 57328c6269..dac2a32383 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -33,9 +33,6 @@
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
-/* Command line configuration */
-#define CONFIG_CMD_PCI
-
#define CONFIG_MCFFEC
#ifdef CONFIG_MCFFEC
# define CONFIG_MII 1
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 8702b89174..f83aa13ecf 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -35,9 +35,6 @@
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
-/* Command line configuration */
-#undef CONFIG_CMD_PCI
-
/* Network configuration */
#define CONFIG_MCFFEC
#ifdef CONFIG_MCFFEC
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 9dca52e78a..b51d69568a 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -25,9 +25,6 @@
#undef CONFIG_HW_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
-/* Command line configuration */
-#define CONFIG_CMD_PCI
-
#define CONFIG_SLTTMR
#define CONFIG_FSLDMAFEC
@@ -68,9 +65,6 @@
#ifdef CONFIG_CMD_USB
# define CONFIG_USB_OHCI_NEW
-# ifndef CONFIG_CMD_PCI
-# define CONFIG_CMD_PCI
-# endif
# define CONFIG_PCI_OHCI
# undef CONFIG_SYS_USB_OHCI_BOARD_INIT
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index d95be2bd5e..56af0e3a5f 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -25,9 +25,6 @@
#undef CONFIG_HW_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
-/* Command line configuration */
-#define CONFIG_CMD_PCI
-
#define CONFIG_SLTTMR
#define CONFIG_FSLDMAFEC
@@ -67,9 +64,6 @@
#ifdef CONFIG_CMD_USB
# define CONFIG_USB_OHCI_NEW
-# ifndef CONFIG_CMD_PCI
-# define CONFIG_CMD_PCI
-# endif
/*# define CONFIG_PCI_OHCI*/
# define CONFIG_SYS_USB_OHCI_REGS_BASE 0x80041000
# define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15
diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 25d5cab959..8460b814ad 100644
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -415,7 +415,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index d666f960b6..3a031a833a 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -463,7 +463,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 69107ca12d..28f7a289b7 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -442,7 +442,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index b8f8f493eb..7f99bd2888 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -319,10 +319,6 @@
* Command line configuration.
*/
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 428f3abf90..6ead1db0b3 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -403,10 +403,6 @@
* Command line configuration.
*/
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 18f7523692..0b965e2a6b 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -462,10 +462,6 @@
* Command line configuration.
*/
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index cb83d07494..952aa61058 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -485,10 +485,6 @@ boards, we say we have two, but don't display a message if we find only one. */
#if defined(CONFIG_SATA_SIL3114) || defined(CONFIG_USB_STORAGE)
#endif
-#ifdef CONFIG_PCI
- #define CONFIG_CMD_PCI
-#endif
-
/* Watchdog */
#undef CONFIG_WATCHDOG /* watchdog disabled */
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index f6afa9dcc9..d29ff91032 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -465,10 +465,6 @@ extern int board_pci_host_broken(void);
* Command line configuration.
*/
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index d93f7a0074..11bd0c3f95 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -479,10 +479,6 @@
* Command line configuration.
*/
-#if defined(CONFIG_PCI)
-#define CONFIG_CMD_PCI
-#endif
-
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 6b9c25f0c9..e3a89164b1 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -583,10 +583,6 @@
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
-#define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
#ifdef CONFIG_MMC
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index ca4ccd8ad3..6add793595 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -314,10 +314,6 @@
* Command line configuration.
*/
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 977454167d..3867b31e23 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -343,10 +343,6 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 12bcb02e5f..16b7b990c1 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -347,10 +347,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
/*
* USB
*/
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index c18bf6744d..3e63c7442d 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -461,10 +461,6 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index d31395cf81..3dc24bd74e 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -341,10 +341,6 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 2e13fb52df..8b8be2da0e 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -354,10 +354,6 @@
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#if defined(CONFIG_ETHER_ON_FCC)
#endif
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index c0af7451b8..e6b1ea982f 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -356,10 +356,6 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 716bb069b3..6f2fa4939a 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -448,10 +448,6 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
#ifdef CONFIG_MMC
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 49c6e7fdee..60e4154a4e 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -545,10 +545,6 @@
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
-#define CONFIG_CMD_PCI
-#endif
-
/*
* USB
*/
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 5e8211609a..807624e2ce 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -426,10 +426,6 @@
* Command line configuration.
*/
-#if defined(CONFIG_PCI)
-#define CONFIG_CMD_PCI
-#endif
-
#define CONFIG_WATCHDOG /* watchdog enabled */
#define CONFIG_SYS_WATCHDOG_FREQ 5000 /* Feed interval, 5s */
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 7b9b2458b3..b74ef38513 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -587,10 +587,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 2dee5ac01c..82fc6b9070 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -140,8 +140,6 @@
#define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */
#define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
-#define CONFIG_CMD_PCI
-
/*
* PCI Windows
* Memory space is mapped 1-1, but I/O space must start from 0.
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 0fab00f069..0c4e288ffb 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -585,10 +585,6 @@
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* USB
*/
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index 3cc5033954..f79e43ad46 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -241,10 +241,6 @@ extern unsigned long get_clock_freq(void);
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
-#define CONFIG_CMD_PCI
-#endif
-
/*
* USB
*/
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index ef7563d415..64698177c1 100644
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -570,10 +570,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
* Command line configuration.
*/
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* USB
*/
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 767cd229a8..4439b65f84 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -772,10 +772,6 @@ unsigned long get_board_ddr_clk(void);
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 9c575a9b96..2dd7050f65 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -783,10 +783,6 @@ unsigned long get_board_ddr_clk(void);
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 8bf32cd9f3..f59143e3dc 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -651,10 +651,6 @@ unsigned long get_board_ddr_clk(void);
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 49e88b23c8..b56e475c14 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -766,10 +766,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index f6b8f0b4dc..dcc78280ea 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -737,10 +737,6 @@ unsigned long get_board_ddr_clk(void);
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 6ab7a126cc..a7a7873f51 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -683,10 +683,6 @@ unsigned long get_board_ddr_clk(void);
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 4a2ed6a407..88da31c883 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -271,10 +271,6 @@
* Command line configuration.
*/
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index c216ac2d47..aab8b5d9f2 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -270,13 +270,6 @@
#define CONFIG_BOOTP_HOSTNAME
/*
- * Command line configuration.
- */
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
-/*
* Miscellaneous configurable options
*/
#define CONFIG_SYS_LONGHELP /* undef to save memory */
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 75770f9241..350870a074 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -352,8 +352,6 @@
#define CONFIG_SYS_PCIE1_IO_PHYS 0xffc00000
#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000 /* 64k */
-#define CONFIG_CMD_PCI
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#endif /* CONFIG_PCI */
diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 6d40eb4854..6329bf69c1 100644
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -268,7 +268,6 @@
#define CONFIG_PWM_IMX
#define CONFIG_IMX6_PWM_PER_CLK 66000000
-#undef CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index d6b226c425..f750d5fbf9 100644
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -39,7 +39,6 @@
/* PCI host support */
#undef CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
/* PCI networking support */
#define CONFIG_E1000_NO_NVM
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index daa3be0999..c814c73b40 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -35,7 +35,6 @@
#define CONFIG_USB_EHCI_TEGRA
/* PCI host support */
-#define CONFIG_CMD_PCI
/* PCI networking support */
#define CONFIG_E1000_NO_NVM
diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 6afa1e8c04..2385173a6a 100644
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -45,7 +45,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/boston.h b/include/configs/boston.h
index 2646cf09ed..86dd0433c8 100644
--- a/include/configs/boston.h
+++ b/include/configs/boston.h
@@ -20,7 +20,6 @@
/*
* PCI
*/
-#define CONFIG_CMD_PCI
/*
* Memory map
diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index a490d06619..834bab073c 100644
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -49,7 +49,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h
index 768669ff12..4bb0f9e094 100644
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -44,7 +44,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index bd80222149..5061f6c6fd 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -24,7 +24,6 @@
/*
* Commands configuration
*/
-#define CONFIG_CMD_PCI
/* I2C */
#define CONFIG_SYS_I2C
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 08def6251a..6a26f066e8 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -220,7 +220,6 @@
#define CONFIG_PCI_INDIRECT_BRIDGE
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */
-#define CONFIG_CMD_PCI
#define CONFIG_FSL_PCI_INIT /* Use common FSL init code */
#define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 021150ed61..979bb98850 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -33,7 +33,6 @@
* Commands configuration
*/
#define CONFIG_CMD_I2C
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_SCSI
#define CONFIG_CMD_SPI
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 668dd060a7..39318078de 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -584,10 +584,6 @@
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* USB
*/
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index cdabbac561..02a73f4578 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -408,10 +408,6 @@
*/
#define CONFIG_CMD_REGINFO
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* USB
*/
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index 864222955f..b0e988d234 100644
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -24,7 +24,6 @@
/*
* Commands configuration
*/
-#define CONFIG_CMD_PCI
/* SPI NOR flash default params, used by sf commands */
#define CONFIG_SF_DEFAULT_BUS 1
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 4a9d2f75bf..44fd968d3b 100644
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -24,7 +24,6 @@
/*
* Commands configuration
*/
-#define CONFIG_CMD_PCI
/* I2C */
#define CONFIG_SYS_I2C
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 7174f6b40e..4a5be6188f 100644
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -22,11 +22,6 @@
#define CONFIG_SYS_TEXT_BASE 0x00800000
#define CONFIG_SYS_TCLK 250000000 /* 250MHz */
-/*
- * Commands configuration
- */
-#define CONFIG_CMD_PCI
-
/* I2C */
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MVTWSI
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index c1e9346290..f5998b4a52 100644
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -48,7 +48,6 @@
/* PCIe support */
#ifndef CONFIG_SPL_BUILD
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_PCI_ENUM
#define CONFIG_PCI_MVEBU
#define CONFIG_PCI_SCAN_SHOW
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index cc2b78677c..d090cddd24 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -298,7 +298,6 @@
#define CONFIG_PWM_IMX
#define CONFIG_IMX6_PWM_PER_CLK 66000000
-#undef CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index bddebde042..18d1e7b1f5 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -116,7 +116,6 @@
/*
* PCI express
*/
-#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCI_FIXUP_DEV
diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index c5b6fddee7..565a5aae93 100644
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -509,7 +509,6 @@ void fpga_control_clear(unsigned int bus, int pin);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index ae8399426f..0589b9288e 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -43,8 +43,6 @@
* PCI definitions
*/
-#define CONFIG_CMD_PCI
-
#define CONFIG_TULIP
#define CONFIG_EEPRO100
#define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index acc97268ba..b35f358ed2 100644
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -40,7 +40,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h
index 0bd42799f1..810b23e8fa 100644
--- a/include/configs/km/km83xx-common.h
+++ b/include/configs/km/km83xx-common.h
@@ -219,10 +219,6 @@
#define CONFIG_SYS_NAND_BASE CONFIG_SYS_KMBEC_FPGA_BASE
#endif
-#if defined(CONFIG_PCI)
-#define CONFIG_CMD_PCI
-#endif
-
/*
* For booting Linux, the board info and command line data
* have to be in the first 8 MB of memory, since this is
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index be4a2d0191..0727106f26 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -365,7 +365,6 @@ int get_scl(void);
/*
* additionnal command line configuration.
*/
-#define CONFIG_CMD_PCI
/* we don't need flash support */
#undef CONFIG_FLASH_CFI_MTD
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 7120111dcc..4a84e6c40a 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -151,7 +151,6 @@
#define CONFIG_NET_MULTI
#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_MEMINFO
#define CONFIG_CMD_MEMTEST
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 32c8cec072..f4ed0302a9 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -65,7 +65,6 @@
#define CONFIG_NET_MULTI
#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_MEMINFO
#define CONFIG_CMD_MEMTEST
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 56a0754e13..4806168b88 100644
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -214,7 +214,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
#endif
#define CONFIG_CMD_PING
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 56f8c0305a..7c651e4efd 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -477,7 +477,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_PCI
#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
#endif
#define CONFIG_CMDLINE_TAG
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index af499238b4..0e5b004868 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -348,7 +348,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
#endif
#define CONFIG_CMDLINE_TAG
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 443a6657e6..f064d5c24a 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -169,7 +169,6 @@
#ifdef CONFIG_PCI
#define CONFIG_NET_MULTI
#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
#endif
#endif
diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 7d7da91a0d..e5159d8f1a 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -145,7 +145,6 @@
#ifdef CONFIG_PCI
#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
#endif
/* Command line configuration */
diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 1801eca53f..dcd1b0c35c 100644
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -342,7 +342,6 @@ unsigned long get_board_ddr_clk(void);
#ifdef CONFIG_PCI
#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
#endif
/* MMC */
diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index de67e1d16e..b309d79586 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -328,7 +328,6 @@ unsigned long get_board_sys_clk(void);
#ifdef CONFIG_PCI
#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
#endif
/* MMC */
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 8eb6d7a269..b0b9664f57 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -100,7 +100,6 @@
/*
* Commands
*/
-#define CONFIG_CMD_PCI
#define CONFIG_SYS_LONGHELP /* verbose help, undef to save memory */
diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index cd5971d30c..755e05deda 100644
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -382,7 +382,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index d93a15f691..633218cd94 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -126,7 +126,6 @@
*/
#ifdef CONFIG_PCIE_DW_MVEBU
#define CONFIG_E1000
-#define CONFIG_CMD_PCI
#endif
#endif /* _CONFIG_MVEBU_ARMADA_8K_H */
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 27e767241f..0fa442985a 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -38,7 +38,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */
#endif
-#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 2c0a799c7c..36f0ec497e 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -174,7 +174,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#endif
-#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
diff --git a/include/configs/novena.h b/include/configs/novena.h
index c3005e7a15..bb0d3b789c 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -17,7 +17,6 @@
#include "mx6_common.h"
/* U-Boot Commands */
-#define CONFIG_CMD_PCI
/* U-Boot general configurations */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 5c8277908f..68016bc02b 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -686,8 +686,6 @@
#endif
#define CONFIG_SYS_PCIE1_IO_SIZE 0x00010000 /* 64k */
-#define CONFIG_CMD_PCI
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#endif /* CONFIG_PCI */
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index df0b6082ec..377f79a251 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -266,8 +266,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_CMD_PCI
-
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
#endif /* CONFIG_PCI */
diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 3fb62ded1e..afaeea83e8 100644
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -39,7 +39,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h
index 55230291c2..564069a665 100644
--- a/include/configs/p2771-0000.h
+++ b/include/configs/p2771-0000.h
@@ -23,7 +23,6 @@
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
/* PCI host support */
-#define CONFIG_CMD_PCI
#include "tegra-common-post.h"
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 703d158b8b..2c9a3466f7 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -126,10 +126,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
* Command line configuration.
*/
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 7f1f115ff6..a604848073 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -11,7 +11,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_SH_ZIMAGEBOOT
/* SCIF */
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 14390e81fb..21364ddd4a 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -21,7 +21,6 @@
* Command line configuration.
*/
#define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_PCI
#define CONFIG_CONS_SCIF0 1
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index edb153f79e..28ad0a12e1 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -27,8 +27,6 @@
#define CONFIG_LMB
#define CONFIG_ANDROID_BOOT_IMAGE
-#define CONFIG_CMD_PCI
-
#define CONFIG_FS_EXT4
#define CONFIG_EXT4_WRITE
#define CONFIG_HOST_MAX_DEVICES 4
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index c0faac3b79..ca4cde2f37 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -398,10 +398,6 @@
* Command line configuration.
*/
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index abac950db4..0dc47a125d 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -511,10 +511,6 @@
*/
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index c5f9fcb918..de123fdd9c 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -452,10 +452,6 @@
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 48a77197fd..f249f4298d 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -12,7 +12,6 @@
#define CONFIG_CPU_SH7785 1
#define CONFIG_SH7785LCR 1
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_SDRAM
#define CONFIG_CMD_SH_ZIMAGEBOOT
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 5b8fa3a08c..ccc722de31 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -279,10 +279,6 @@
#define CONFIG_CMD_SDRAM
#define CONFIG_CMD_REGINFO
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
#undef CONFIG_WATCHDOG /* watchdog disabled */
/*
diff --git a/include/configs/strider.h b/include/configs/strider.h
index aa7f15389c..c6cb51c36b 100644
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -543,7 +543,6 @@ void fpga_control_clear(unsigned int bus, int pin);
/*
* Command line configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMDLINE_EDITING 1 /* add command line history */
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index 99c0602503..6098dd9555 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -240,10 +240,6 @@
* Command line configuration.
*/
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#endif
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 5271b5cf44..c3fc8a3aa7 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -71,7 +71,6 @@
#endif
/* PCI */
-#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index e5edd5e8fd..a7001e76aa 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -29,9 +29,6 @@
* This version should also enable all other non-production
* interfaces / features.
*/
-#ifdef CONFIG_USB
-#define CONFIG_CMD_PCI
-#endif
/* I2C */
#define CONFIG_SYS_I2C
diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index fd36634ae9..301065a831 100644
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -42,7 +42,6 @@
#define CONFIG_USB_ETHER_ASIX
/* PCI host support */
-#define CONFIG_CMD_PCI
/* General networking support */
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 1020355ed5..d2c3e57570 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -26,7 +26,6 @@
/*
* Commands configuration
*/
-#define CONFIG_CMD_PCI
/* I2C support */
#define CONFIG_DM_I2C
diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 291185fecd..38c67cd109 100644
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -312,7 +312,6 @@
/*
* Command line configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE /* add autocompletion support */
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 77da9e5e85..d34292b42f 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -83,7 +83,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#endif
-#define CONFIG_CMD_PCI
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX
diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index 13ebafeac8..8e9abb264c 100644
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -345,10 +345,6 @@
#define CONFIG_RTC_RX8025
#define CONFIG_CMD_TSI148
-#if defined(CONFIG_PCI)
- #define CONFIG_CMD_PCI
-#endif
-
/* Pass Ethernet MAC to VxWorks */
#define CONFIG_SYS_VXWORKS_MAC_PTR 0x000043f0
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index a70fc9d4d9..f5f7a92b8b 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -66,7 +66,6 @@
/*-----------------------------------------------------------------------
* Command line configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_ZBOOT
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 453a672184..27bed4b39d 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -483,7 +483,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Command configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_PCI_ENUM
#define CONFIG_CMD_REGINFO
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index bc612eb654..c1986ad88f 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -286,7 +286,6 @@
/*
* Command configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_PCI_ENUM
#define CONFIG_CMD_REGINFO
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 2c45a797b9..7781bc996b 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/*
* Command configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_PCI_ENUM
#define CONFIG_CMD_REGINFO
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 613738804e..fa53355d0a 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -335,7 +335,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/*
* Command configuration.
*/
-#define CONFIG_CMD_PCI
#define CONFIG_CMD_PCI_ENUM
#define CONFIG_CMD_REGINFO
diff --git a/include/configs/zc5202.h b/include/configs/zc5202.h
index a7988e06f5..b1afde9ba0 100644
--- a/include/configs/zc5202.h
+++ b/include/configs/zc5202.h
@@ -26,7 +26,6 @@
#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_MV88E6352_SWITCH
-#define CONFIG_CMD_PCI
#define CONFIG_PCI_SCAN_SHOW
#define CONFIG_PCIE_IMX