From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] blackfin: Fix using gd->baudrate before setting its value
Date: Sat, 29 Jun 2013 10:26:30 +0200 [thread overview]
Message-ID: <201306291026.31028.marex@denx.de> (raw)
In-Reply-To: <1372466081.3675.3.camel@phoenix>
Dear Axel Lin,
> Current code uses gd->baudrate before setting its value.
> Besides, I got below build warning which is introduced by
> commit ddb5c5be "blackfin: add baudrate to bdinfo".
>
> board.c:235:3: warning: passing argument 1 of 'simple_strtoul' makes
> pointer from integer without a cast [enabled by default]
> include/vsprintf.h:27:7: note: expected 'const char *' but argument is of
> type 'unsigned int'
>
> This patch moves the code using gd->baudrate to be after init_baudrate()
> call, this ensures we get the baudrate setting before using it.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
> I forgot to CC u-boot mail list. here is a resend.
>
> Hi,
> I don't have this hardware to test.
> I'd appreciate if someone can test it.
>
> Thanks,
> Axel
> arch/blackfin/lib/board.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
> index f1d5547..9e2e9de 100644
> --- a/arch/blackfin/lib/board.c
> +++ b/arch/blackfin/lib/board.c
> @@ -231,8 +231,6 @@ static int global_board_data_init(void)
> bd->bi_sclk = get_sclk();
> bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
> bd->bi_memsize = CONFIG_SYS_MAX_RAM_SIZE;
> - bd->bi_baudrate = (gd->baudrate > 0)
> - ? simple_strtoul(gd->baudrate, NULL, 10) : CONFIG_BAUDRATE;
I'd rather say the fix here is to use (gd->baudrate > 0) ? gd->baudrate ?
CONFIG_BAUDRATE ;
Otherwise you're changing the logic of the code and for that, you'd need Mikes'
ack.
> return 0;
> }
> @@ -299,6 +297,7 @@ void board_init_f(ulong bootflag)
> env_init();
> serial_early_puts("Baudrate init\n");
> init_baudrate();
> + gd->bd->bi_baudrate = gd->baudrate;
> serial_early_puts("Serial init\n");
> serial_init();
> serial_initialize();
Best regards,
Marek Vasut
next prev parent reply other threads:[~2013-06-29 8:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-29 0:34 [U-Boot] [PATCH] blackfin: Fix using gd->baudrate before setting its value Axel Lin
2013-06-29 8:26 ` Marek Vasut [this message]
2013-06-29 8:49 ` Axel Lin
2013-07-01 3:45 ` Sonic Zhang
2013-07-01 4:11 ` Axel Lin
2013-07-01 4:49 ` Sonic Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201306291026.31028.marex@denx.de \
--to=marex@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox