Convert CONFIG_PCIE_IMX to Kconfig

This converts the following to Kconfig:
   CONFIG_PCIE_IMX

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

diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig
index c9e4ee8f93d19f93377776b6908141d28919996c..114a361a18439ffe23101b2af3c29a2c6b0a74fa 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_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_PMIC=y

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index 0044d893128e5151ca00be6a2954adcb2626dabc..ea9e7e2cbf0abd8f8a9fd6712e3f33c17ad9a991 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -114,6 +114,7 @@ CONFIG_E1000=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y

diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 08580255f79d88b4704ae063885436ebf916c925..c0c7c0daf134fff6cca23edac46783f23e1071be 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -118,6 +118,7 @@ CONFIG_E1000=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y

diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index e2eab2bb3815630787fc2e824078046c58a6b981..7ce02fef8a2c9d790bafccb3efaf8f720032bbd9 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -124,6 +124,7 @@ CONFIG_E1000=y
 CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PCI=y
+CONFIG_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y

diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index 15dbaf848cd756eef1a9651be550bd5da964b8d2..f5ad3664db72268abddeb713f610edb7c1cdc72e 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_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y

diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index c41b2d9264eacf6cfeea78698654d97755ad2c1d..9a9e0da5140b301064af94b2b1ccdbefc1397ed4 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_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_PMIC=y

diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 6b0f17628dcde102dcf61c8823d7087bc621c1f5..f156296adabb384b32ed1dea534a9a49b49ff2ce 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_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y

diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 4b304f8c7f5855a73dda7576ef2ecbe21e188b2f..0401dc6142d37c1df0ef3a9a9877e3a6d04a96c2 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_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_RTC=y

diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
index da782889a1bc9b3f7fe1370114ba3c18be35779e..ad534ab586051c78ac9930b78511b81d11c12c0f 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_PCIE_IMX=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
 CONFIG_POWER_LEGACY=y

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index fd2203420c3bee86faaee18a62fc3c90c3cc7643..0c74f95f60415d1a368ee272cd414a8835d0798c 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -254,6 +254,10 @@ config FSL_PCIE_EP_COMPAT
          This compatible is used to find pci controller ep node in Kernel DT
          to complete fixup.
 
+config PCIE_IMX
+       bool "i.MX PCIe support"
+       depends on ARCH_MX6
+
 config PCIE_INTEL_FPGA
        bool "Intel FPGA PCIe support"
        help

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

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 47a72fc8fce5924856772e09ede72c880ab4c99f..4a0aaf4da58348ad69664aac8bf6a091ee6ee161 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -31,9 +31,6 @@
 /*
  * PCI express
  */
-#ifdef CONFIG_CMD_PCI
-#define CONFIG_PCIE_IMX
-#endif
 
 /*
  * PMIC

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index ef255aa360e9bca91a4c50ddbf25e950700d80c9..845154520e74f8735e597fa6397b29554e079165 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -25,7 +25,6 @@
 
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_PCIE_IMX
 #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 7bbc500ae126289ea5e288740a8ea0855d5993a3..fe3cb1e4dc5bb4321be69ed9ded9d1e278fbb0ce 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -130,7 +130,6 @@
 
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_PCIE_IMX
 #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 72a9f4ec24fb6c4d3991a9ee8d96cc7701e66f47..ff9cb12a59cd9bf6cbd549844e7c5a433ded2f5d 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -102,7 +102,6 @@
  */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_PCIE_IMX
 #endif
 
 #endif        /* __CONFIG_H */

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 9f18db465e1099db6b4ccdd67406d448b2a991d2..54afcf620df2a63af53f7f1c102c4c435fc19682 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -49,7 +49,6 @@
 /* PCI express */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_PCIE_IMX
 #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/tbs2910.h b/include/configs/tbs2910.h
index dd2c5d77445bd070f1d04d35d6830d0adb95289c..357811f5fd4faae27dc072fa4014af3fbe586f1a 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -27,7 +27,6 @@
 /* PCI */
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_PCIE_IMX
 #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 9cc8fc5ff5331d1322ec85078086099727ea1bf7..beaff28aa2b748c8640e8c1b8cdace691665c482 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -46,7 +46,6 @@
 
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_PCIE_IMX
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(4, 6)
 #endif