mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-26 13:44:29 +08:00
Code Issues 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
Show Stats 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

7
common/image.c
View File

@ -35,10 +35,6 @@
#include <dataflash.h>
#endif
#ifdef CONFIG_LOGBUFFER
#include <logbuff.h>
#endif
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
#include <rtc.h>
#endif
@ -1017,9 +1013,6 @@ int boot_ramdisk_high (struct lmb *lmb, ulong rd_data, ulong rd_len,
initrd_high = ~0;
}
/* Prevent initrd from overwriting logbuffer */
lmb_reserve(lmb, logbuffer_base() - LOGBUFF_OVERHEAD, LOGBUFF_RESERVE);
debug ("## initrd_high = 0x%08lx, copy_to_ram = %d\n",
initrd_high, initrd_copy_to_ram);

1
include/logbuff.h
View File

@ -60,7 +60,6 @@ int drv_logbuff_init (void);
void logbuff_init_ptrs (void);
void logbuff_log(char *msg);
void logbuff_reset (void);
unsigned long logbuffer_base (void);
#endif /* CONFIG_LOGBUFFER */

5
lib_ppc/board.c
View File

@ -398,11 +398,6 @@ ulong get_effective_memsize(void)
************************************************************************
*/
unsigned long logbuffer_base(void)
{
return CFG_SDRAM_BASE + get_effective_memsize() - LOGBUFF_LEN;
}
void board_init_f (ulong bootflag)
{
bd_t *bd;