summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/README.hwconfig2
-rw-r--r--doc/git-mailrc2
-rw-r--r--doc/uImage.FIT/command_syntax_extensions.txt2
-rw-r--r--doc/uImage.FIT/source_file_format.txt2
4 files changed, 5 insertions, 3 deletions
diff --git a/doc/README.hwconfig b/doc/README.hwconfig
index cf549651c7..b6ddb438cf 100644
--- a/doc/README.hwconfig
+++ b/doc/README.hwconfig
@@ -18,7 +18,7 @@ Current implementation details/limitations:
U-Boot. But I haven't bothered yet.
2. Since we don't implement a hwconfig command, i.e. we're working
- with the environement directly, there is no way to tell that
+ with the environment directly, there is no way to tell that
toggling a particular option will need a reboot to take
effect. So, for now it's advised to always reboot the
target after modifying the hwconfig variable.
diff --git a/doc/git-mailrc b/doc/git-mailrc
index 2cacaa0341..251586e052 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -18,6 +18,7 @@ alias galak Kumar Gala <galak@kernel.crashing.org>
alias gruss Graeme Russ <graeme.russ@gmail.com>
alias hs Heiko Schocher <hs@denx.de>
alias iwamatsu Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+alias jagan Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
alias jasonjin Jason Jin <jason.jin@freescale.com>
alias jhersh Joe Hershberger <joe.hershberger@gmail.com>
alias kimphill Kim Phillips <kim.phillips@freescale.com>
@@ -106,5 +107,6 @@ alias i2c uboot, hs
alias mmc uboot, panto
alias nand uboot, scottwood
alias net uboot, jhersh
+alias spi uboot, jagan
alias usb uboot, marex
alias video uboot, ag
diff --git a/doc/uImage.FIT/command_syntax_extensions.txt b/doc/uImage.FIT/command_syntax_extensions.txt
index 002818c226..6c99b1c159 100644
--- a/doc/uImage.FIT/command_syntax_extensions.txt
+++ b/doc/uImage.FIT/command_syntax_extensions.txt
@@ -170,7 +170,7 @@ bootm 200000
In case of the new uImage argument syntax, the address portion of any argument
can be omitted. If <addr3> is omitted, then it is assumed that image at
-<addr2> should be used. Similarly, when <addr2> is omitted, is is assumed that
+<addr2> should be used. Similarly, when <addr2> is omitted, it is assumed that
image at <addr1> should be used. If <addr1> is omitted, it is assumed that the
current image address is to be used. For example, consider the following
commands:
diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt
index 6d2070758d..160b2d05f8 100644
--- a/doc/uImage.FIT/source_file_format.txt
+++ b/doc/uImage.FIT/source_file_format.txt
@@ -62,7 +62,7 @@ c) Image building procedure
The following picture shows how the new uImage is prepared. Input consists of
image source file (.its) and a set of data files. Image is created with the
help of standard U-boot mkimage tool which in turn uses dtc (device tree
-compiler) to produce image tree blob (.itb). Resulting .itb file is is the
+compiler) to produce image tree blob (.itb). Resulting .itb file is the
actual binary of a new uImage.
OpenPOWER on IntegriCloud