summaryrefslogtreecommitdiff
path: root/doc/README.autoboot
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-08-06 15:12:38 +0200
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-08-06 15:12:38 +0200
commit7772c13ba07eaabd42499998f3713b23350fc119 (patch)
tree32718a8e67114d0ea5dbdb1fdcf58aad09dd52dc /doc/README.autoboot
parentb2b15ebb66f0e7958dff8916077da0aceb2982a8 (diff)
parent0eb5717a85b6cba3f67c11fa89bdde38dcd081b5 (diff)
downloadu-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.zip
u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.gz
u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.bz2
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
Conflicts: MAINTAINERS MAKEALL Makefile
Diffstat (limited to 'doc/README.autoboot')
-rw-r--r--doc/README.autoboot15
1 files changed, 11 insertions, 4 deletions
diff --git a/doc/README.autoboot b/doc/README.autoboot
index e4c4186..2042fe5 100644
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -114,10 +114,17 @@ What they do
CONFIG_AUTOBOOT_PROMPT is displayed before the boot delay
selected by CONFIG_BOOTDELAY starts. If it is not defined
there is no output indicating that autoboot is in progress.
- If "%d" is included, it is replaced by the number of seconds
- remaining before autoboot will start, but it does not count
- down the seconds. "autoboot in %d seconds\n" is a reasonable
- prompt.
+
+ Note that CONFIG_AUTOBOOT_PROMPT is used as the (only)
+ argument to a printf() call, so it may contain '%' format
+ specifications, provided that it also includes, sepearated by
+ commas exactly like in a printf statement, the required
+ arguments. It is the responsibility of the user to select only
+ such arguments that are valid in the given context. A
+ reasonable prompt could be defined as
+
+ #define CONFIG_AUTOBOOT_PROMPT \
+ "autoboot in %d seconds\n",bootdelay
If CONFIG_AUTOBOOT_DELAY_STR or "bootdelaykey" is specified
and this string is received from console input before