mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-01 00:50:43 +09:00
Revert "Avoid initrd and logbuffer area overlaps"
This reverts commit 1b5605ca57
which breaks building on all PPC boards that don't use a log buffer.
This commit is contained in:
parent
02b9b22446
commit
ee0cfa7080
@ -66,12 +66,6 @@ static logbuff_t *log;
|
|||||||
#endif
|
#endif
|
||||||
static char *lbuf;
|
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)
|
void logbuff_init_ptrs (void)
|
||||||
{
|
{
|
||||||
unsigned long tag, post_word;
|
unsigned long tag, post_word;
|
||||||
@ -81,7 +75,7 @@ void logbuff_init_ptrs (void)
|
|||||||
log = (logbuff_t *)CONFIG_ALT_LH_ADDR;
|
log = (logbuff_t *)CONFIG_ALT_LH_ADDR;
|
||||||
lbuf = (char *)CONFIG_ALT_LB_ADDR;
|
lbuf = (char *)CONFIG_ALT_LB_ADDR;
|
||||||
#else
|
#else
|
||||||
log = (logbuff_t *)(logbuffer_base ()) - 1;
|
log = (logbuff_t *)(gd->bd->bi_memsize-LOGBUFF_LEN) - 1;
|
||||||
lbuf = (char *)log->buf;
|
lbuf = (char *)log->buf;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -35,10 +35,6 @@
|
|||||||
#include <dataflash.h>
|
#include <dataflash.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_LOGBUFFER
|
|
||||||
#include <logbuff.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
#if defined(CONFIG_TIMESTAMP) || defined(CONFIG_CMD_DATE)
|
||||||
#include <rtc.h>
|
#include <rtc.h>
|
||||||
#endif
|
#endif
|
||||||
@ -1017,9 +1013,6 @@ int boot_ramdisk_high (struct lmb *lmb, ulong rd_data, ulong rd_len,
|
|||||||
initrd_high = ~0;
|
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",
|
debug ("## initrd_high = 0x%08lx, copy_to_ram = %d\n",
|
||||||
initrd_high, initrd_copy_to_ram);
|
initrd_high, initrd_copy_to_ram);
|
||||||
|
|
||||||
|
@ -60,7 +60,6 @@ int drv_logbuff_init (void);
|
|||||||
void logbuff_init_ptrs (void);
|
void logbuff_init_ptrs (void);
|
||||||
void logbuff_log(char *msg);
|
void logbuff_log(char *msg);
|
||||||
void logbuff_reset (void);
|
void logbuff_reset (void);
|
||||||
unsigned long logbuffer_base (void);
|
|
||||||
|
|
||||||
#endif /* CONFIG_LOGBUFFER */
|
#endif /* CONFIG_LOGBUFFER */
|
||||||
|
|
||||||
|
@ -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)
|
void board_init_f (ulong bootflag)
|
||||||
{
|
{
|
||||||
bd_t *bd;
|
bd_t *bd;
|
||||||
|
Loading…
Reference in New Issue
Block a user