November 2011 - U-Boot

[U-Boot] [PATCH] phy: Check return value for read MII_STAT1000 register
by Nobuhiro Iwamatsu 17 Nov '11

17 Nov '11

When Extended register is effective, there is not necessarily certainly register for 1000BASE. 0xFFFF may be able to be read although register is read. This adds this check. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- drivers/net/phy/phy.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 8da7688..f0b3c56 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -294,8 +294,14 @@ static int genphy_parse_link(struct phy_device *phydev) * both PHYs in the link */ gblpa = phy_read(phydev, MDIO_DEVAD_NONE, MII_STAT1000); - gblpa &= phy_read(phydev, + /* If gblpa was 0xFFFF or -1, this chip does not have MII_STAT1000 + register or read error. */ + if (gblpa == 0xFFFF | gblpa == -1) { + gblpa = 0; + } else { + gblpa &= phy_read(phydev, MDIO_DEVAD_NONE, MII_CTRL1000) << 2; + } } /* Set the baseline so we only have to set them -- 1.7.7

2 2

[U-Boot] Congratulations
by BBC NATIONAL PROMO 16 Nov '11

16 Nov '11

BBC E-MAIL PROMOTION WINNERS NOTICE, WINNING NOTIFICATION !!! BBC NATIONAL LOTTERY PROMO UK HEAD OFFICE. SUITES 23-30,LION TOWERS CENTRAL LONDON ENGLAND Your Email Address was selected thereby Winning for you,£1,000,000 (One Million pounds) in the British Broadcasting corporation (BBC) Online Promo Held on this month of November 2011, and you are to acknowledge the receipt of this mail with the details below to. CLAIMS DIRECTOR BBC ONLINE PROMOTION. 1.Full name: 2.Tel: 3.Country : Sincerely, Mr. Scott Carson

1 0

[U-Boot] [PATCH] Revert "sandbox: Change md command to use map_physmem"
by Kumar Gala 16 Nov '11

16 Nov '11

This reverts commit 355a835747c6f7c5071ead295a7dfc489c73cb03. The original commit broke long standing assumption that md commands work on effective addresses. This normally isn't an issue for most systems that map 1:1, however on systems with a 36-bit address map it breaks. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- common/cmd_mem.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 461ee19..28476d7 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -33,7 +33,6 @@ #include <dataflash.h> #endif #include <watchdog.h> -#include <asm/io.h> #ifdef CMD_MEM_DEBUG #define PRINTF(fmt,args...) printf (fmt ,##args) @@ -142,13 +141,9 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) # endif { - ulong bytes = size * length; - void *buf = map_physmem(addr, bytes, MAP_WRBACK); - /* Print the lines. */ - print_buffer(addr, buf, size, length, DISP_LINE_LEN / size); - addr += bytes; - unmap_physmem(buf, bytes); + print_buffer(addr, (void*)addr, size, length, DISP_LINE_LEN/size); + addr += size*length; } #endif -- 1.7.3.4

3 4

[U-Boot] [PATCH] common: tsi148 - fix gcc 4.6 compiler warning
by Kim Phillips 16 Nov '11

16 Nov '11

Configuring for vme8349 board... cmd_tsi148.c: In function 'tsi148_init': cmd_tsi148.c:56:17: warning: variable 'lastError' set but not used [-Wunused-but-set-variable] Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- common/cmd_tsi148.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/common/cmd_tsi148.c b/common/cmd_tsi148.c index 6dc9dab..7f48ea2 100644 --- a/common/cmd_tsi148.c +++ b/common/cmd_tsi148.c @@ -53,7 +53,7 @@ static TSI148_DEV *dev; int tsi148_init(void) { - int j, result, lastError = 0; + int j, result; pci_dev_t busdevfn; unsigned int val; @@ -69,8 +69,7 @@ int tsi148_init(void) dev = malloc(sizeof(*dev)); if (NULL == dev) { puts("Tsi148: No memory!\n"); - result = -1; - goto break_20; + return -1; } memset(dev, 0, sizeof(*dev)); @@ -139,8 +138,6 @@ int tsi148_init(void) break_30: free(dev); dev = NULL; - break_20: - lastError = result; return result; } -- 1.7.7.3

2 1

[U-Boot] [PATCH 1/3] mpc83xx: spd_sdram - fix gcc 4.6 compiler warning
by Kim Phillips 16 Nov '11

16 Nov '11

Configuring for sbc8349 board... spd_sdram.c: In function 'spd_sdram': spd_sdram.c:152:41: warning: variable 'trfc_high' set but not used [-Wunused-but-set-variable] Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- arch/powerpc/cpu/mpc83xx/spd_sdram.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index 3855bfd..04d519a 100644 --- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c +++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c @@ -149,7 +149,7 @@ long int spd_sdram() unsigned int memsize; unsigned int law_size; unsigned char caslat, caslat_ctrl; - unsigned int trfc, trfc_clk, trfc_low, trfc_high; + unsigned int trfc, trfc_clk, trfc_low; unsigned int trcd_clk, trtp_clk; unsigned char cke_min_clk; unsigned char add_lat, wr_lat; @@ -542,7 +542,6 @@ long int spd_sdram() * so preadjust it down 8 first before splitting it up. */ trfc_low = (trfc_clk - 8) & 0xf; - trfc_high = ((trfc_clk - 8) >> 4) & 0x3; ddr->timing_cfg_1 = (((picos_to_clk(spd.trp * 250) & 0x07) << 28 ) | /* PRETOACT */ -- 1.7.7.3

3 6

[U-Boot] unsubscribe
by Joe Halpin 16 Nov '11

16 Nov '11

1 0

[U-Boot] [PATCH 19/19] pip405.c: Fix GCC 4.6 build warnings
by Stefan Roese 16 Nov '11

16 Nov '11

Fix: pip405.c: In function 'board_early_init_f': pip405.c:192:16: warning: variable 'tctp_clocks' set but not used [-Wunused-but-set-variable] pip405.c:182:16: warning: variable 'dataout' set but not used [-Wunused-but-set-variable] Signed-off-by: Stefan Roese <sr(a)denx.de> --- board/mpl/pip405/pip405.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/board/mpl/pip405/pip405.c b/board/mpl/pip405/pip405.c index 7b48c06..a1f0b65 100644 --- a/board/mpl/pip405/pip405.c +++ b/board/mpl/pip405/pip405.c @@ -179,7 +179,6 @@ void write_4hex (unsigned long val) int board_early_init_f (void) { - unsigned char dataout[1]; unsigned char datain[128]; unsigned long sdram_size = 0; SDRAM_SETUP *t = (SDRAM_SETUP *) sdram_setup_table; @@ -189,9 +188,13 @@ int board_early_init_f (void) unsigned short i; unsigned char rows, cols, banks, sdram_banks, density; unsigned char supported_cal, trp_clocks, trcd_clocks, tras_clocks, - trc_clocks, tctp_clocks; + trc_clocks; unsigned char cal_index, cal_val, spd_version, spd_chksum; unsigned char buf[8]; +#ifdef SDRAM_DEBUG + unsigned char tctp_clocks; +#endif + /* set up the config port */ mtdcr (EBC0_CFGADDR, PB7AP); mtdcr (EBC0_CFGDATA, CONFIG_PORT_AP); @@ -210,7 +213,6 @@ int board_early_init_f (void) /* Read Serial Presence Detect Information */ i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); - dataout[0] = 0; for (i = 0; i < 128; i++) datain[i] = 127; i2c_read(SPD_EEPROM_ADDRESS,0,1,datain,128); @@ -307,12 +309,13 @@ int board_early_init_f (void) /* trc_clocks is sum of trp_clocks + tras_clocks */ trc_clocks = trp_clocks + tras_clocks; + +#ifdef SDRAM_DEBUG /* ctp = ((trp + tras) - trp - trcd) => tras - trcd */ tctp_clocks = ((NSto10PS (datain[30]) - NSto10PS (datain[29])) + (tmemclk - 1)) / tmemclk; -#ifdef SDRAM_DEBUG serial_puts ("c_RP: "); write_hex (trp_clocks); serial_puts ("\nc_RCD: "); -- 1.7.7.3

2 1

[U-Boot] [PATCH 18/19] mip405.c: Fix GCC 4.6 build warnings
by Stefan Roese 16 Nov '11

16 Nov '11

Fix: mip405.c: In function 'init_sdram': mip405.c:250:4: warning: variable 'tctp_clocks' set but not used [-Wunused-but-set-variable] mip405.c: In function 'initdram': mip405.c:629:9: warning: variable 'ds' set but not used [-Wunused-but-set-variable] Signed-off-by: Stefan Roese <sr(a)denx.de> --- board/mpl/mip405/mip405.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c index e93d994..9d0db64 100644 --- a/board/mpl/mip405/mip405.c +++ b/board/mpl/mip405/mip405.c @@ -246,8 +246,7 @@ int init_sdram (void) unsigned char trp_clocks, trcd_clocks, tras_clocks, - trc_clocks, - tctp_clocks; + trc_clocks; unsigned char cal_val; unsigned char bc; unsigned long sdram_tim, sdram_bank; @@ -345,7 +344,6 @@ int init_sdram (void) trcd_clocks = sdram_table[i].trcd; /* 20ns /7.5 ns (datain[29]) */ tras_clocks = sdram_table[i].tras; /* 44ns /7.5 ns (datain[30]) */ /* ctp = ((trp + tras) - trp - trcd) => tras - trcd */ - tctp_clocks = sdram_table[i].tctp; /* 44 - 20ns = 24ns */ /* trc_clocks is sum of trp_clocks + tras_clocks */ trc_clocks = trp_clocks + tras_clocks; /* get SDRAM timing register */ @@ -626,10 +624,9 @@ phys_size_t initdram (int board_type) { unsigned long bank_reg[4], tmp, bank_size; - int i, ds; + int i; unsigned long TotalSize; - ds = 0; /* since the DRAM controller is allready set up, calculate the size with the bank registers */ mtdcr (SDRAM0_CFGADDR, SDRAM0_B0CR); @@ -646,8 +643,7 @@ phys_size_t initdram (int board_type) tmp = (bank_reg[i] >> 17) & 0x7; bank_size = 4 << tmp; TotalSize += bank_size; - } else - ds = 1; + } } mtdcr (SDRAM0_CFGADDR, SDRAM0_ECCCFG); tmp = mfdcr (SDRAM0_CFGDATA); -- 1.7.7.3

2 1

[U-Boot] [PATCH 17/19] auto_update.c: Fix GCC 4.6 build warnings
by Stefan Roese 16 Nov '11

16 Nov '11

Fix: ../common/auto_update.c: In function 'au_check_header_valid': ../common/auto_update.c:94:16: warning: variable 'checksum' set but not used [-Wunused-but-set-variable] ../common/auto_update.c: In function 'do_auto_update': ../common/auto_update.c:400:30: warning: variable 'got_ctrlc' set but not used [-Wunused-but-set-variable] Signed-off-by: Stefan Roese <sr(a)denx.de> --- board/esd/common/auto_update.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c index 4dfea71..fc60545 100644 --- a/board/esd/common/auto_update.c +++ b/board/esd/common/auto_update.c @@ -91,7 +91,6 @@ int au_check_cksum_valid(int i, long nbytes) int au_check_header_valid(int i, long nbytes) { image_header_t *hdr; - unsigned long checksum; hdr = (image_header_t *)LOAD_ADDR; #if defined(CONFIG_FIT) @@ -127,9 +126,6 @@ int au_check_header_valid(int i, long nbytes) return -1; } - /* recycle checksum */ - checksum = image_get_data_size (hdr); - return 0; } @@ -397,7 +393,7 @@ int do_auto_update(void) { block_dev_desc_t *stor_dev = NULL; long sz; - int i, res, cnt, old_ctrlc, got_ctrlc; + int i, res, cnt, old_ctrlc; char buffer[32]; char str[80]; int n; @@ -473,8 +469,6 @@ int do_auto_update(void) /* let the user break out of the loop */ if (ctrlc() || had_ctrlc ()) { clear_ctrlc (); - if (res < 0) - got_ctrlc = 1; break; } cnt++; -- 1.7.7.3

2 1

[U-Boot] [PATCH 16/19] iop480_uart.c: Fix GCC 4.6 build warnings
by Stefan Roese 16 Nov '11

16 Nov '11

Fix: iop480_uart.c: In function 'serial_init': iop480_uart.c:137:16: warning: variable 'val' set but not used [-Wunused-but-set-variable] Signed-off-by: Stefan Roese <sr(a)denx.de> --- arch/powerpc/cpu/ppc4xx/iop480_uart.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/iop480_uart.c b/arch/powerpc/cpu/ppc4xx/iop480_uart.c index 0e3423f..027ca30 100644 --- a/arch/powerpc/cpu/ppc4xx/iop480_uart.c +++ b/arch/powerpc/cpu/ppc4xx/iop480_uart.c @@ -134,7 +134,6 @@ DECLARE_GLOBAL_DATA_PTR; int serial_init (void) { - volatile char val; unsigned short br_reg; br_reg = ((((CONFIG_CPUCLOCK * 1000000) / 16) / gd->baudrate) - 1); @@ -149,7 +148,7 @@ int serial_init (void) out_8((u8 *)SPU_BASE + spu_RxCmd, 0xb0); /* Enable Rx */ out_8((u8 *)SPU_BASE + spu_TxCmd, 0x9c); /* Enable Tx */ out_8((u8 *)SPU_BASE + spu_Handshk_rc, 0xff); /* Clear Handshake */ - val = in_8((u8 *)SPU_BASE + spu_RxBuff); /* Dummy read, to clear receiver */ + in_8((u8 *)SPU_BASE + spu_RxBuff); /* Dummy read, to clear receiver */ return (0); } -- 1.7.7.3

2 1