mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-16 23:07:00 +00:00
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>
This commit is contained in:
parent
15bcc62d53
commit
fde7e18938
13 changed files with 28 additions and 6 deletions
|
@ -13,6 +13,7 @@ CONFIG_CMD_GPIO=y
|
||||||
# CONFIG_CMD_NFS is not set
|
# CONFIG_CMD_NFS is not set
|
||||||
CONFIG_NETDEVICES=y
|
CONFIG_NETDEVICES=y
|
||||||
CONFIG_E1000=y
|
CONFIG_E1000=y
|
||||||
|
CONFIG_PCI_TEGRA=y
|
||||||
CONFIG_SYS_NS16550=y
|
CONFIG_SYS_NS16550=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_DM_USB=y
|
CONFIG_DM_USB=y
|
||||||
|
|
|
@ -13,7 +13,11 @@ CONFIG_CMD_GPIO=y
|
||||||
# CONFIG_CMD_SETEXPR is not set
|
# CONFIG_CMD_SETEXPR is not set
|
||||||
# CONFIG_CMD_NFS is not set
|
# CONFIG_CMD_NFS is not set
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
|
<<<<<<< HEAD
|
||||||
CONFIG_SPI_FLASH_WINBOND=y
|
CONFIG_SPI_FLASH_WINBOND=y
|
||||||
|
=======
|
||||||
|
CONFIG_PCI_TEGRA=y
|
||||||
|
>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
|
||||||
CONFIG_SYS_NS16550=y
|
CONFIG_SYS_NS16550=y
|
||||||
CONFIG_TEGRA20_SLINK=y
|
CONFIG_TEGRA20_SLINK=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
|
|
|
@ -13,7 +13,11 @@ CONFIG_CMD_GPIO=y
|
||||||
# CONFIG_CMD_SETEXPR is not set
|
# CONFIG_CMD_SETEXPR is not set
|
||||||
# CONFIG_CMD_NFS is not set
|
# CONFIG_CMD_NFS is not set
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
|
<<<<<<< HEAD
|
||||||
CONFIG_SPI_FLASH_WINBOND=y
|
CONFIG_SPI_FLASH_WINBOND=y
|
||||||
|
=======
|
||||||
|
CONFIG_PCI_TEGRA=y
|
||||||
|
>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
|
||||||
CONFIG_SYS_NS16550=y
|
CONFIG_SYS_NS16550=y
|
||||||
CONFIG_TEGRA20_SLINK=y
|
CONFIG_TEGRA20_SLINK=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
|
|
|
@ -13,7 +13,11 @@ CONFIG_CMD_GPIO=y
|
||||||
# CONFIG_CMD_SETEXPR is not set
|
# CONFIG_CMD_SETEXPR is not set
|
||||||
# CONFIG_CMD_NFS is not set
|
# CONFIG_CMD_NFS is not set
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
|
<<<<<<< HEAD
|
||||||
CONFIG_SPI_FLASH_WINBOND=y
|
CONFIG_SPI_FLASH_WINBOND=y
|
||||||
|
=======
|
||||||
|
CONFIG_PCI_TEGRA=y
|
||||||
|
>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
|
||||||
CONFIG_SYS_NS16550=y
|
CONFIG_SYS_NS16550=y
|
||||||
CONFIG_TEGRA114_SPI=y
|
CONFIG_TEGRA114_SPI=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
|
|
|
@ -15,5 +15,6 @@ CONFIG_SPI_FLASH=y
|
||||||
CONFIG_SPI_FLASH_WINBOND=y
|
CONFIG_SPI_FLASH_WINBOND=y
|
||||||
CONFIG_SYS_NS16550=y
|
CONFIG_SYS_NS16550=y
|
||||||
CONFIG_TEGRA114_SPI=y
|
CONFIG_TEGRA114_SPI=y
|
||||||
|
CONFIG_PCI_TEGRA=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_DM_USB=y
|
CONFIG_DM_USB=y
|
||||||
|
|
|
@ -13,7 +13,11 @@ CONFIG_CMD_GPIO=y
|
||||||
# CONFIG_CMD_SETEXPR is not set
|
# CONFIG_CMD_SETEXPR is not set
|
||||||
# CONFIG_CMD_NFS is not set
|
# CONFIG_CMD_NFS is not set
|
||||||
CONFIG_SPI_FLASH=y
|
CONFIG_SPI_FLASH=y
|
||||||
|
<<<<<<< HEAD
|
||||||
CONFIG_SPI_FLASH_WINBOND=y
|
CONFIG_SPI_FLASH_WINBOND=y
|
||||||
|
=======
|
||||||
|
CONFIG_PCI_TEGRA=y
|
||||||
|
>>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
|
||||||
CONFIG_SYS_NS16550=y
|
CONFIG_SYS_NS16550=y
|
||||||
CONFIG_TEGRA20_SFLASH=y
|
CONFIG_TEGRA20_SFLASH=y
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
|
|
|
@ -19,4 +19,14 @@ config PCI_SANDBOX
|
||||||
the device tree but the normal PCI scan technique is used to find
|
the device tree but the normal PCI scan technique is used to find
|
||||||
then.
|
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
|
endmenu
|
||||||
|
|
|
@ -49,7 +49,6 @@
|
||||||
|
|
||||||
/* PCI host support */
|
/* PCI host support */
|
||||||
#define CONFIG_PCI
|
#define CONFIG_PCI
|
||||||
#define CONFIG_PCI_TEGRA
|
|
||||||
#define CONFIG_PCI_PNP
|
#define CONFIG_PCI_PNP
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#define CONFIG_CMD_PCI_ENUM
|
#define CONFIG_CMD_PCI_ENUM
|
||||||
|
|
|
@ -71,7 +71,6 @@
|
||||||
|
|
||||||
/* PCI host support */
|
/* PCI host support */
|
||||||
#define CONFIG_PCI
|
#define CONFIG_PCI
|
||||||
#define CONFIG_PCI_TEGRA
|
|
||||||
#define CONFIG_PCI_PNP
|
#define CONFIG_PCI_PNP
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#define CONFIG_CMD_PCI_ENUM
|
#define CONFIG_CMD_PCI_ENUM
|
||||||
|
|
|
@ -73,7 +73,6 @@
|
||||||
|
|
||||||
/* PCI host support */
|
/* PCI host support */
|
||||||
#define CONFIG_PCI
|
#define CONFIG_PCI
|
||||||
#define CONFIG_PCI_TEGRA
|
|
||||||
#define CONFIG_PCI_PNP
|
#define CONFIG_PCI_PNP
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#define CONFIG_CMD_PCI_ENUM
|
#define CONFIG_CMD_PCI_ENUM
|
||||||
|
|
|
@ -58,7 +58,6 @@
|
||||||
|
|
||||||
/* PCI host support */
|
/* PCI host support */
|
||||||
#define CONFIG_PCI
|
#define CONFIG_PCI
|
||||||
#define CONFIG_PCI_TEGRA
|
|
||||||
#define CONFIG_PCI_PNP
|
#define CONFIG_PCI_PNP
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#define CONFIG_CMD_PCI_ENUM
|
#define CONFIG_CMD_PCI_ENUM
|
||||||
|
|
|
@ -54,7 +54,6 @@
|
||||||
|
|
||||||
/* PCI host support */
|
/* PCI host support */
|
||||||
#define CONFIG_PCI
|
#define CONFIG_PCI
|
||||||
#define CONFIG_PCI_TEGRA
|
|
||||||
#define CONFIG_PCI_PNP
|
#define CONFIG_PCI_PNP
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#define CONFIG_CMD_PCI_ENUM
|
#define CONFIG_CMD_PCI_ENUM
|
||||||
|
|
|
@ -56,7 +56,6 @@
|
||||||
|
|
||||||
/* PCI host support */
|
/* PCI host support */
|
||||||
#define CONFIG_PCI
|
#define CONFIG_PCI
|
||||||
#define CONFIG_PCI_TEGRA
|
|
||||||
#define CONFIG_PCI_PNP
|
#define CONFIG_PCI_PNP
|
||||||
#define CONFIG_CMD_PCI
|
#define CONFIG_CMD_PCI
|
||||||
#define CONFIG_CMD_PCI_ENUM
|
#define CONFIG_CMD_PCI_ENUM
|
||||||
|
|
Loading…
Add table
Reference in a new issue