Convert CONFIG_PCI_SCAN_SHOW to Kconfig

This converts the following to Kconfig:
   CONFIG_PCI_SCAN_SHOW

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig
index 114a361a18439ffe23101b2af3c29a2c6b0a74fa..c33287812663b2868adbb5662b3c32bf914a9c21 100644 (file)
--- a/configs/ge_bx50v3_defconfig
+++ b/configs/ge_bx50v3_defconfig
@@ -74,6 +74,7 @@ CONFIG_CMD_E1000=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_PCI_SCAN_SHOW=y
 CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y

diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index f5ad3664db72268abddeb713f610edb7c1cdc72e..ea0c764674624060f1a0907404487577ef4a3ac9 100644 (file)
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -97,6 +97,7 @@ CONFIG_FEC_MXC=y
 CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_PCI_SCAN_SHOW=y
 CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y

diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index 9a9e0da5140b301064af94b2b1ccdbefc1397ed4..1985ff96dec34684231a20e6aefafd304a616afd 100644 (file)
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -60,6 +60,7 @@ CONFIG_DM_ETH=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_PCI_SCAN_SHOW=y
 CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y

diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index f156296adabb384b32ed1dea534a9a49b49ff2ce..d4ab93850c4a1a9fddf8cd596a80ef17e808cca8 100644 (file)
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -75,6 +75,7 @@ CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_FEC_MXC=y
 CONFIG_RGMII=y
 CONFIG_MII=y
+CONFIG_PCI_SCAN_SHOW=y
 CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y

diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 0401dc6142d37c1df0ef3a9a9877e3a6d04a96c2..892d7c60d283932760ad2d435cb35ae0b7ddb101 100644 (file)
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -83,6 +83,7 @@ CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PCI=y
 # CONFIG_PCI_PNP is not set
+CONFIG_PCI_SCAN_SHOW=y
 CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y

diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
index ad534ab586051c78ac9930b78511b81d11c12c0f..8d87857ba0a4c58e67a929bbe7690e9ace08e8f1 100644 (file)
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@ -84,6 +84,7 @@ CONFIG_DM_ETH=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_PCI_SCAN_SHOW=y
 CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 0c74f95f60415d1a368ee272cd414a8835d0798c..f4c4aece58d7301ece371e758d720388880c1511 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -81,6 +81,10 @@ config PCI_ARID
           support on PCI devices. This helps to skip some devices in BDF
           scan that are not present.
 
+config PCI_SCAN_SHOW
+       bool "Show PCI devices during startup"
+       depends on PCIE_IMX
+
 config PCIE_ECAM_GENERIC
        bool "Generic ECAM-based PCI host controller support"
        help

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 8e75d779c418d27adb4893f2c4e816a31955ceb6..e8e0a1c66999bd8cf88f666206ebd7c796839c7f 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -232,10 +232,6 @@
 #define CONFIG_SYS_PCIE2_IO_PHYS       0xD8000000
 #define CONFIG_SYS_PCIE2_IO_SIZE       0x00800000
 
-#ifdef CONFIG_PCI
-#undef CONFIG_PCI_SCAN_SHOW    /* show pci devices on startup */
-#endif /* CONFIG_PCI */
-
 /*
  * TSEC
  */

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index bec2ca0f81da3ebee1560fcc3a0cb57063780b47..2eb33812f76a1c063dae0ea9f1a7056e0d5ef03d 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -312,10 +312,6 @@
 #endif
 #define CONFIG_SYS_SRIO1_MEM_SIZE      0x20000000      /* 512M */
 
-#if defined(CONFIG_PCI)
-#define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
-#endif /* CONFIG_PCI */
-
 #if defined(CONFIG_TSEC_ENET)
 
 #define CONFIG_TSEC1   1

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 5f64bd944b39f242c43ece5d7f003b2ac343a480..aea744c826cc7a1738bcfd3da3cd61d158b2afa8 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -94,8 +94,6 @@
 #else
 #define CONFIG_SYS_PCIE2_IO_PHYS       0xffc10000
 #endif
-
-#define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
 #endif
 
 #define CONFIG_HWCONFIG

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index d7df5795cc22c8cc5a2330ec1b5c7f372f13b780..e019c168434ab8c89e42f67129d1d1456dcf7546 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -321,10 +321,6 @@
 #define CONFIG_SYS_DPAA_PME
 #define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
-#endif /* CONFIG_PCI */
-
 #ifdef CONFIG_FMAN_ENET
 #define CONFIG_SYS_FM1_DTSEC1_PHY_ADDR 0x2
 #define CONFIG_SYS_FM1_DTSEC2_PHY_ADDR 0x3

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index cdae8a88df94a754d7b7f4265b80c11294640f24..a519b5a9355e7c2d79253c0d9dca25b38c7914e9 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -377,8 +377,6 @@
 #define CONFIG_SYS_PCIE3_IO_VIRT       0xf8020000
 #define CONFIG_SYS_PCIE3_IO_PHYS       0xff8020000ull
 #endif
-
-#define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
 #endif /* CONFIG_PCI */
 
 /*

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 8222c674706e9e4d58c8cc57712df0ecd2a8a822..3a7c643cfc9433c49fc5ddf43049901af91e62dc 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -362,8 +362,6 @@
 #define CONFIG_SYS_PCIE4_IO_VIRT       0xf8030000
 #define CONFIG_SYS_PCIE4_IO_PHYS       0xff8030000ull
 #endif
-
-#define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
 #endif /* CONFIG_PCI */
 
 /*

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 53fc49fdcf2fa28a90803aadb6858df53cf3a313..eff22c18bb72c17cea9fcb6e30b728cce2171eb3 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -391,10 +391,6 @@
 #define CONFIG_SYS_PCIE4_MEM_PHYS      0xc40000000ull
 #define CONFIG_SYS_PCIE4_IO_PHYS       0xff8030000ull
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW   /* show pci devices on startup */
-#endif
-
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
 #define CONFIG_SYS_BMAN_NUM_PORTALS    18

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index b3648ae06faea9a48b10a397a3aae57fd8697d75..ba9bfdd72f7e75fa9322af6014e5eadf3507c921 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -344,10 +344,6 @@
 #define CONFIG_SYS_PCIE4_MEM_PHYS      0xc40000000ull
 #define CONFIG_SYS_PCIE4_IO_PHYS       0xff8030000ull
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW   /* show pci devices on startup */
-#endif
-
 /* Qman/Bman */
 #ifndef CONFIG_NOBQFMAN
 #define CONFIG_SYS_BMAN_NUM_PORTALS    18

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 3edae6b01b7c11ee86fcb421e740bcb0daa2e4bd..12b479f9c773916b4010a1ae0c99295cbe12cf71 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -138,10 +138,6 @@
 #define CONFIG_SYS_PCIE4_MEM_PHYS      0xc60000000ull
 #define CONFIG_SYS_PCIE4_IO_PHYS       0xff8030000ull
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
-#endif /* CONFIG_PCI */
-
 /*
  * Environment
  */

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index a362282a291eb1e478308b85419ad0ca6863f25d..6a4092a83e2e3c2ccbf2fe0de644ccae9a260c77 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -19,9 +19,6 @@
 #define FDT_MODULE                     "apalis-v1.2"
 #define FDT_MODULE_V1_0                        "apalis"
 
-/* PCI host support */
-#undef CONFIG_PCI_SCAN_SHOW
-
 /*
  * Custom Distro Boot configuration:
  * 1. 8bit SD port (MMC1)

diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 9969269bf2ac23b5a00ee9072f4f320c5cb35144..9c9e9506dc64da8166a8dfdffbb50fe135fe27af 100644 (file)
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -28,9 +28,6 @@
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
 
-/* PCIe support */
-#define CONFIG_PCI_SCAN_SHOW
-
 /* Keep device tree and initrd in lower memory so the kernel can access them */
 #define RELOCATION_LIMITS_ENV_SETTINGS \
        "fdt_high=0x10000000\0"         \

diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index bb1595f96111015f1d114c685f4d00317c8538e7..5da2778b67bee4a8070871191cdafa8cb71f961e 100644 (file)
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -17,9 +17,6 @@
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
 
-/* PCIe support */
-#define CONFIG_PCI_SCAN_SHOW
-
 /*
  * Environment Configuration
  */

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 59ec06415671fd1c45490903bc5205a6af13655d..2252bf89543dd4e3c19fc6688c46317def3a817e 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -314,10 +314,6 @@
 #define CONFIG_SYS_DPAA_PME
 #define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
-#endif /* CONFIG_PCI */
-
 #ifdef CONFIG_FMAN_ENET
 #define CONFIG_SYS_FM1_DTSEC1_PHY_ADDR 0x1c
 #define CONFIG_SYS_FM1_DTSEC2_PHY_ADDR 0x1d

diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index 6912f39d32d2d3d47dd3418e59b2cc09d2dad110..b9d03d253d99d9d793d6b1b921d4cb742dc8538f 100644 (file)
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -14,9 +14,6 @@
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
 
-/* PCIe support */
-#define CONFIG_PCI_SCAN_SHOW
-
 /* NAND */
 
 /* Keep device tree and initrd in lower memory so the kernel can access them */

diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 3b3a7abd281f1f75ed5cf2d8e2e96fb22b72d01a..bba2b607aa8621e11ddef16f5e792502bff61b04 100644 (file)
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -17,9 +17,6 @@
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
 
-/* PCIe support */
-#define CONFIG_PCI_SCAN_SHOW
-
 /* Keep device tree and initrd in lower memory so the kernel can access them */
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0x10000000\0"         \

diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 715a6d7a9e71e14b5f5b28938eba02f6bc2a94a6..7b305955c9629b15d9dd265d3cc80fe828661ca0 100644 (file)
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -21,9 +21,6 @@
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
 
-/* PCIe support */
-#define CONFIG_PCI_SCAN_SHOW
-
 /* NAND */
 
 /*

diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 7e3f657e31cc8734e822f0e1859d6ddfe12affe1..f8273a92f11a315b99276a3667bf38580c63d86c 100644 (file)
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -19,9 +19,6 @@
 /* I2C */
 #define CONFIG_I2C_MVTWSI_BASE0                MVEBU_TWSI_BASE
 
-/* PCIe support */
-#define CONFIG_PCI_SCAN_SHOW
-
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros

diff --git a/include/configs/durian.h b/include/configs/durian.h
index c224511832ff2e9bcf363290564409576e4b09bb..7971df8c1d3bc16f1156f44e2edc797fae743e3d 100644 (file)
--- a/include/configs/durian.h
+++ b/include/configs/durian.h
@@ -13,9 +13,6 @@
 #define PHYS_SDRAM_1_SIZE              0x7B000000
 #define CONFIG_SYS_SDRAM_BASE   PHYS_SDRAM_1
 
-/* PCI CONFIG */
-#define CONFIG_PCI_SCAN_SHOW
-
 /* BOOT */
 #define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)
 

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index b4638a2b9d828cc10d6130345e67df92dd924203..ad00769bdeefaab22027b089c1214207ece934c6 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -109,6 +109,4 @@
 
 #define CONFIG_IMX6_PWM_PER_CLK        66000000
 
-#define CONFIG_PCI_SCAN_SHOW
-
 #endif /* __GE_BX50V3_CONFIG_H */

diff --git a/include/configs/helios4.h b/include/configs/helios4.h
index ff2c50644326b52c222324b5a4b7951358a7debb..fc32487e1c7b4a6fd5590d4ac4a18785dbbf2b87 100644 (file)
--- a/include/configs/helios4.h
+++ b/include/configs/helios4.h
@@ -28,9 +28,6 @@
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
 
-/* PCIe support */
-#define CONFIG_PCI_SCAN_SHOW
-
 /* Keep device tree and initrd in lower memory so the kernel can access them */
 #define RELOCATION_LIMITS_ENV_SETTINGS \
        "fdt_high=0x10000000\0"         \

diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h
index ee67215a097a4fed724b33d91a81ab3bafdc9ae7..a0ff3b897904e831278e767a327f7dccfc40b115 100644 (file)
--- a/include/configs/ls1012afrwy.h
+++ b/include/configs/ls1012afrwy.h
@@ -25,8 +25,6 @@
        func(USB, usb, 0) \
        func(DHCP, dhcp, na)
 
-#define CONFIG_PCI_SCAN_SHOW
-
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \

diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 9dbf1a7ab3c89843e6a229e310264f70c23f1795..b124ce52620cae2dcd4522048b043ca9182b4d45 100644 (file)
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -82,8 +82,6 @@
                                DSPI_CTAR_CSSCK(2) | DSPI_CTAR_ASC(0) | \
                                DSPI_CTAR_DT(0))
 
-#define CONFIG_PCI_SCAN_SHOW
-
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index f71ab2c80c8b6371e18a6d565f9aadc514c3428b..4f77acdaedec021f2fbd397e3e4c9480aff2eaca 100644 (file)
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -36,8 +36,6 @@
 #define __PHY_ETH2_MASK                0xFB
 #define __PHY_ETH1_MASK                0xFD
 
-#define CONFIG_PCI_SCAN_SHOW
-
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS              \
        "verify=no\0"                           \

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 6556f1aa65d61468bd271f438020f4694017f5c6..ec688741a07e9e1f80edba72efb64906e844daab 100644 (file)
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -99,10 +99,6 @@
 
 #define FSL_PCIE_COMPAT                "fsl,ls1021a-pcie"
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR            0x01ee0200
 

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 00825b373e67eb2aa86f4509cdc52d2b6a490186..1a46f72a7357c15421b4414b085965ca762a96a2 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -301,10 +301,6 @@
 
 #endif
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR            0x01ee0200
 

diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h
index 791df844c147a920fff8da777ee9aa20746dc7aa..e5754c94e0fce66fe71e086a98e5c2f6af22ab9f 100644 (file)
--- a/include/configs/ls1021atsn.h
+++ b/include/configs/ls1021atsn.h
@@ -81,9 +81,6 @@
 
 /* PCIe */
 #define FSL_PCIE_COMPAT                        "fsl,ls1021a-pcie"
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
 
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE           256

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 921399e31de94754cd6e65f76453f1502be1b635..09dce21aec5f915ec07f198b8506fd10e867e075 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -171,10 +171,6 @@
 #define CONFIG_SYS_I2C_EEPROM_NXID
 #define CONFIG_SYS_EEPROM_BUS_NUM              1
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 #define CONFIG_PEN_ADDR_BIG_ENDIAN
 #define CONFIG_SMP_PEN_ADDR            0x01ee0200
 

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index db00a0a002ab873e1d0b8fb5b55ef92b903ab1e3..ed32e20dbf451797ec1e40d1cf5452bf4672bcee 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -108,13 +108,6 @@
 
 /* I2C */
 
-/* PCIe */
-#ifndef SPL_NO_PCIE
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-#endif
-
 /*  DSPI  */
 
 /* FMan ucode */

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 3a1106777f92a4947dc0ba56963b889e1e9331da..94118c420e6a494612ed3f24667098a7b0e8c265 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -76,10 +76,6 @@
 
 /* I2C */
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 /* SATA */
 #ifndef SPL_NO_SATA
 #define CONFIG_SYS_SATA                                AHCI_BASE_ADDR

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index 9de602bc164020c1b0322c95d3e7d62d0a211d14..9ba7258572fcdf25cc112ae2ecc45b814aababd7 100644 (file)
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -251,10 +251,6 @@
 
 #define CONFIG_FSL_MEMAC
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 /* Initial environment variables */
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #ifdef CONFIG_NXP_ESBC

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 9c4d2feb7883f4a5afb90bc19cadb1a51be74fdb..a504a0ea462a1c34d3bd7cede7285895457b07f4 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -238,10 +238,6 @@
 
 #define CONFIG_FSL_MEMAC
 
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
        func(MMC, mmc, 0) \

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index bc3a0046ac637fced765d6b9bc4c909282c973d3..77e25822dcd667c86cf6277acc44cca227725984 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -89,11 +89,6 @@
 /* Qixis */
 #define CONFIG_SYS_I2C_FPGA_ADDR               0x66
 
-/* PCI */
-#ifdef CONFIG_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 /* USB */
 
 #define COUNTER_FREQUENCY_REAL         (get_board_sys_clk() / 4)

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 845154520e74f8735e597fa6397b29554e079165..16f8858abb8fff07a6a3512ef3f55516c40881df 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -24,7 +24,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       3
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(7, 12)
 #define CONFIG_PCIE_IMX_POWER_GPIO     IMX_GPIO_NR(3, 19)
 #endif

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index fe3cb1e4dc5bb4321be69ed9ded9d1e278fbb0ce..58d550fee9ecb0ed0bf196cc41e0b353e108cdec 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -129,7 +129,6 @@
 #endif
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(2, 0)
 #define CONFIG_PCIE_IMX_POWER_GPIO     IMX_GPIO_NR(2, 1)
 #endif

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index ff9cb12a59cd9bf6cbd549844e7c5a433ded2f5d..2007b48868f69d955299a35a9454e51763f5bc74 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -97,11 +97,4 @@
 
 /* Environment organization */
 
-/*
- * PCI express
- */
-#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#endif
-
 #endif        /* __CONFIG_H */

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 54afcf620df2a63af53f7f1c102c4c435fc19682..1696aa28520f3743729d477d7711e23c83e4960f 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -48,7 +48,6 @@
 
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(3, 29)
 #define CONFIG_PCIE_IMX_POWER_GPIO     IMX_GPIO_NR(7, 12)
 #endif

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index a639dbac788b400b7cb4da85fb8f48c8db5aa50d..f4bf2ab830ae2f3b1c75d40f562559f7ba789d02 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -384,8 +384,6 @@
 #else
 #define CONFIG_SYS_PCIE1_IO_PHYS       0xffc00000
 #endif
-
-#define CONFIG_PCI_SCAN_SHOW   /* show pci devices on startup */
 #endif /* CONFIG_PCI */
 
 #if defined(CONFIG_TSEC_ENET)

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 357811f5fd4faae27dc072fa4014af3fbe586f1a..c93df00d58dcde766ed1c7372e739dc31ca08d3a 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -26,7 +26,6 @@
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(7, 12)
 #endif
 

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index beaff28aa2b748c8640e8c1b8cdace691665c482..6eb022f26c5f6298cdd1bc766d9b02888570dc98 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -45,7 +45,6 @@
 #define CONFIG_MXC_USB_FLAGS   0
 
 #ifdef CONFIG_CMD_PCI
-#define CONFIG_PCI_SCAN_SHOW
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(4, 6)
 #endif
 

diff --git a/include/configs/x530.h b/include/configs/x530.h
index 1f1b4e1449eb830e0ea1d30a0850c925ef8051d7..cb126837b9ca3e5ec955c89a191841e4ebec0fd8 100644 (file)
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -47,9 +47,6 @@
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
 
-/* PCIe support */
-#define CONFIG_PCI_SCAN_SHOW
-
 /* NAND */
 
 #include <asm/arch/config.h>