Revert "Avoid initrd and logbuffer area overlaps"
This reverts commit 1b5605ca57fbb364f4d78eeee28b974ed875e888
which breaks building on all PPC boards that don't use a log buffer.
diff --git a/common/cmd_log.c b/common/cmd_log.c
index 8e04941..b9f9ba0 100644
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -66,12 +66,6 @@
#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 @@
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
diff --git a/common/image.c b/common/image.c
index 9e9e023..67e594d 100644
--- a/common/image.c
+++ b/common/image.c
@@ -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 @@
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);
diff --git a/include/logbuff.h b/include/logbuff.h
index f117c66..d415729 100644
--- a/include/logbuff.h
+++ b/include/logbuff.h
@@ -60,7 +60,6 @@
void logbuff_init_ptrs (void);
void logbuff_log(char *msg);
void logbuff_reset (void);
-unsigned long logbuffer_base (void);
#endif /* CONFIG_LOGBUFFER */
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index bc49ea1..4956403 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -398,11 +398,6 @@
************************************************************************
*/
-unsigned long logbuffer_base(void)
-{
- return CFG_SDRAM_BASE + get_effective_memsize() - LOGBUFF_LEN;
-}
-
void board_init_f (ulong bootflag)
{
bd_t *bd;