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 8abf98a..f939bdb 100644
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -13,6 +13,7 @@
# 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 dcc9cc3..2930344 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -13,7 +13,11 @@
# 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 65587e3..5760018 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -13,7 +13,11 @@
# 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 8bc3015..9500d2c 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -13,7 +13,11 @@
# 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 28d6426..c41f322 100644
--- a/configs/p2371-2180_defconfig
+++ b/configs/p2371-2180_defconfig
@@ -15,5 +15,6 @@
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 e3c45f9..ee40218 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -13,7 +13,11 @@
# 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