summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-08-18 14:14:34 -0400
committerTom Rini <trini@ti.com>2013-08-18 14:14:34 -0400
commite20cc2ca15b5b0644f51b6e58d530d70acd2bc00 (patch)
treef85a22536682ef54e77b1ba95cf0b71d00644632 /doc
parentf21876174364391757e743cb8673d3fc5fce7ac7 (diff)
parent9ed887caecb9ecb0c68773a1870d143b9f28d3da (diff)
downloadu-boot-imx-e20cc2ca15b5b0644f51b6e58d530d70acd2bc00.zip
u-boot-imx-e20cc2ca15b5b0644f51b6e58d530d70acd2bc00.tar.gz
u-boot-imx-e20cc2ca15b5b0644f51b6e58d530d70acd2bc00.tar.bz2
Merge branch 'master' of git://88.191.163.10/u-boot-arm
Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts: arch/arm/include/asm/arch-am33xx/hardware.h Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/README.falcon2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/README.falcon b/doc/README.falcon
index 93e855d..6357b1e 100644
--- a/doc/README.falcon
+++ b/doc/README.falcon
@@ -41,6 +41,8 @@ file (CONFIG_CMD_SPL_NAND_OFS for NAND).
3. Boot the board into Falcon Mode. SPL will load the kernel and copy
the parameters which are saved in the persistent area to the required address.
+If a valid uImage is not found at the defined location, U-Boot will be
+booted instead.
It is required to implement a custom mechanism to select if SPL loads U-Boot
or another image.