summaryrefslogtreecommitdiff
path: root/lib_ppc/board.c
diff options
context:
space:
mode:
authorYuri Tikhonov <yur@pollux.denx.de>2008-02-06 18:48:36 +0100
committerWolfgang Denk <wd@denx.de>2008-03-18 22:24:48 +0100
commit3d61018643a2cd38c145aa6dde53f3f5f1a0e9cf (patch)
tree99249b1e02761ceb02dc759d5fd5ea78a98cb980 /lib_ppc/board.c
parent0f009f781b5b88f25769e154ea4d42db13baf0c6 (diff)
The patch introduces the alternative configuration of the log buffer for the lwmon5 board: the storage for the log-buffer itself is OCM(on-chip memory), the log-buffer header is moved to six GPT registers (PPC440EPX_GPT0_COMP1, ..., PPC440EPX_GPT0_COMP5).
To enable this, alternative, configuration the U-Boot board configuration file for lwmon5 includes the definitions of alternative addresses for header (CONFIG_ALT_LH_ADDR) and buffer (CONFIG_ALT_LB_ADDR). The Linux shall be configured with the CONFIG_ALT_LB_LOCATION option set, and has the BOARD_ALT_LH_ADDR and BOARD_ALT_LB_ADDR constants defined in the lwmon5 board-specific header (arch/ppc/platforms/4xx/lwmon5.h). Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
Diffstat (limited to 'lib_ppc/board.c')
-rw-r--r--lib_ppc/board.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index fbf1c5d25a..ee0213e1ac 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -436,10 +436,12 @@ void board_init_f (ulong bootflag)
addr = CFG_SDRAM_BASE + get_effective_memsize();
#ifdef CONFIG_LOGBUFFER
+#ifndef CONFIG_ALT_LB_ADDR
/* reserve kernel log buffer */
addr -= (LOGBUFF_RESERVE);
debug ("Reserving %dk for kernel logbuffer at %08lx\n", LOGBUFF_LEN, addr);
#endif
+#endif
#ifdef CONFIG_PRAM
/*
@@ -1126,9 +1128,11 @@ void board_init_r (gd_t *id, ulong dest_addr)
pram=0;
#endif
#ifdef CONFIG_LOGBUFFER
+#ifndef CONFIG_ALT_LB_ADDR
/* Also take the logbuffer into account (pram is in kB) */
pram += (LOGBUFF_LEN+LOGBUFF_OVERHEAD)/1024;
#endif
+#endif
sprintf ((char *)memsz, "%ldk", (bd->bi_memsize / 1024) - pram);
setenv ("mem", (char *)memsz);
}