diff options
| author | Tom Rini <trini@ti.com> | 2015-01-01 15:10:39 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-01-01 15:10:39 -0500 |
| commit | a74a4a86a53726ba17de8ab863bec1cd60cf545e (patch) | |
| tree | 2dcb09a706850fa6cb1377b00815be6b8f71f606 /include/configs | |
| parent | b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331 (diff) | |
| parent | cc0856cd149acc7069ae97ebe10b92090a65f575 (diff) | |
| download | u-boot-a74a4a86a53726ba17de8ab863bec1cd60cf545e.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/beaver.h | 10 | ||||
| -rw-r--r-- | include/configs/cardhu.h | 10 | ||||
| -rw-r--r-- | include/configs/jetson-tk1.h | 13 | ||||
| -rw-r--r-- | include/configs/tegra-common.h | 4 | ||||
| -rw-r--r-- | include/configs/trimslice.h | 10 |
5 files changed, 46 insertions, 1 deletions
diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 5d765f3d36..5df460c96b 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -76,6 +76,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_NET #define CONFIG_CMD_DHCP diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 758b7ad392..5e13b655c2 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -78,6 +78,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_NET #define CONFIG_CMD_DHCP diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index a7d76650ce..0a79c7cfc3 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -10,6 +10,9 @@ #include <linux/sizes.h> +/* enable PMIC */ +#define CONFIG_AS3722_POWER + #include "tegra124-common.h" /* High-level configuration options */ @@ -61,6 +64,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_NET #define CONFIG_CMD_DHCP diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 06853285a2..8f1e370915 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -47,7 +47,9 @@ * Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (4 << 20) /* 4MB */ -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10) +#define CONFIG_SYS_MALLOC_F_LEN (1 << 10) + +#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20) /* 1 MiB */ /* * NS16550 Configuration diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index a254f86409..59f4f6767b 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -60,6 +60,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_NET #define CONFIG_CMD_DHCP |