diff options
author | Stefan Roese <sr@denx.de> | 2008-08-06 16:05:38 +0400 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-08-06 16:05:38 +0400 |
commit | f2302d4430e7f3f48308d6a585320fe96af8afbd (patch) | |
tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 /doc | |
parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
download | u-boot-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.xz |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/README.autoboot | 15 | ||||
-rw-r--r-- | doc/README.qemu_mips | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/doc/README.autoboot b/doc/README.autoboot index e4c4186735..2042fe5c40 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 diff --git a/doc/README.qemu_mips b/doc/README.qemu_mips index 476c5e6899..c9ac3f307d 100644 --- a/doc/README.qemu_mips +++ b/doc/README.qemu_mips @@ -15,4 +15,4 @@ create image: # dd of=flash bs=1k count=4k if=/dev/zero # dd of=flash bs=1k conv=notrunc if=u-boot.bin start it: -# qemu-system-mips -pflash flash -monitor null -nographic +# qemu-system-mips -M mips -pflash flash -monitor null -nographic |