From: Simon Glass Date: Fri, 12 Oct 2012 14:21:08 +0000 (+0000) Subject: sh: Change bi_baudrate and global data baudrate to int X-Git-Tag: v2013.01-rc1~124 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ecd4551f14418abda71607946134fb40253b843b;p=oweals%2Fu-boot.git sh: 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/sh/include/asm/global_data.h b/arch/sh/include/asm/global_data.h index 6e534ad614..9a2c19376d 100644 --- a/arch/sh/include/asm/global_data.h +++ b/arch/sh/include/asm/global_data.h @@ -31,7 +31,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 have_console; /* serial_init() was called */ #ifdef CONFIG_PRE_CONSOLE_BUFFER diff --git a/arch/sh/include/asm/u-boot.h b/arch/sh/include/asm/u-boot.h index 6c04daf3bc..2c9c4634d8 100644 --- a/arch/sh/include/asm/u-boot.h +++ b/arch/sh/include/asm/u-boot.h @@ -33,7 +33,7 @@ typedef struct bd_info { unsigned long bi_flashoffset; /* reserved area for startup monitor */ unsigned long bi_sramstart; /* start of SRAM memory */ unsigned long bi_sramsize; /* size of SRAM memory */ - unsigned long bi_baudrate; /* Console Baudrate */ + unsigned int bi_baudrate; /* Console Baudrate */ unsigned long bi_boot_params; /* where this board expects params */ } bd_t; diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index 286c8c8011..698826c1f9 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -405,7 +405,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 = %ld bps\n", (ulong)bd->bi_baudrate); + printf("baudrate = %u bps\n", bd->bi_baudrate); return 0; }