smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Avoid initrd and logbuffer area overlaps"

Browse Source 
This reverts commit 1b5605ca57
which breaks building on all PPC boards that don't use a log buffer.
This commit is contained in:
Wolfgang Denk
2008-05-12 00:56:28 +02:00
parent 02b9b22446
commit ee0cfa7080
4 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/cmd_log.c
View File

@@ -66,12 +66,6 @@ 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;
@@ -81,7 +75,7 @@ void logbuff_init_ptrs (void)
log = (logbuff_t *)CONFIG_ALT_LH_ADDR;
lbuf = (char *)CONFIG_ALT_LB_ADDR;
#else
log = (logbuff_t *)(logbuffer_base ()) - 1;
log = (logbuff_t *)(gd->bd->bi_memsize-LOGBUFF_LEN) - 1;
lbuf = (char *)log->buf;
#endif