[U-Boot] [PATCH v2] blackfin: Fix using gd->baudrate before setting its value

* [U-Boot] [PATCH v2] blackfin: Fix using gd->baudrate before setting its value
@ 2013-07-01  5:16 Axel Lin
  2013-07-01 10:56 ` Sonic Zhang
  0 siblings, 1 reply; 4+ messages in thread
From: Axel Lin @ 2013-07-01  5:16 UTC (permalink / raw)
  To: u-boot

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 ensures we get the baudrate setting before using it.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
v2: The change is based on Sonic 's suggestion:
    move "gd->bd->bi_baudrate = gd->baudrate;" into init_baudrate()

 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..460c97d 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -63,6 +63,7 @@ static int display_banner(void)
 static int init_baudrate(void)
 {
 	gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
+	gd->bd->bi_baudrate = gd->baudrate;
 	return 0;
 }
 
@@ -231,8 +232,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;
 
 	return 0;
 }
-- 
1.8.1.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread