summaryrefslogtreecommitdiff
path: root/common/main.c
AgeCommit message (Collapse)Author
2011-01-09cmd editing: mark erase/tab seqs constantMike Frysinger
These strings are only read, so no need to have them be writable. Signed-off-by: Mike Frysinger <[email protected]>
2010-11-28autocomplete: remove runtime handler installMike Frysinger
Rather than add runtime overhead of installing completion handlers, do it statically at build time. This requires a new build time helper macro to declare a command and the completion handler at the same time. Then we convert the env related funcs over to this. This gives an opportunity to also unify the U_BOOT_CMD macros. Signed-off-by: Mike Frysinger <[email protected]>
2010-11-28do_reset: unify duplicate prototypesMike Frysinger
The duplication of the do_reset prototype has gotten out of hand, and they're not all in sync. Unify them all in command.h. Signed-off-by: Mike Frysinger <[email protected]>
2010-11-28do_bootd: unify duplicate prototypesMike Frysinger
Signed-off-by: Mike Frysinger <[email protected]>
2010-10-06Replace MAX_CMDBUF_SIZE references with CONFIG_SYS_CBSIZEPeter Tyser
The MAX_CMDBUF_SIZE define is unneeded as it should always equal CONFIG_SYS_CBSIZE. Signed-off-by: Peter Tyser <[email protected]>
2010-08-09cmd editing: optimize/shrink output blankingMike Frysinger
No need to output spaces 1 char at a time in a loop when the printf code can do the same thing with the right format string. This shrinks things and gives a nice speed up when killing off lines more than a byte or two as printf will send out the buffer in one big chunk. Signed-off-by: Mike Frysinger <[email protected]>
2010-07-24cmd_usage(): simplify return code handlingWolfgang Denk
Lots of code use this construct: cmd_usage(cmdtp); return 1; Change cmd_usage() let it return 1 - then we can replace all these ocurrances by return cmd_usage(cmdtp); This fixes a few places with incorrect return code handling, too. Signed-off-by: Wolfgang Denk <[email protected]>
2010-07-04Make sure that argv[] argument pointers are not modified.Wolfgang Denk
The hush shell dynamically allocates (and re-allocates) memory for the argument strings in the "char *argv[]" argument vector passed to commands. Any code that modifies these pointers will cause serious corruption of the malloc data structures and crash U-Boot, so make sure the compiler can check that no such modifications are being done by changing the code into "char * const argv[]". This modification is the result of debugging a strange crash caused after adding a new command, which used the following argument processing code which has been working perfectly fine in all Unix systems since version 6 - but not so in U-Boot: int main (int argc, char **argv) { while (--argc > 0 && **++argv == '-') { /* ====> */ while (*++*argv) { switch (**argv) { case 'd': debug++; break; ... default: usage (); } } } ... } The line marked "====>" will corrupt the malloc data structures and usually cause U-Boot to crash when the next command gets executed by the shell. With the modification, the compiler will prevent this with an error: increment of read-only location '*argv' N.B.: The code above can be trivially rewritten like this: while (--argc > 0 && **++argv == '-') { char *arg = *argv; while (*++arg) { switch (*arg) { ... Signed-off-by: Wolfgang Denk <[email protected]> Acked-by: Mike Frysinger <[email protected]>
2010-06-23Remove AmigaOneG3SE boardWolfgang Denk
The AmigaOneG3SE board has been orphaned or a very long time, and broken for more than 12 releases resp. more than 3 years. As nobody seems to be interested any more in this stuff we may as well ged rid of it, especially as it clutters many areas of the code so it is a continuous pain for all kinds of ongoing work. Signed-off-by: Wolfgang Denk <[email protected]>
2010-04-10FIX: watchdog timeout, while waiting for inputJens Scharsig
* 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 <[email protected]>
2010-03-21cmd history: Match history buffer size to console bufferJohn Schmoller
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 <[email protected]>
2010-03-21console: Fix console buffer overrunJohn Schmoller
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 <[email protected]>
2010-03-11Move CONFIG_UPDATE_TFTP code after CONFIG_PREBOOTWolfgang Denk
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 <[email protected]>
2009-10-27readline(): Add ability to modify a string bufferPeter Tyser
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 <[email protected]>
2009-10-27cread_line(): Remove unused variablesPeter Tyser
Signed-off-by: Peter Tyser <[email protected]>
2009-10-27Check for NULL prompt in readline_into_buffer()Peter Tyser
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 <[email protected]>
2009-05-15Remove inline qualifier from show_boot_progress()Emil Medve
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 <[email protected]>
2009-01-28Standardize command usage messages with cmd_usage()Peter Tyser
Signed-off-by: Peter Tyser <[email protected]>
2009-01-24common/main: support bootdelay=0 for CONFIG_AUTOBOOT_KEYEDPeter Korsgaard
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 <[email protected]>
2008-10-18rename CFG_ macros to CONFIG_SYSJean-Christophe PLAGNIOL-VILLARD
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
2008-10-18hush: add showvar command for hush shell.Heiko Schocher
This new command shows the local variables defined in the hush shell: => help showvar showvar - print values of all hushshell variables showvar name ... - print value of hushshell variable 'name' Also make the set_local_var() and unset_local_var () no longer static, so it is possible to define local hush shell variables at boot time. If CONFIG_HUSH_INIT_VAR is defined, u-boot calls hush_init_var (), where boardspecific code can define local hush shell variables at boottime. Signed-off-by: Heiko Schocher <[email protected]>
2008-10-18Automatic software update from TFTP serverBartlomiej Sieka
The auto-update feature allows to automatically download software updates from a TFTP server and store them in Flash memory during boot. Updates are contained in a FIT file and protected with SHA-1 checksum. More detailed description can be found in doc/README.update. Signed-off-by: Rafal Czubak <[email protected]> Signed-off-by: Bartlomiej Sieka <[email protected]>
2008-08-06Fix merge problemsStefan Roese
Signed-off-by: Stefan Roese <[email protected]>
2008-07-09Fix printf errors.Andrew Klossner
The compiler will help find mismatches between printf formats and arguments if you let it. This patch adds the necessary attributes to declarations in include/common.h, then begins to correct the resulting compiler warnings. Some of these were bugs, e.g., "$d" instead of "%d" and incorrect arguments. Others were just annoying, like int-long mismatches on a system where both are 32 bits. It's worth fixing the annoying errors to catch the real ones. Signed-off-by: Andrew Klossner <[email protected]>
2008-06-03Additional fix to readline_into_buffer() with CONFIG_CMDLINE_EDITING before ↵Peter Tyser
relocating Removed unneeded command line history initialization. Also, the original code would access the 'initted' variable before relocation to SDRAM which resulted in erratic behavior since the bss is not initialized when executing from flash. Signed-off-by: Peter Tyser <[email protected]>
2008-05-09Fix readline_into_buffer() with CONFIG_CMDLINE_EDITING before relocatingJames Yang
When CONFIG_CMDLINE_EDITING is enabled, readline_into_buffer() doesn't work before relocating to RAM because command history is written into a global array that is not writable before relocation. This patch defers to the no-editing and no-history code in readline_into_buffer() if it is called before relocation. Signed-off-by: James Yang <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2008-03-18The patch introduces the CRITICAL feature of POST tests. If the test marked ↵Yuri Tikhonov
as POST_CRITICAL fails then the alternative, post_critical, boot-command is used. If this command is not defined then U-Boot enters into interactive mode. Signed-off-by: Dmitry Rakhchev <[email protected]> Signed-off-by: Yuri Tikhonov <[email protected]>
2008-01-12Make bootretry work when command line editing is enabledAndreas Engel
Currently, when CONFIG_CMDLINE_EDITING is set, bootretry doesn't work. This patch fixes the problem. Signed-off-by: Andreas Engel <[email protected]>
2008-01-11Fix compiler warningKumar Gala
main.c: In function 'readline_into_buffer': main.c:927: warning: unused variable 'p_buf' Signed-off-by: Kumar Gala <[email protected]>
2008-01-09Expose parse_line() globally.James Yang
Add new function readline_into_buffer() that allows the output of readline to be put into a pointer to char buffer. This refactoring allows other functions besides the main command loop to also use the same input mechanism. Signed-off-by: James Yang <[email protected]> Acked-by: Jon Loeliger <[email protected]>
2008-01-09Allow CONFIG_AUTO_COMPLETE and command history CONFIG_CMDLINE_EDITING at the ↵Jean-Christophe PLAGNIOL-VILLARD
sametime Signed-off-by: Mike Frysinger <[email protected]> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
2007-08-06Merge with /home/wd/git/u-boot/custodian/u-boot-testingWolfgang Denk
2007-07-13make show_boot_progress () weak.Heiko Schocher
Signed-off-by: Heiko Schocher <[email protected]>
2007-07-10common/: Remove lingering references to CFG_CMD_* symbols.Jon Loeliger
Fixed some broken instances of "#ifdef CMD_CFG_IDE" too. Those always evaluated TRUE, and thus were always compiled even when IDE really wasn't defined/wanted. Signed-off-by: Jon Loeliger <[email protected]>
2007-07-08common/* non-cmd*: Remove obsolete references to CONFIG_COMMANDSJon Loeliger
Signed-off-by: Jon Loeliger <[email protected]>
2007-07-04common/ non-cmd: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).Jon Loeliger
This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely. All transformations are of the form: Before: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) After: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT) Signed-off-by: Jon Loeliger <[email protected]>
2007-07-03Merge with /home/wd/git/u-boot/custodian/u-boot-testingWolfgang Denk
2007-06-22Coding stylke cleanup; rebuild CHANGELOGWolfgang Denk
2007-06-12Fix 'run' not to continue after interrupted commandDetlev Zundel
Signed-off-by: Detlev Zundel <[email protected]>
2007-05-28Merge with /home/tur/git/u-boot#motionproWolfgang Denk
2007-05-27Fix: Add missing NULL termination in strings expanded by macros parser.Bartlomiej Sieka
Signed-off-by: Piotr Kruszynski <[email protected]> Acked-by: Bartlomiej Sieka <[email protected]>
2007-05-05Merge with /home/git/u-bootWolfgang Denk
2007-05-05[PATCH] simplify silent consoleLadislav Michl
Signed-off-by: Ladislav Michl <[email protected]> Acked-by: Stefan Roese <[email protected]>
2007-04-25[PATCH] simplify silent consoleLadislav Michl
Signed-off-by: Ladislav Michl <[email protected]> Acked-by: Stefan Roese <[email protected]>
2006-10-28Minor code cleanup.Wolfgang Denk
2006-08-07Fix control-c handing in CONFIG_CMDLINE_EDITINGStefan Roese
Properly pass break code back from readline. Patch by Roger Blofeld, 31 Jul 2006
2006-07-27Fix CONFIG_CMDLINE_EDITING implementationStefan Roese
Patch by Stefan Roese, 27 Jul 2006
2006-07-21Minor code cleanup.Wolfgang Denk
2006-07-21Add readline cmdline-editing extensionWolfgang Denk
Patch by JinHua Luo, 01 Sep 2005
2006-03-31GCC-4.x fixes: clean up global data pointer initialization for all boards.Wolfgang Denk