projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
[oweals/u-boot.git]
/
common
/
cmd_log.c
diff --git
a/common/cmd_log.c
b/common/cmd_log.c
index fba8bd8bf5c51a3e39ecbaa0fd8ccb3d8f639eec..fdcc57571aa9d43a3a0ce849aa03ae453bf09c56 100644
(file)
--- a/
common/cmd_log.c
+++ b/
common/cmd_log.c
@@
-48,8
+48,6
@@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_LOGBUFFER)
-
/* Local prototypes */
static void logbuff_putc (const char c);
static void logbuff_puts (const char *s);
/* Local prototypes */
static void logbuff_putc (const char c);
static void logbuff_puts (const char *s);
@@
-61,14
+59,31
@@
static char buf[1024];
static unsigned console_loglevel = 3;
static unsigned default_message_loglevel = 4;
static unsigned log_version = 1;
static unsigned console_loglevel = 3;
static unsigned default_message_loglevel = 4;
static unsigned log_version = 1;
+#ifdef CONFIG_ALT_LB_ADDR
+static volatile logbuff_t *log;
+#else
static logbuff_t *log;
static logbuff_t *log;
+#endif
+static char *lbuf;
+
+unsigned long __logbuffer_base(void)
+{
+ return CFG_SDRAM_BASE + gd->bd->bi_memsize - LOGBUFF_LEN;
+}
+unsigned long logbuffer_base (void) __attribute__((weak, alias("__logbuffer_base")));
void logbuff_init_ptrs (void)
{
unsigned long tag, post_word;
char *s;
void logbuff_init_ptrs (void)
{
unsigned long tag, post_word;
char *s;
- log = (logbuff_t *)(gd->bd->bi_memsize-LOGBUFF_LEN) - 1;
+#ifdef CONFIG_ALT_LB_ADDR
+ log = (logbuff_t *)CONFIG_ALT_LH_ADDR;
+ lbuf = (char *)CONFIG_ALT_LB_ADDR;
+#else
+ log = (logbuff_t *)(logbuffer_base ()) - 1;
+ lbuf = (char *)log->buf;
+#endif
/* Set up log version */
if ((s = getenv ("logversion")) != NULL)
/* Set up log version */
if ((s = getenv ("logversion")) != NULL)
@@
-98,16
+113,31
@@
void logbuff_init_ptrs (void)
if ((s = getenv ("loglevel")) != NULL)
console_loglevel = (int)simple_strtoul (s, NULL, 10);
if ((s = getenv ("loglevel")) != NULL)
console_loglevel = (int)simple_strtoul (s, NULL, 10);
- gd->
post_log_word |= LOGBUFF_INITIALIZED
;
+ gd->
flags |= GD_FLG_LOGINIT
;
}
void logbuff_reset (void)
{
}
void logbuff_reset (void)
{
+#ifndef CONFIG_ALT_LB_ADDR
memset (log, 0, sizeof (logbuff_t));
memset (log, 0, sizeof (logbuff_t));
- if (log_version == 2)
+#endif
+ if (log_version == 2) {
log->v2.tag = LOGBUFF_MAGIC;
log->v2.tag = LOGBUFF_MAGIC;
- else
+#ifdef CONFIG_ALT_LB_ADDR
+ log->v2.start = 0;
+ log->v2.con = 0;
+ log->v2.end = 0;
+ log->v2.chars = 0;
+#endif
+ } else {
log->v1.tag = LOGBUFF_MAGIC;
log->v1.tag = LOGBUFF_MAGIC;
+#ifdef CONFIG_ALT_LB_ADDR
+ log->v1.dummy = 0;
+ log->v1.start = 0;
+ log->v1.size = 0;
+ log->v1.chars = 0;
+#endif
+ }
}
int drv_logbuff_init (void)
}
int drv_logbuff_init (void)
@@
-144,7
+174,7
@@
static void logbuff_puts (const char *s)
void logbuff_log(char *msg)
{
void logbuff_log(char *msg)
{
- if ((gd->
post_log_word & LOGBUFF_INITIALIZED
)) {
+ if ((gd->
flags & GD_FLG_LOGINIT
)) {
logbuff_printk (msg);
} else {
/* Can happen only for pre-relocated errors as logging */
logbuff_printk (msg);
} else {
/* Can happen only for pre-relocated errors as logging */
@@
-190,7
+220,7
@@
int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
size = log->v1.size;
}
for (i=0; i < (size&LOGBUFF_MASK); i++) {
size = log->v1.size;
}
for (i=0; i < (size&LOGBUFF_MASK); i++) {
- s =
(char *)log->
buf+((start+i)&LOGBUFF_MASK);
+ s =
l
buf+((start+i)&LOGBUFF_MASK);
putc (*s);
}
return 0;
putc (*s);
}
return 0;
@@
-198,7
+228,7
@@
int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
logbuff_reset ();
return 0;
} else if (strcmp(argv[1],"info") == 0) {
logbuff_reset ();
return 0;
} else if (strcmp(argv[1],"info") == 0) {
- printf ("Logbuffer at %08lx\n", (unsigned long)l
og->
buf);
+ printf ("Logbuffer at %08lx\n", (unsigned long)lbuf);
if (log_version == 2) {
printf ("log_start = %08lx\n", log->v2.start);
printf ("log_end = %08lx\n", log->v2.end);
if (log_version == 2) {
printf ("log_start = %08lx\n", log->v2.start);
printf ("log_end = %08lx\n", log->v2.end);
@@
-259,14
+289,14
@@
static int logbuff_printk(const char *line)
line_feed = 0;
for (; p < buf_end; p++) {
if (log_version == 2) {
line_feed = 0;
for (; p < buf_end; p++) {
if (log_version == 2) {
- l
og->
buf[log->v2.end & LOGBUFF_MASK] = *p;
+ lbuf[log->v2.end & LOGBUFF_MASK] = *p;
log->v2.end++;
if (log->v2.end - log->v2.start > LOGBUFF_LEN)
log->v2.start++;
log->v2.chars++;
}
else {
log->v2.end++;
if (log->v2.end - log->v2.start > LOGBUFF_LEN)
log->v2.start++;
log->v2.chars++;
}
else {
- l
og->
buf[(log->v1.start + log->v1.size) &
+ lbuf[(log->v1.start + log->v1.size) &
LOGBUFF_MASK] = *p;
if (log->v1.size < LOGBUFF_LEN)
log->v1.size++;
LOGBUFF_MASK] = *p;
if (log->v1.size < LOGBUFF_LEN)
log->v1.size++;
@@
-287,5
+317,3
@@
static int logbuff_printk(const char *line)
}
return i;
}
}
return i;
}
-
-#endif /* (CONFIG_LOGBUFFER) */