diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-12 15:59:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-12 19:32:51 -0500 |
| commit | bc80109b117abe4ed2cd4d12c8dc188561bc298e (patch) | |
| tree | c51f0fcaa1bcc0c17a1119f7d47a0b943b063c7f /include | |
| parent | 42d1b818a866840a5009309b4901b5ce28572467 (diff) | |
| parent | e1cf5278024eb5c72abd69d6bda266ffc5832941 (diff) | |
| download | u-boot-bc80109b117abe4ed2cd4d12c8dc188561bc298e.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/jetson-tk1.h | 2 | ||||
| -rw-r--r-- | include/configs/p2371-2180.h | 10 | ||||
| -rw-r--r-- | include/configs/p2571.h | 2 | ||||
| -rw-r--r-- | include/configs/tegra-common.h | 2 | ||||
| -rw-r--r-- | include/configs/venice2.h | 2 | ||||
| -rw-r--r-- | include/fdtdec.h | 1 |
6 files changed, 13 insertions, 6 deletions
diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index e87a01047d..f63957ab92 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -78,6 +78,4 @@ #define CONFIG_ARMV7_SECURE_BASE 0xfff00000 #define CONFIG_ARMV7_SECURE_RESERVE_SIZE 0x00100000 -#define CONFIG_OF_BOARD_SETUP - #endif /* __CONFIG_H */ diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 3bdf1961a3..94f8085ceb 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -53,6 +53,16 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX +/* PCI host support */ +#define CONFIG_PCI +#define CONFIG_PCI_TEGRA +#define CONFIG_PCI_PNP +#define CONFIG_CMD_PCI +#define CONFIG_CMD_PCI_ENUM + +/* PCI networking support */ +#define CONFIG_RTL8169 + /* General networking support */ #define CONFIG_CMD_DHCP diff --git a/include/configs/p2571.h b/include/configs/p2571.h index c65d3e5fcb..a5de411121 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -60,6 +60,4 @@ #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" -#define CONFIG_OF_BOARD_SETUP - #endif /* _P2571_H */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index a005e6a2ac..32cc39bbe3 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -143,4 +143,6 @@ #define CONFIG_FAT_WRITE #endif +#define CONFIG_OF_SYSTEM_SETUP + #endif /* _TEGRA_COMMON_H_ */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 0fc8cf7674..a374cd9488 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -60,6 +60,4 @@ #include "tegra-common-usb-gadget.h" #include "tegra-common-post.h" -#define CONFIG_OF_BOARD_SETUP - #endif /* __CONFIG_H */ diff --git a/include/fdtdec.h b/include/fdtdec.h index 0e36664dca..3a6ff1f8ac 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -130,6 +130,7 @@ enum fdt_compat_id { COMPAT_NVIDIA_TEGRA30_SDMMC, /* Tegra30 SDMMC controller */ COMPAT_NVIDIA_TEGRA20_SDMMC, /* Tegra20 SDMMC controller */ COMPAT_NVIDIA_TEGRA124_PCIE, /* Tegra 124 PCIe controller */ + COMPAT_NVIDIA_TEGRA210_PCIE, /* Tegra 210 PCIe controller */ COMPAT_NVIDIA_TEGRA30_PCIE, /* Tegra 30 PCIe controller */ COMPAT_NVIDIA_TEGRA20_PCIE, /* Tegra 20 PCIe controller */ COMPAT_NVIDIA_TEGRA124_XUSB_PADCTL, |