summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2015-03-05 16:05:10 +0100
committerStefano Babic <sbabic@denx.de>2015-03-05 16:05:10 +0100
commit9b5b60a05cb8bba2d135439419b2030764e359bd (patch)
tree15e249ac39e9c547668327218e63a0faf54a3283 /doc
parent32df39c741788e8637cffe6633d73594b26d70fb (diff)
parent7ae8350f67eea861280a4cbd2d067777a0e87153 (diff)
downloadtalos-obmc-uboot-9b5b60a05cb8bba2d135439419b2030764e359bd.tar.gz
talos-obmc-uboot-9b5b60a05cb8bba2d135439419b2030764e359bd.zip
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'doc')
-rw-r--r--doc/README.android-fastboot5
-rw-r--r--doc/README.uniphier3
-rw-r--r--doc/git-mailrc2
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/README.android-fastboot b/doc/README.android-fastboot
index 167760968f..5526a4343c 100644
--- a/doc/README.android-fastboot
+++ b/doc/README.android-fastboot
@@ -6,9 +6,8 @@ Overview
The protocol that is used over USB is described in
README.android-fastboot-protocol in same directory.
-The current implementation does not yet support the erase command or the
-"oem format" command, and there is minimal support for the flash command;
-it only supports eMMC devices.
+The current implementation is a minimal support of the erase command,the
+"oem format" command and flash command;it only supports eMMC devices.
Client installation
===================
diff --git a/doc/README.uniphier b/doc/README.uniphier
index aaeb50c4e6..4902533544 100644
--- a/doc/README.uniphier
+++ b/doc/README.uniphier
@@ -73,7 +73,8 @@ Supported devices
- UART (on-chip)
- NAND
- - USB (2.0)
+ - USB 2.0 (EHCI)
+ - USB 3.0 (xHCI)
- LAN (on-board SMSC9118)
- I2C
- EEPROM (connected to the on-board I2C bus)
diff --git a/doc/git-mailrc b/doc/git-mailrc
index 8ba599cd9d..025c0b3cac 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -45,7 +45,7 @@ alias sjg Simon Glass <sjg@chromium.org>
alias smcnutt Scott McNutt <smcnutt@psyent.com>
alias sonic Sonic Zhang <sonic.adi@gmail.com>
alias stroese Stefan Roese <sr@denx.de>
-alias trini Tom Rini <trini@ti.com>
+alias trini Tom Rini <trini@konsulko.com>
alias vapier Mike Frysinger <vapier@gentoo.org>
alias wd Wolfgang Denk <wd@denx.de>
OpenPOWER on IntegriCloud