From fde7e18938d84950979beccb4b2b279efb19c4bd Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Thu, 19 Nov 2015 20:26:55 -0700 Subject: [PATCH] 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> --- configs/apalis_t30_defconfig | 1 + configs/beaver_defconfig | 4 ++++ configs/cardhu_defconfig | 4 ++++ configs/jetson-tk1_defconfig | 4 ++++ configs/p2371-2180_defconfig | 1 + configs/trimslice_defconfig | 4 ++++ drivers/pci/Kconfig | 10 ++++++++++ include/configs/apalis_t30.h | 1 - include/configs/beaver.h | 1 - include/configs/cardhu.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/p2371-2180.h | 1 - include/configs/trimslice.h | 1 - 13 files changed, 28 insertions(+), 6 deletions(-) diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 8abf98ab40..f939bdb95d 100644 --- 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 dcc9cc3846..29303441d9 100644 --- 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 65587e3fb0..5760018d68 100644 --- 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 8bc3015c44..9500d2cff6 100644 --- 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 28d6426206..c41f322042 100644 --- 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 e3c45f9603..ee40218d1c 100644 --- 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 167d405918..c219c19679 100644 --- 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 fe1ef9d519..7552a809db 100644 --- 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 bf7b96b5f3..6dff1b9d0e 100644 --- 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 9a8c989b76..664e79b063 100644 --- 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 b39ddf6706..6cb064a27d 100644 --- 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 0dfcdb97e3..46a801d9b6 100644 --- 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 bdc5dc02ea..c70fa08e78 100644 --- 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 -- 2.39.5