From: Simon Glass Date: Fri, 12 Oct 2012 14:21:15 +0000 (+0000) Subject: sparc: Change bi_baudrate and global data baudrate to int X-Git-Tag: v2013.01-rc1~117 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a8f1f1cd97b1efa4c5dfadf99a9646a402b4de38;p=oweals%2Fu-boot.git sparc: Change bi_baudrate and global data baudrate to int These don't need to be longs, so change them. Signed-off-by: Simon Glass Signed-off-by: Tom Rini --- diff --git a/arch/sparc/include/asm/global_data.h b/arch/sparc/include/asm/global_data.h index 93d3cc02eb..aa63b35cab 100644 --- a/arch/sparc/include/asm/global_data.h +++ b/arch/sparc/include/asm/global_data.h @@ -40,7 +40,7 @@ typedef struct global_data { bd_t *bd; unsigned long flags; - unsigned long baudrate; + unsigned int baudrate; unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long bus_clk; diff --git a/arch/sparc/include/asm/u-boot.h b/arch/sparc/include/asm/u-boot.h index 8d011185a0..04c05d4ffe 100644 --- a/arch/sparc/include/asm/u-boot.h +++ b/arch/sparc/include/asm/u-boot.h @@ -54,7 +54,7 @@ typedef struct bd_info { unsigned short bi_ethspeed; /* Ethernet speed in Mbps */ unsigned long bi_intfreq; /* Internal Freq, in MHz */ unsigned long bi_busfreq; /* Bus Freq, in MHz */ - unsigned long bi_baudrate; /* Console Baudrate */ + unsigned int bi_baudrate; /* Console Baudrate */ } bd_t; #endif /* __ASSEMBLY__ */ diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index 6b2f914c5f..ca05985e59 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -231,7 +231,7 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) print_eth(0); printf("ip_addr = %s\n", getenv("ipaddr")); #endif - printf("baudrate = %6ld bps\n", bd->bi_baudrate); + printf("baudrate = %6u bps\n", bd->bi_baudrate); return 0; }