diff options
| author | Simon Glass <sjg@chromium.org> | 2015-11-19 20:26:55 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-12-01 06:26:36 -0700 |
| commit | fde7e18938d84950979beccb4b2b279efb19c4bd (patch) | |
| tree | cbe749b405bf36864844704e92ef0d635f7bdfa4 /configs | |
| parent | 15bcc62d5382579a65f1c6375fd964301437601c (diff) | |
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>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/apalis_t30_defconfig | 1 | ||||
| -rw-r--r-- | configs/beaver_defconfig | 4 | ||||
| -rw-r--r-- | configs/cardhu_defconfig | 4 | ||||
| -rw-r--r-- | configs/jetson-tk1_defconfig | 4 | ||||
| -rw-r--r-- | configs/p2371-2180_defconfig | 1 | ||||
| -rw-r--r-- | configs/trimslice_defconfig | 4 |
6 files changed, 18 insertions, 0 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 |