dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig

Move this option to Kconfig and fix up all users.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Stephen Warren <swarren@nvidia.com>

diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index 8abf98ab404cb9f5095d0193b69d343b0a5cf151..f939bdb95dc14ee3a73440fab4c24904a3e8886e 100644 (file)
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_NFS is not set
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_PCI_TEGRA=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index dcc9cc38460b882fc89e35b222f07186ba3d3d4b..29303441d92e73c7438b2b7d2f13472de843c3e8 100644 (file)
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -13,7 +13,11 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
+<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
+=======
+CONFIG_PCI_TEGRA=y
+>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y

diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 65587e3fb04673cf24f94ad391ec7585fe86ea78..5760018d68e7489cca947b8951576343ee045aa8 100644 (file)
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -13,7 +13,11 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
+<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
+=======
+CONFIG_PCI_TEGRA=y
+>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 8bc3015c447ea9fcfb838d698f607d767b4492f7..9500d2cff6469ef644ecc556e714736a07e02113 100644 (file)
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -13,7 +13,11 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
+<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
+=======
+CONFIG_PCI_TEGRA=y
+>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y

diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
index 28d6426206bdd15280d6a80bceb4f2cd17c239e8..c41f322042e961960af62384fa4989bf02803d85 100644 (file)
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -15,5 +15,6 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
+CONFIG_PCI_TEGRA=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index e3c45f9603115e662f600034c0db21ae8ced767d..ee40218d1ca85d3724d7a2bcd17f7d6766520d68 100644 (file)
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -13,7 +13,11 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
+<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
+=======
+CONFIG_PCI_TEGRA=y
+>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SFLASH=y
 CONFIG_USB=y

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 167d405918400b39edc3621edac6338257a38e1c..c219c19679bd7939b13464e131e2286a9c795721 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -19,4 +19,14 @@ config PCI_SANDBOX
          the device tree but the normal PCI scan technique is used to find
          then.
 
+config PCI_TEGRA
+       bool "Tegra PCI support"
+       depends on TEGRA
+       help
+         Enable support for the PCIe controller found on some generations of
+         Tegra. Tegra20 has 2 root ports with a total of 4 lanes, Tegra30 has
+         3 root ports with a total of 6 lanes and Tegra124 has 2 root ports
+         with a total of 5 lanes. Some boards require this for Ethernet
+         support to work (e.g. beaver, jetson-tk1).
+
 endmenu

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index fe1ef9d51966fd264c7c862a3171b2359cdb8428..7552a809db7da8e7b3676dce8fd2b3b51a38d92f 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -49,7 +49,6 @@
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index bf7b96b5f3d5cb1556cbde436f0f8bb93f5ab7d9..6dff1b9d0e209e3a8e1f3bd62aaa34d10bb719a6 100644 (file)
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -71,7 +71,6 @@
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM

diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 9a8c989b769611f58013fde5ed38427f21438257..664e79b0634028769dc6dc22fa53439da50d2f05 100644 (file)
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -73,7 +73,6 @@
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index b39ddf67068854d680936836c50d7753b1e0e8dc..6cb064a27d71ca994790e80d8839969b119605b2 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -58,7 +58,6 @@
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM

diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 0dfcdb97e32de3b9b02400dbe838aa8d36e8e95c..46a801d9b6965a20344ba25b4f8e997cddfc45df 100644 (file)
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -54,7 +54,6 @@
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index bdc5dc02ea2dd79bdf1682533abaacacd3e950e8..c70fa08e7801ea2d8b2da5e27a5d84ffeff71b8a 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -56,7 +56,6 @@
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM