diff options
| author | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-21 11:42:54 -0400 |
|---|---|---|
| committer | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-21 11:42:54 -0400 |
| commit | 493a2b1dc97367e904bf83869501f6290f3b374e (patch) | |
| tree | 5e5905f085107242093e39a5e2175622df1bb73a /lib_ppc/board.c | |
| parent | 11abe45c48ec3485a6c1a5168ce8d79c3288adc1 (diff) | |
| parent | 81a0ac62ea29f8252d0a714709d0ecfdbba2a15e (diff) | |
| download | u-boot-imx-493a2b1dc97367e904bf83869501f6290f3b374e.zip u-boot-imx-493a2b1dc97367e904bf83869501f6290f3b374e.tar.gz u-boot-imx-493a2b1dc97367e904bf83869501f6290f3b374e.tar.bz2 | |
Merge git://www.denx.de/git/u-boot into uboot
Diffstat (limited to 'lib_ppc/board.c')
| -rw-r--r-- | lib_ppc/board.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index fbf1c5d..ee0213e 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); } |