u-boot.git/common/main.c, branch v2010.06

FIX: watchdog timeout, while waiting for input

2010-04-10T21:31:31+00:00

* add WATCHDOG_RESET to !tstc() loops
* prevents watchdog timeout, while waiting for input,
  if CONFIG_BOOT_RETRY_TIME or CONFIG_SHOW_ACTIVITY defined

Signed-off-by: Jens Scharsig

cmd history: Match history buffer size to console buffer

2010-03-21T21:44:59+00:00

Match history buffer size to console buffer size. History buffer size
was hard coded to 256, artificially limiting the command buffer size.
The history buffer now tracks CONFIG_SYS_CBSIZE.

Signed-off-by: John Schmoller

console: Fix console buffer overrun

2010-03-21T21:44:58+00:00

When CONFIG_SYS_CBSIZE equals MAX_CMDBUF_SIZE, a command string of
maximum length will overwrite part of the history buffer, causing the
board to die. Expand the console_buffer and hist_lines buffer by one
character each to hold the missing NULL char.

Signed-off-by: John Schmoller

Move CONFIG_UPDATE_TFTP code after CONFIG_PREBOOT

2010-03-11T22:56:03+00:00

The auto-update feature (CONFIG_UPDATE_TFTP) requires that the env
variable serverip be set for the TFTP access. If DHCP is to be used
to get the serverip env variable, this doesn't work as DHCP happens
after the auto-update attempt has run. A solution is to run DHCP in
PREBOOT, but even this is too late.

To solve this, we move update_tftp() below the PREBOOT stuff.

Signed-off-by: Wolfgang Denk

readline(): Add ability to modify a string buffer

2009-10-27T19:58:25+00:00

If the 'buf' parameter is a non-0-length string, its contents will be
edited.  Previously, the initial contents of 'buf' were ignored and the
user entered its contents from scratch.

This change is necessary to support the upcoming "editenv" command but
could also be used for future commands which require a user to modify
an existing string.

Signed-off-by: Peter Tyser

cread_line(): Remove unused variables

2009-10-27T19:58:25+00:00

Signed-off-by: Peter Tyser

Check for NULL prompt in readline_into_buffer()

2009-10-27T19:58:25+00:00

Previously, passing readline() or readline_into_buffer() a NULL 'prompt'
parameter would result in puts() printing garbage when
CONFIG_CMDLINE_EDITING was enabled.

Note that no board currently triggers this bug.  Enabling
CONFIG_CMDLINE_EDITING on some boards (eg bab7xx) would result in
the bug appearing.  This change is only intended to prevent someone
from running into this issue in the future.

Signed-off-by: Peter Tyser

Remove inline qualifier from show_boot_progress()

2009-05-15T20:04:04+00:00

The 'inline' is conflicting with the semantic of 'weak' attribute and with the
way the show_boot_progress() function is used.

Also gcc 4.4 is complaining about it:

main.c:51: error: inline function 'show_boot_progress' cannot be declared weak

Signed-off-by: Emil Medve

Standardize command usage messages with cmd_usage()

2009-01-28T07:43:45+00:00

Signed-off-by: Peter Tyser

common/main: support bootdelay=0 for CONFIG_AUTOBOOT_KEYED

2009-01-24T00:24:15+00:00

Support bootdelay=0 in abortboot for the CONFIG_AUTOBOOT_KEYED case
similar to the CONFIG_ZERO_BOOTDELAY_CHECK support for the
!CONFIG_AUTOBOOT_KEYED case.

Do this by reversing the loop so we do at least one iteration before
checking for timeout.

Signed-off-by: Peter Korsgaard