Patchwork [U-Boot] arm, logbuffer: make it compileclean

login
register
mail settings
Submitter Heiko Schocher
Date Sept. 15, 2011, 5:27 a.m.
Message ID <1316064446-5125-1-git-send-email-hs@denx.de>
Download mbox | patch
Permalink /patch/114740/
State Superseded
Headers show

Comments

Heiko Schocher - Sept. 15, 2011, 5:27 a.m.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
 arch/arm/lib/board.c |    5 ++++-
 common/cmd_log.c     |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

Patch

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index a7fb251..f888548 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -60,6 +60,10 @@ 
 #include "../drivers/net/lan91c96.h"
 #endif
 
+#if defined(CONFIG_LOGBUFFER)
+#include <logbuff.h>
+#endif
+
 DECLARE_GLOBAL_DATA_PTR;
 
 ulong monitor_flash_len;
@@ -78,7 +82,6 @@  extern void rtl8019_get_enetaddr (uchar * addr);
 #include <i2c.h>
 #endif
 
-
 /************************************************************************
  * Coloured LED functionality
  ************************************************************************
diff --git a/common/cmd_log.c b/common/cmd_log.c
index 0e89357..249614f 100644
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -68,7 +68,7 @@  static char *lbuf;
 
 unsigned long __logbuffer_base(void)
 {
-	return CONFIG_SYS_SDRAM_BASE + gd->bd->bi_memsize - LOGBUFF_LEN;
+	return CONFIG_SYS_SDRAM_BASE + gd->ram_size - LOGBUFF_LEN;
 }
 unsigned long logbuffer_base (void) __attribute__((weak, alias("__logbuffer_base")));