minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

4xx_uart.c: fix GCC 4.6 build warnings

Browse Source 
Fix:
4xx_uart.c: In function 'get_serial_clock':
4xx_uart.c:204:6: warning: variable 'tmp' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
This commit is contained in:
Wolfgang Denk 2011-10-29 09:37:52 +00:00
parent 3d458d2dfb
commit 32bb34a768
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/cpu/ppc4xx/4xx_uart.c
View File

@ -200,9 +200,6 @@ int get_serial_clock(void)
{ {
u32 clk; u32 clk;
u32 udiv; u32 udiv;
#if defined(CONFIG_405CR) || defined(CONFIG_405EP) || defined(CONFIG_405GP)
u32 tmp;
#endif
#if !defined(CONFIG_405EZ) #if !defined(CONFIG_405EZ)
u32 reg; u32 reg;
#endif #endif
@ -216,7 +213,6 @@ int get_serial_clock(void)
*/ */
#if defined(CONFIG_405CR) || defined(CONFIG_405GP) #if defined(CONFIG_405CR) || defined(CONFIG_405GP)
tmp = 0;
reg = mfdcr(CPC0_CR0) & ~CR0_MASK; reg = mfdcr(CPC0_CR0) & ~CR0_MASK;
#ifdef CONFIG_SYS_EXT_SERIAL_CLOCK #ifdef CONFIG_SYS_EXT_SERIAL_CLOCK
clk = CONFIG_SYS_EXT_SERIAL_CLOCK; clk = CONFIG_SYS_EXT_SERIAL_CLOCK;
@ -227,8 +223,11 @@ int get_serial_clock(void)
#ifdef CONFIG_SYS_405_UART_ERRATA_59 #ifdef CONFIG_SYS_405_UART_ERRATA_59
udiv = 31; /* Errata 59: stuck at 31 */ udiv = 31; /* Errata 59: stuck at 31 */
#else /* CONFIG_SYS_405_UART_ERRATA_59 */ #else /* CONFIG_SYS_405_UART_ERRATA_59 */
tmp = CONFIG_SYS_BASE_BAUD * 16; {
u32 tmp = CONFIG_SYS_BASE_BAUD * 16;
udiv = (clk + tmp / 2) / tmp; udiv = (clk + tmp / 2) / tmp;
}
if (udiv > UDIV_MAX) /* max. n bits for udiv */ if (udiv > UDIV_MAX) /* max. n bits for udiv */
udiv = UDIV_MAX; udiv = UDIV_MAX;
#endif /* CONFIG_SYS_405_UART_ERRATA_59 */ #endif /* CONFIG_SYS_405_UART_ERRATA_59 */
@ -243,12 +242,15 @@ int get_serial_clock(void)
#endif /* CONFIG_405CR */ #endif /* CONFIG_405CR */
#if defined(CONFIG_405EP) #if defined(CONFIG_405EP)
{
u32 tmp = CONFIG_SYS_BASE_BAUD * 16;
reg = mfdcr(CPC0_UCR) & ~(UCR0_MASK | UCR1_MASK); reg = mfdcr(CPC0_UCR) & ~(UCR0_MASK | UCR1_MASK);
clk = gd->cpu_clk; clk = gd->cpu_clk;
tmp = CONFIG_SYS_BASE_BAUD * 16;
udiv = (clk + tmp / 2) / tmp; udiv = (clk + tmp / 2) / tmp;
if (udiv > UDIV_MAX) /* max. n bits for udiv */ if (udiv > UDIV_MAX) /* max. n bits for udiv */
udiv = UDIV_MAX; udiv = UDIV_MAX;
}
reg |= udiv << UCR0_UDIV_POS; /* set the UART divisor */ reg |= udiv << UCR0_UDIV_POS; /* set the UART divisor */
reg |= udiv << UCR1_UDIV_POS; /* set the UART divisor */ reg |= udiv << UCR1_UDIV_POS; /* set the UART divisor */
mtdcr(CPC0_UCR, reg); mtdcr(CPC0_UCR, reg);