| Message ID | 1445104205-4079-2-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
On 10/17/2015 11:49 AM, Simon Glass wrote:
> Move this option to Kconig and fix up all users.
What are your thoughts on how/when to merge this? The series (mainly the
final patch) conflicts with my series to add Tegra210 support, plus one
of them needs rebasing onto the other so that either the board support
my series adds gets adjusted by this series, or my series is adjusted
for all the changes in this series.
Obviously I'd hope my series gets merged first since I sent it much
earlier:-)
FWIW, I rebased this series on top of my series to validate it, and
pushed it to:
git://github.com/swarren/u-boot.git pci-dm-conversion-rebase
That seems to work OK, but the final patch I added there needs
integration into earlier patches and/or cleanup work.
Hi Stephen, On 21 October 2015 at 14:13, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 10/17/2015 11:49 AM, Simon Glass wrote: >> >> Move this option to Kconig and fix up all users. > > > What are your thoughts on how/when to merge this? The series (mainly the > final patch) conflicts with my series to add Tegra210 support, plus one of > them needs rebasing onto the other so that either the board support my > series adds gets adjusted by this series, or my series is adjusted for all > the changes in this series. > > Obviously I'd hope my series gets merged first since I sent it much > earlier:-) > > FWIW, I rebased this series on top of my series to validate it, and pushed > it to: > > git://github.com/swarren/u-boot.git pci-dm-conversion-rebase > > That seems to work OK, but the final patch I added there needs integration > into earlier patches and/or cleanup work. I don't mind which order it goes in. I cannot test on T210 anyway so I may look to you to sort that out. Let me know what suits. I'll likely respin this early next week and if your stuff in applied to tegra by then then I'll base on top of it. Regards, Simon
diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index 8971d29..871dc43 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Apalis T30 # " # CONFIG_CMD_NFS is not set CONFIG_NETDEVICES=y CONFIG_E1000=y +CONFIG_PCI_TEGRA=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 4a6f6e4..dfc9adf 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Tegra30 (Beaver) # " # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +CONFIG_PCI_TEGRA=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 722bbeb..9e4a123 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Tegra30 (Cardhu) # " # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +CONFIG_PCI_TEGRA=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 6df5c7e..7b1992b 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Tegra124 (Jetson TK1) # " # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +CONFIG_PCI_TEGRA=y CONFIG_TEGRA114_SPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index 18292e2..08e1b62 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="Tegra20 (TrimSlice) # " # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y +CONFIG_PCI_TEGRA=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 167d405..c219c19 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 fe1ef9d..7552a80 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 1790f60..9e8dcf3f7 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.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/cardhu.h b/include/configs/cardhu.h index ce6b158..174bb48 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -75,7 +75,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 e87a010..618ffa6 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -59,7 +59,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 2ab5511..bdf1bd4 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.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
Move this option to Kconig and fix up all users. Signed-off-by: Simon Glass <sjg@chromium.org> --- configs/apalis_t30_defconfig | 1 + configs/beaver_defconfig | 1 + configs/cardhu_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/trimslice_defconfig | 1 + 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/trimslice.h | 1 - 11 files changed, 15 insertions(+), 5 deletions(-)