Message ID | 1307088697-12159-3-git-send-email-hs@denx.de |
---|---|
State | Accepted |
Commit | b2b8f98f885c61f64aacaeb8fc4d247fbb3ae8cd |
Headers | show |
Hello Albert, Heiko Schocher wrote: > Signed-off-by: Heiko Schocher <hs@denx.de> > cc: Albert Aribaud <albert.u.boot@aribaud.net> > --- > arch/arm/lib/board.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Could you apply this patch also, as it is in the same patchserie as the already apllied patch: http://patchwork.ozlabs.org/patch/104932/ It fixes a compilererror, if CONFIG_LOGBUFFER is activated. Thanks! bye, Heiko
Hi Heiko, Le 03/06/2011 10:11, Heiko Schocher a écrit : > Signed-off-by: Heiko Schocher<hs@denx.de> > cc: Albert Aribaud<albert.u.boot@aribaud.net> > --- > arch/arm/lib/board.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c > index 05ee71b..0acd23b 100644 > --- a/arch/arm/lib/board.c > +++ b/arch/arm/lib/board.c > @@ -641,7 +641,7 @@ void board_init_r(gd_t *id, ulong dest_addr) > pram += (LOGBUFF_LEN + LOGBUFF_OVERHEAD) / 1024; > #endif > #endif > - sprintf((char *)memsz, "%ldk", (bd->bi_memsize / 1024) - pram); > + sprintf((char *)memsz, "%ldk", (gd->ram_size / 1024) - pram); > setenv("mem", (char *)memsz); > } > #endif Applied to u-boot-arm/master, thanks! Amicalement,
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 05ee71b..0acd23b 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -641,7 +641,7 @@ void board_init_r(gd_t *id, ulong dest_addr) pram += (LOGBUFF_LEN + LOGBUFF_OVERHEAD) / 1024; #endif #endif - sprintf((char *)memsz, "%ldk", (bd->bi_memsize / 1024) - pram); + sprintf((char *)memsz, "%ldk", (gd->ram_size / 1024) - pram); setenv("mem", (char *)memsz); } #endif
Signed-off-by: Heiko Schocher <hs@denx.de> cc: Albert Aribaud <albert.u.boot@aribaud.net> --- arch/arm/lib/board.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)