board/sbc8560/sbc8560.c: Fix GCC 4.6 build warning
Subsystems (4)
PATCH 10/16 board/sbc8560/sbc8560.c: Fix GCC 4.6 build warning
Fix:
sbc8560.c: In function 'ft_board_setup':
sbc8560.c:351:12: warning: variable 'tmp' set but not used [-Wunused-but-set-variable]
--- board/sbc8560/sbc8560.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
board/sbc8560/sbc8560.c +1 -2
@@ -348,7 +348,7 @@ phys_size_t fixed_sdram(void)void ft_board_setup (void *blob,bd_t *bd) { -int node, tmp[2 ]; +int node;#ifdef CONFIG_PCI const char *path;#endif
@@ -356,7 +356,6 @@ ft_board_setup(void *blob, bd_t *bd)ft_cpu_setup (blob, bd); node =fdt_path_offset (blob,"/aliases" ); - tmp[0 ] =0 ;if (node >=0 ) {#ifdef CONFIG_PCI path =fdt_getprop (blob, node,"pci0" ,NULL );
Signature · 1 line
1.7.3.4
PATCH 11/16 drivers/net/fm/fm.c: Fix GCC 4.6 build warning
Fix:
fm.c: In function 'fm_init_common':
fm.c:398:6: warning: variable 'n' set but not used [-Wunused-but-set-variable]
--- drivers/net/fm/fm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/net/fm/fm.c +1 -2
@@ -395,7 +395,6 @@ int fm_init_common(int index, struct ccsr_fman *reg)int dev =CONFIG_SYS_MMC_ENV_DEV ;void *addr =malloc (CONFIG_SYS_FMAN_FW_LENGTH );u32 cnt =CONFIG_SYS_FMAN_FW_LENGTH /512 ; -u32 n;u32 blk =CONFIG_SYS_QE_FW_IN_MMC /512 ;struct mmc *mmc =find_mmc_device (CONFIG_SYS_MMC_ENV_DEV );
@@ -405,7 +404,7 @@ int fm_init_common(int index, struct ccsr_fman *reg)printf ("\nMMC read: dev # %u, block # %u, count %u ...\n" , dev, blk, cnt);mmc_init (mmc); - n = mmc->block_dev.block_read (dev, blk, cnt, addr); + (void )mmc->block_dev.block_read (dev, blk, cnt, addr);/* flush cache after read */ flush_cache ((ulong )addr, cnt *512 ); }
Signature · 1 line
1.7.3.4
PATCH 12/16 drivers/usb/host/ehci-fsl.c: Fix GCC 4.6 build warning
Fix:
ehci-fsl.c: In function 'ehci_hcd_init':
ehci-fsl.c:43:7: warning: variable 'usb_phy' set but not used [-Wunused-but-set-variable]
--- drivers/usb/host/ehci-fsl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/usb/host/ehci-fsl.c +3 -1
@@ -40,11 +40,13 @@int ehci_hcd_init (void ) {struct usb_ehci *ehci; -char usb_phy[5 ];const char *phy_type =NULL ;size_t len; +#ifdef CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY +char usb_phy[5 ]; usb_phy[0 ] ='\0' ; +#endif ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR ; hccr = (struct ehci_hccr *)((uint32_t )&ehci->caplength);
Signature · 1 line
1.7.3.4
PATCH 13/16 drivers/qe/uec.c: Fix GCC 4.6 build warning
uec.c: In function 'uec_stop':
uec.c:267:22: warning: variable 'uccf' set but not used [-Wunused-but-set-variable] uec.c: In function 'uec_set_mac_if_mode':
uec.c:328:15: warning: variable 'uec_info' set but not used [-Wunused-but-set-variable] uec.c: In function 'adjust_link':
uec.c:519:11: warning: variable 'uec_regs' set but not used [-Wunused-but-set-variable]
--- drivers/qe/uec.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)
drivers/qe/uec.c +0 -7
@@ -264,13 +264,10 @@ static int uec_open(uec_private_t *uec, comm_dir_e mode)static int uec_stop (uec_private_t *uec,comm_dir_e mode) { -ucc_fast_private_t *uccf; -if (!uec || !uec->uccf) {printf ("%s: No handle passed.\n" , __FUNCTION__);return -EINVAL ; } - uccf = uec->uccf;/* check if the UCC number is in range. */ if (uec->uec_info->uf_info.ucc_num >=UCC_MAX_NUM ) {
@@ -325,7 +322,6 @@ static int uec_set_mac_if_mode(uec_private_t *uec, phy_interface_t if_mode, int speed) {phy_interface_t enet_if_mode; -uec_info_t *uec_info;uec_t *uec_regs;u32 upsmr;u32 maccfg2;
@@ -335,7 +331,6 @@ static int uec_set_mac_if_mode(uec_private_t *uec,return -EINVAL ; } - uec_info = uec->uec_info; uec_regs = uec->uec_regs; enet_if_mode = if_mode;
@@ -516,12 +511,10 @@ bus_fail:static void adjust_link (struct eth_device *dev) {uec_private_t *uec = (uec_private_t *)dev->priv; -uec_t *uec_regs;struct uec_mii_info *mii_info = uec->mii_info;extern void change_phy_interface_mode (struct eth_device *dev,phy_interface_t mode,int speed); - uec_regs = uec->uec_regs;if (mii_info->link) {/* Now we make sure that we can be in full duplex mode.
Signature · 1 line
1.7.3.4
PATCH 14/16 arch/powerpc/cpu/mpc8xxx/ddr/options.c: Fix GCC 4.6 build warning
Fix:
options.c: In function 'populate_memctl_options':
options.c:486:28: warning: variable 'pdodt' set but not used [-Wunused-but-set-variable]
--- arch/powerpc/cpu/mpc8xxx/ddr/options.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/powerpc/cpu/mpc8xxx/ddr/options.c +4 -0
@@ -483,7 +483,9 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,unsigned int i;char buffer[HWCONFIG_BUFFER_SIZE ];char *buf =NULL ; +#if defined(CONFIG_FSL_DDR3 ) || defined(CONFIG_FSL_DDR2 )const struct dynamic_odt *pdodt = odt_unknown; +#endif ulong ddr_freq;/*
@@ -493,6 +495,7 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,if (getenv_f ("hwconfig" , buffer,sizeof (buffer)) >0 ) buf = buffer; +#if defined(CONFIG_FSL_DDR3 ) || defined(CONFIG_FSL_DDR2 )/* Chip select options. */ if (CONFIG_DIMM_SLOTS_PER_CTLR ==1 ) {switch (pdimm[0 ].n_ranks) {
@@ -546,6 +549,7 @@ unsigned int populate_memctl_options(int all_DIMMs_registered, break; } } +#endif /* Pick chip-select local options. */ for (i =0 ; i <CONFIG_CHIP_SELECTS_PER_CTRL ; i++) {
Signature · 1 line
1.7.3.4
PATCH 15/16 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c: Fix GCC 4.6 build warning
Fix:
fsl_corenet_serdes.c: In function 'fsl_serdes_init':
fsl_corenet_serdes.c:511:8: warning: variable 'buf' set but not used [-Wunused-but-set-variable] fsl_corenet_serdes.c:498:18: warning: variable 'lane_prtcl' set but not used [-Wunused-but-set-variable]
--- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c +6 -1
@@ -495,7 +495,6 @@ void fsl_serdes_init(void)int cfg;serdes_corenet_t *srds_regs;int lane, bank, idx; -enum srds_prtcl lane_prtcl;int have_bank[SRDS_MAX_BANK ] = {};#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8 u32 serdes8_devdisr =0 ;
@@ -507,6 +506,7 @@ void fsl_serdes_init(void)#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES_A001 int need_serdes_a001;/* TRUE == need work-around for SERDES A001 */ #endif +#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8 char buffer[HWCONFIG_BUFFER_SIZE ];char *buf =NULL ;
@@ -516,6 +516,7 @@ void fsl_serdes_init(void)*/ if (getenv_f ("hwconfig" , buffer,sizeof (buffer)) >0 ) buf = buffer; +#endif /* Is serdes enabled at all? */ if (!(in_be32 (&gur->rcwsr[5 ]) &FSL_CORENET_RCWSR5_SRDS_EN ))
@@ -617,7 +618,10 @@ void fsl_serdes_init(void) } } +#if defined(CONFIG_SYS_P4080_ERRATUM_SERDES8 ) || defined (CONFIG_SYS_P4080_ERRATUM_SERDES9 )for (lane =0 ; lane <SRDS_MAX_LANES ; lane++) { +enum srds_prtcl lane_prtcl; + idx =serdes_get_lane_idx (lane); lane_prtcl =serdes_get_prtcl (cfg, lane);
@@ -729,6 +733,7 @@ void fsl_serdes_init(void) #endif } +#endif #ifdef DEBUG puts ("\n" );
Signature · 1 line
1.7.3.4
PATCH 16/16 arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c: Fix GCC 4.6 build warning
Fix:
ctrl_regs.c: In function 'set_ddr_sdram_cfg_2':
ctrl_regs.c:641:15: warning: variable 'rcw_en' set but not used [-Wunused-but-set-variable] ctrl_regs.c: In function 'compute_fsl_memctl_config_regs':
ctrl_regs.c:951:31: warning: array subscript is above array bounds [-Warray-bounds] ctrl_regs.c:752:34: warning: array subscript is above array bounds [-Warray-bounds]
--- arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c +2 -5
@@ -672,7 +672,6 @@ static void set_ddr_sdram_cfg_2(fsl_ddr_cfg_regs_t *ddr, rcw_en =1 ; ap_en = popts->ap_en; }else { - rcw_en =0 ; ap_en =0 ; }
@@ -702,9 +701,7 @@ static void set_ddr_sdram_cfg_2(fsl_ddr_cfg_regs_t *ddr, | ((obc_cfg & 0x1) << 6) | ((ap_en &0x1 ) <<5 ) | ((d_init &0x1 ) <<4 ) -#ifdef CONFIG_FSL_DDR3 | ((rcw_en &0x1 ) <<2 ) -#endif | ((md_en &0x1 ) <<0 ) );debug ("FSLDDR: ddr_sdram_cfg_2 = 0x%08x\n" , ddr->ddr_sdram_cfg_2);
@@ -745,7 +742,7 @@ static void set_ddr_sdram_mode_2(fsl_ddr_cfg_regs_t *ddr,#ifdef CONFIG_FSL_DDR3 if (unq_mrs_en) {/* unique mode registers are supported */ -for (i =1 ; i <4 ; i++) { +for (i =1 ; i <CONFIG_CHIP_SELECTS_PER_CTRL ; i++) {if (popts->rtt_override) rtt_wr = popts->rtt_wr_override_value;else
@@ -944,7 +941,7 @@ static void set_ddr_sdram_mode(fsl_ddr_cfg_regs_t *ddr,debug ("FSLDDR: ddr_sdram_mode = 0x%08x\n" , ddr->ddr_sdram_mode);if (unq_mrs_en) {/* unique mode registers are supported */ -for (i =1 ; i <4 ; i++) { +for (i =1 ; i <CONFIG_CHIP_SELECTS_PER_CTRL ; i++) {if (popts->rtt_override) rtt = popts->rtt_override_value;else
Signature · 1 line
1.7.3.4