diff options
| author | wdenk <wdenk> | 2003-06-30 16:24:52 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-06-30 16:24:52 +0000 |
| commit | b37c7e5e5c3c80c68f49a31c4308b159bb5bda1a (patch) | |
| tree | a67e4a61c80dd3744707429e72eb2f5256e682b6 /common | |
| parent | b0fce99bfc116c2ddb4506268d6e4a0a7054478d (diff) | |
| download | u-boot-b37c7e5e5c3c80c68f49a31c4308b159bb5bda1a.zip u-boot-b37c7e5e5c3c80c68f49a31c4308b159bb5bda1a.tar.gz u-boot-b37c7e5e5c3c80c68f49a31c4308b159bb5bda1a.tar.bz2 | |
* Patch by Seb James, 30 Jun 2003:
Improve documentation of I2C configuration in README
* Fix problems with previous log buffer "fixes"
* Fix minor help text issues
* "log append" did not append a newline
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bmp.c | 2 | ||||
| -rw-r--r-- | common/cmd_log.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index 6e813c6..69f6fa6 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Dtlev Zundel, DENX Software Engineering, dzu@denx.de. + * Detlev Zundel, DENX Software Engineering, dzu@denx.de. * * See file CREDITS for list of people who contributed to this * project. diff --git a/common/cmd_log.c b/common/cmd_log.c index 8132570..534c67e 100644 --- a/common/cmd_log.c +++ b/common/cmd_log.c @@ -74,22 +74,26 @@ static unsigned long *ext_logged_chars; void logbuff_init_ptrs (void) { DECLARE_GLOBAL_DATA_PTR; + unsigned long *ext_tag; char *s; log_buf = (unsigned char *)(gd->bd->bi_memsize-LOGBUFF_LEN); - ext_log_start = (unsigned long *)(log_buf)-3; + ext_tag = (unsigned long *)(log_buf)-4; + ext_log_start = (unsigned long *)(log_buf)-3; ext_log_size = (unsigned long *)(log_buf)-2; ext_logged_chars = (unsigned long *)(log_buf)-1; #ifdef CONFIG_POST /* The post routines have setup the word so we can simply test it */ - if (post_word_load () & POST_POWERON) { + if ((post_word_load () & 0xffff) == POST_POWERON) { logged_chars = log_size = log_start = 0; + *ext_tag = LOGBUFF_MAGIC; } #else /* No post routines, so we do our own checking */ if (post_word_load () != LOGBUFF_MAGIC) { logged_chars = log_size = log_start = 0; post_word_store (LOGBUFF_MAGIC); + *ext_tag = LOGBUFF_MAGIC; } #endif /* Initialize default loglevel if present */ @@ -162,12 +166,8 @@ int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (strcmp(argv[1],"append") == 0) { /* Log concatenation of all arguments separated by spaces */ for (i=2; i<argc; i++) { - if (i<argc-1) { - logbuff_printk (argv[i]); - logbuff_putc (' '); - } else { - logbuff_puts (argv[i]); - } + logbuff_printk (argv[i]); + logbuff_putc ((i<argc-1) ? ' ' : '\n'); } return 0; } @@ -205,7 +205,7 @@ int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) cmd_tbl_t U_BOOT_CMD(LOG) = MK_CMD_ENTRY( "log", 255, 1, do_log, "log - manipulate logbuffer\n", - "log info - show pointer details\n" + "info - show pointer details\n" "log reset - clear contents\n" "log show - show contents\n" "log append <msg> - append <msg> to the logbuffer\n" |