diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-07 13:32:42 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-07 13:32:42 (GMT) |
commit | de4fdfc1f22d70c23be5443dafacb8163023f9b1 (patch) | |
tree | 47c20593a6d3c9f1a558f0c7590cd0458ed09a99 /include/configs/tegra30-common.h | |
parent | dd1e8583ee533a349c03ed4d75446898fe8dbac6 (diff) | |
parent | f940c72e16f7bdebaaed79b290c1bcb6dc015053 (diff) | |
download | u-boot-de4fdfc1f22d70c23be5443dafacb8163023f9b1.tar.xz |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/tegra30-common.h')
-rw-r--r-- | include/configs/tegra30-common.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index b5550d7..443c842 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -23,11 +23,6 @@ */ #define V_NS16550_CLK 408000000 /* 408MHz (pllp_out0) */ -/* - * High Level Configuration Options - */ -#define CONFIG_TEGRA30 /* in a NVidia Tegra30 core */ - /* Environment information, boards can override if required */ #define CONFIG_LOADADDR 0x80408000 /* def. location for kernel */ @@ -48,6 +43,9 @@ * scriptaddr can be pretty much anywhere that doesn't conflict with something * else. Put it above BOOTMAPSZ to eliminate conflicts. * + * pxefile_addr_r can be pretty much anywhere that doesn't conflict with + * something else. Put it above BOOTMAPSZ to eliminate conflicts. + * * kernel_addr_r must be within the first 128M of RAM in order for the * kernel's CONFIG_AUTO_ZRELADDR option to work. Since the kernel will * decompress itself to 0x8000 after the start of RAM, kernel_addr_r @@ -65,6 +63,7 @@ */ #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x90000000\0" \ + "pxefile_addr_r=0x90100000\0" \ "kernel_addr_r=0x81000000\0" \ "fdt_addr_r=0x82000000\0" \ "ramdisk_addr_r=0x82100000\0" @@ -80,5 +79,6 @@ /* For USB EHCI controller */ #define CONFIG_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10 +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1 #endif /* _TEGRA30_COMMON_H_ */ |