Skip to contentSkip to conversation

blackfin: Fix using gd->baudrate before setting its value

PATCH Superseded Axel Lin 3 participants 4 messages Jul 1, 2013 – Jul 15, 2013

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/1 blackfin: Fix using gd->baudrate before setting its value

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.

---
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(-)
arch/blackfin/lib/board.c +1 -2
index f1d5547..460c97d 100644
@@ -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;
 }
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH v2 1/1 blackfin: Fix using gd->baudrate before setting its value

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

---
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(-)
arch/blackfin/lib/board.c +1 -3
index f1d5547..460c97d 100644
@@ -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

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

author
#2 lore raw

PATCH v2 1/1 blackfin: Fix using gd->baudrate before setting its value

2013/7/1 Sonic Zhang <[email protected]>:

Quoted 1 line

hi Sonic,
I thought you will pick up this patch, but now I got your ACK and I have no idea who will take this patch.

Just wondering if this patch should be applied for v2013.07?

Regards,
Axel

#3 lore raw

PATCH v2 1/1 blackfin: Fix using gd->baudrate before setting its value

Hi Axel,

It is in the blackfin u-boot next tree.

Regards,

Sonic

Quoted 19 lines

-----Original Message-----
From: Axel Lin [mailto:axel.lin at ingics.com]
Sent: Sunday, July 14, 2013 3:06 PM
To: Sonic Zhang
Cc: Zhang, Sonic; Tom Rini; Marek Vasut; Bob Liu; U-Boot
Subject: Re: [U-Boot] [PATCH v2] blackfin: Fix using gd->baudrate before setting its value

2013/7/1 Sonic Zhang <[email protected]>:

Quoted 1 line

hi Sonic,
I thought you will pick up this patch, but now I got your ACK and I have no idea who will take this patch.

Just wondering if this patch should be applied for v2013.07?

Regards,
Axel