Fix GCC 4.6 build warning related to MPC85xx builds

PATCH New Kumar Gala 1 participant 11 messages Nov 9, 2011 – Nov 11, 2011 PowerPC

lore

Share & tools

lore

Kumar Gala

author

2011-11-09 16:29 UTC #0 lore raw

cover Fix GCC 4.6 build warning related to MPC85xx builds

Address 85xx specific gcc 4.6 warnings

- k

Kumar Gala

author

2011-11-09 16:29 UTC #1 lore raw

PATCH 1/16 arch/powerpc/cpu/mpc85xx/cpu_init.c: Fix GCC 4.6 build warning

Fix:

cpu_init.c: In function 'cpu_init_r':
cpu_init.c:320:7: warning: variable 'l2srbar' set but not used [-Wunused-but-set-variable]

Signed-off-by Kumar Gala <[email protected]>

---
 arch/powerpc/cpu/mpc85xx/cpu_init.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

arch/powerpc/cpu/mpc85xx/cpu_init.c +1 -2

index 0a4ce53..b9a8193 100644
@@ -317,7 +317,6 @@ int cpu_init_r(void)
 	volatile ccsr_l2cache_t *l2cache = (void *)CONFIG_SYS_MPC85xx_L2_ADDR;
 	volatile uint cache_ctl;
 	uint svr, ver;
-	uint l2srbar;
 	u32 l2siz_field;
 
 	svr = get_svr();

@@ -385,8 +384,8 @@ int cpu_init_r(void)
 
 	if (l2cache->l2ctl & MPC85xx_L2CTL_L2E) {
 		puts("already enabled");
-		l2srbar = l2cache->l2srbar0;
 #if defined(CONFIG_SYS_INIT_L2_ADDR) && defined(CONFIG_SYS_FLASH_BASE)
+		u32 l2srbar = l2cache->l2srbar0;
 		if (l2cache->l2ctl & MPC85xx_L2CTL_L2SRAM_ENTIRE
 				&& l2srbar >= CONFIG_SYS_FLASH_BASE) {
 			l2srbar = CONFIG_SYS_INIT_L2_ADDR;

Signature · 1 line

1.7.3.4

Kumar Gala

author

2011-11-09 16:29 UTC #2 lore raw

PATCH 2/16 arch/powerpc/cpu/mpc85xx/tlb.c: Fix GCC 4.6 build warning

Fix:

tlb.c: In function 'disable_tlb':
tlb.c:175:34: warning: variable '_mas7' set but not used [-Wunused-but-set-variable]

Signed-off-by Kumar Gala <[email protected]>

---
 arch/powerpc/cpu/mpc85xx/tlb.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

arch/powerpc/cpu/mpc85xx/tlb.c +2 -3

index 80ad04a..929f6a6 100644
@@ -172,7 +172,7 @@ void set_tlb(u8 tlb, u32 epn, u64 rpn,
 
 void disable_tlb(u8 esel)
 {
-	u32 _mas0, _mas1, _mas2, _mas3, _mas7;
+	u32 _mas0, _mas1, _mas2, _mas3;
 
 	free_tlb_cam(esel);

@@ -180,14 +180,13 @@ void disable_tlb(u8 esel)
 	_mas1 = 0;
 	_mas2 = 0;
 	_mas3 = 0;
-	_mas7 = 0;
 
 	mtspr(MAS0, _mas0);
 	mtspr(MAS1, _mas1);
 	mtspr(MAS2, _mas2);
 	mtspr(MAS3, _mas3);
 #ifdef CONFIG_ENABLE_36BIT_PHYS
-	mtspr(MAS7, _mas7);
+	mtspr(MAS7, 0);
 #endif
 	asm volatile("isync;msync;tlbwe;isync");

Signature · 1 line

1.7.3.4

Kumar Gala

author

2011-11-09 16:29 UTC #3 lore raw

PATCH 3/16 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c: Fix GCC 4.6 build warning

Fix:

fsl_lbc.c: In function 'upmconfig':
fsl_lbc.c:110:9: warning: variable 'mdr' set but not used [-Wunused-but-set-variable]

Signed-off-by Kumar Gala <[email protected]>

---
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

arch/powerpc/cpu/mpc8xxx/fsl_lbc.c +2 -2

index d78962f..587576b 100644
@@ -107,7 +107,7 @@ void init_early_memctl_regs(void)
 void upmconfig(uint upm, uint *table, uint size)
 {
 	fsl_lbc_t *lbc = LBC_BASE_ADDR;
-	int i, mdr, mad, old_mad = 0;
+	int i, mad, old_mad = 0;
 	u32 mask = (~MxMR_OP_MSK & ~MxMR_MAD_MSK);
 	u32 msel = BR_UPMx_TO_MSEL(upm);
 	u32 *mxmr = &lbc->mamr + upm;

@@ -138,7 +138,7 @@ void upmconfig(uint upm, uint *table, uint size)
 	for (i = 0; i < size; i++) {
 		out_be32(mxmr, (in_be32(mxmr) & mask) | MxMR_OP_WARR | i);
 		out_be32(&lbc->mdr, table[i]);
-		mdr = in_be32(&lbc->mdr);
+		(void)in_be32(&lbc->mdr);
 		*dummy = 0;
 		do {
 			mad = in_be32(mxmr) & MxMR_MAD_MSK;

Signature · 1 line

1.7.3.4

Kumar Gala

author

2011-11-09 16:29 UTC #4 lore raw

PATCH 4/16 board/freescale/common/cds_pci_ft.c: Fix GCC 4.6 build warning

Fix:

cds_pci_ft.c: In function 'cds_pci_fixup':
cds_pci_ft.c:31:12: warning: variable 'tmp' set but not used [-Wunused-but-set-variable]

Signed-off-by Kumar Gala <[email protected]>

---
 board/freescale/common/cds_pci_ft.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

board/freescale/common/cds_pci_ft.c +1 -2

index 6f221af..8a09f99 100644
@@ -28,13 +28,12 @@
 #if defined(CONFIG_OF_BOARD_SETUP)
 static void cds_pci_fixup(void *blob)
 {
-	int node, tmp[2];
+	int node;
 	const char *path;
 	int len, slot, i;
 	u32 *map = NULL;
 
 	node = fdt_path_offset(blob, "/aliases");
-	tmp[0] = 0;
 	if (node >= 0) {
 		path = fdt_getprop(blob, node, "pci0", NULL);
 		if (path) {

Signature · 1 line

1.7.3.4

Kumar Gala

author

2011-11-09 16:29 UTC #5 lore raw

PATCH 5/16 board/freescale/common/pixis.c: Fix GCC 4.6 build warning

Fix:

pixis.c: In function 'strfractoint':
pixis.c:383:6: warning: variable 'intarr_len' set but not used [-Wunused-but-set-variable]

Signed-off-by Kumar Gala <[email protected]>

---
 board/freescale/common/pixis.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

board/freescale/common/pixis.c +1 -3

index a35b5cf..8d07061 100644
@@ -380,7 +380,7 @@ static unsigned long strfractoint(char *strptr)
 {
 	int i, j;
 	int mulconst;
-	int intarr_len, no_dec = 0;
+	int no_dec = 0;
 	unsigned long intval = 0, decval = 0;
 	char intarr[3], decarr[3];

@@ -399,8 +399,6 @@ static unsigned long strfractoint(char *strptr)
 		i++;
 	}
 
-	/* Assign length of integer part to intarr_len. */
-	intarr_len = i;
 	intarr[i] = '\0';
 
 	if (no_dec) {

Signature · 1 line

1.7.3.4

Kumar Gala

author

2011-11-09 16:29 UTC #6 lore raw

PATCH 6/16 board/freescale/mpc8548cds/mpc8548cds.c: Fix GCC 4.6 build warning

Fix:

mpc8548cds.c: In function 'local_bus_init':
mpc8548cds.c:87:7: warning: variable 'lbc_hz' set but not used [-Wunused-but-set-variable] mpc8548cds.c: In function 'lbc_sdram_init':
mpc8548cds.c:121:7: warning: variable 'cpu_board_rev' set but not used [-Wunused-but-set-variable]

Signed-off-by Kumar Gala <[email protected]>

---
 board/freescale/mpc8548cds/mpc8548cds.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

board/freescale/mpc8548cds/mpc8548cds.c +0 -4

index d33ef7e..e5563f7 100644
@@ -84,12 +84,10 @@ local_bus_init(void)
 	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
 
 	uint clkdiv;
-	uint lbc_hz;
 	sys_info_t sysinfo;
 
 	get_sys_info(&sysinfo);
 	clkdiv = (lbc->lcrr & LCRR_CLKDIV) * 2;
-	lbc_hz = sysinfo.freqSystemBus / 1000000 / clkdiv;
 
 	gur->lbiuiplldcr1 = 0x00078080;
 	if (clkdiv == 16) {

@@ -118,7 +116,6 @@ void lbc_sdram_init(void)
 	uint idx;
 	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
 	uint *sdram_addr = (uint *)CONFIG_SYS_LBC_SDRAM_BASE;
-	uint cpu_board_rev;
 	uint lsdmr_common;
 
 	puts("LBC SDRAM: ");

@@ -140,7 +137,6 @@ void lbc_sdram_init(void)
 	/*
 	 * MPC8548 uses "new" 15-16 style addressing.
 	 */
-	cpu_board_rev = get_cpu_board_revision();
 	lsdmr_common = CONFIG_SYS_LBC_LSDMR_COMMON;
 	lsdmr_common |= LSDMR_BSMA1516;

Signature · 1 line

1.7.3.4

Kumar Gala

author

2011-11-09 16:29 UTC #7 lore raw

PATCH 7/16 board/freescale/mpc8568mds/mpc8568mds.c: Fix GCC 4.6 build warning

Fix:

mpc8568mds.c: In function 'local_bus_init':
mpc8568mds.c:150:7: warning: variable 'lbc_hz' set but not used [-Wunused-but-set-variable] mpc8568mds.c: In function 'pib_init':
mpc8568mds.c:271:11: warning: variable 'orig_i2c_bus' set but not used [-Wunused-but-set-variable]

Signed-off-by Kumar Gala <[email protected]>

---
 board/freescale/mpc8568mds/mpc8568mds.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

board/freescale/mpc8568mds/mpc8568mds.c +1 -2

index 225c5d8..6e3945e 100644
@@ -147,12 +147,10 @@ local_bus_init(void)
 	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
 
 	uint clkdiv;
-	uint lbc_hz;
 	sys_info_t sysinfo;
 
 	get_sys_info(&sysinfo);
 	clkdiv = (lbc->lcrr & LCRR_CLKDIV) * 2;
-	lbc_hz = sysinfo.freqSystemBus / 1000000 / clkdiv;
 
 	gur->lbiuiplldcr1 = 0x00078080;
 	if (clkdiv == 16) {

@@ -302,6 +300,7 @@ pib_init(void)
 	i2c_write(0x27, 0x3, 1, &val8, 1);
 
 	asm("eieio");
+	i2c_set_bus_num(orig_i2c_bus);
 }
 
 #ifdef CONFIG_PCI

Signature · 1 line

1.7.3.4

Kumar Gala

author

2011-11-09 16:29 UTC #8 lore raw

PATCH 8/16 board/freescale/mpc8569mds/mpc8569mds.c: Fix GCC 4.6 build warning

mpc8569mds.c: In function 'local_bus_init':
mpc8569mds.c:306:7: warning: variable 'lbc_hz' set but not used [-Wunused-but-set-variable]

Signed-off-by Kumar Gala <[email protected]>

---
 board/freescale/mpc8569mds/mpc8569mds.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

board/freescale/mpc8569mds/mpc8569mds.c +0 -2

index 89557d2..d119c65 100644
@@ -303,12 +303,10 @@ local_bus_init(void)
 	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
 
 	uint clkdiv;
-	uint lbc_hz;
 	sys_info_t sysinfo;
 
 	get_sys_info(&sysinfo);
 	clkdiv = (lbc->lcrr & LCRR_CLKDIV) * 2;
-	lbc_hz = sysinfo.freqSystemBus / 1000000 / clkdiv;
 
 	out_be32(&gur->lbiuiplldcr1, 0x00078080);
 	if (clkdiv == 16)

Signature · 1 line

1.7.3.4

Kumar Gala

author

2011-11-09 16:29 UTC #9 lore raw

PATCH 9/16 board/sbc8548/sbc8548.c: Fix GCC 4.6 build warning

Fix:

sbc8548.c: In function 'local_bus_init':
sbc8548.c:80:7: warning: variable 'lbc_hz' set but not used [-Wunused-but-set-variable]

Signed-off-by Kumar Gala <[email protected]>

---
 board/sbc8548/sbc8548.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

board/sbc8548/sbc8548.c +0 -2

index e1a3ea3..26095a5 100644
@@ -77,12 +77,10 @@ local_bus_init(void)
 	volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
 
 	uint clkdiv;
-	uint lbc_hz;
 	sys_info_t sysinfo;
 
 	get_sys_info(&sysinfo);
 	clkdiv = (in_be32(&lbc->lcrr) & LCRR_CLKDIV) * 2;
-	lbc_hz = sysinfo.freqSystemBus / 1000000 / clkdiv;
 
 	out_be32(&gur->lbiuiplldcr1, 0x00078080);
 	if (clkdiv == 16) {

Signature · 1 line

1.7.3.4

Kumar Gala

author

2011-11-11 13:34 UTC #10 lore raw

cover Fix GCC 4.6 build warning related to MPC85xx builds

In reply to Kumar Gala

Quoted 1 line · Kumar Gala

Address 85xx specific gcc 4.6 warnings

applied 1-16

- k