LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppc: cleanup compiler errors/warnings 

Current u-boot top of tree builds with warnings/errors for
the following boards:

ads5121 cpci5200 mecp5200 v38b IAD210 MBX MBX860T NX823
RPXClassic debris PN62

following patch solves this.

Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Heiko Schocher 2009-03-26 07:33:59 +01:00 committed by Wolfgang Denk
parent 81005758bc
commit 76756e41cd
11 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
board/RPXClassic/RPXClassic.c
View File

@ -30,6 +30,7 @@
#include <i2c.h> #include <i2c.h>
#include <config.h> #include <config.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#include <net.h>
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@ -151,7 +152,7 @@ int misc_init_r(void)
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) { if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
board_get_enetaddr(enetaddr); board_get_enetaddr(enetaddr);
eth_putenv_enetaddr("ethaddr", enetaddr); eth_setenv_enetaddr("ethaddr", enetaddr);
} }
return 0; return 0;

1
board/etin/debris/debris.c
View File

@ -23,6 +23,7 @@
#include <common.h> #include <common.h>
#include <mpc824x.h> #include <mpc824x.h>
#include <net.h>
#include <pci.h> #include <pci.h>
#include <i2c.h> #include <i2c.h>
#include <netdev.h> #include <netdev.h>

3
board/mbx8xx/mbx8xx.c
View File

@ -34,6 +34,7 @@
#include <common.h> #include <common.h>
#include <commproc.h> #include <commproc.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#include <net.h>
#include "dimm.h" #include "dimm.h"
#include "vpd.h" #include "vpd.h"
#include "csr.h" #include "csr.h"
@ -257,7 +258,7 @@ int misc_init_r(void)
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) { if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
board_get_enetaddr(enetaddr); board_get_enetaddr(enetaddr);
eth_putenv_enetaddr("ethaddr", enetaddr); eth_setenv_enetaddr("ethaddr", enetaddr);
} }
return 0; return 0;

3
board/nx823/nx823.c
View File

@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <malloc.h> #include <malloc.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#include <net.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -366,7 +367,7 @@ int misc_init_r (void)
char tmp[50]; char tmp[50];
uchar ethaddr[6]; uchar ethaddr[6];
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
ulong my_sernum = bd->bi_sernum; ulong *my_sernum = (unsigned long *)&bd->bi_sernum;
/* load unique serial number */ /* load unique serial number */
for (i = 0; i < 8; ++i) for (i = 0; i < 8; ++i)

1
board/pn62/pn62.c
View File

@ -22,6 +22,7 @@
#include <common.h> #include <common.h>
#include <mpc824x.h> #include <mpc824x.h>
#include <net.h>
#include <pci.h> #include <pci.h>
#include <netdev.h> #include <netdev.h>

3
board/siemens/IAD210/IAD210.c
View File

@ -23,6 +23,7 @@
#include <common.h> #include <common.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#include <net.h>
#include "atm.h" #include "atm.h"
#include <i2c.h> #include <i2c.h>
@ -291,7 +292,7 @@ int misc_init_r(void)
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) { if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
board_get_enetaddr(enetaddr); board_get_enetaddr(enetaddr);
eth_putenv_enetaddr("ethaddr", enetaddr); eth_setenv_enetaddr("ethaddr", enetaddr);
} }
return 0; return 0;

3
board/sixnet/sixnet.c
View File

@ -260,9 +260,6 @@ int misc_init_r (void)
{ {
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl; volatile memctl8xx_t *memctl = &immap->im_memctl;
char* s;
char* e;
int reg;
bd_t *bd = gd->bd; bd_t *bd = gd->bd;
uchar enetaddr[6]; uchar enetaddr[6];

3
board/v38b/v38b.c
View File

@ -26,6 +26,7 @@
#include <common.h> #include <common.h>
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <net.h>
#include <asm/processor.h> #include <asm/processor.h>
@ -230,7 +231,7 @@ int misc_init_r(void)
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) { if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
board_get_enetaddr(enetaddr); board_get_enetaddr(enetaddr);
eth_putenv_enetaddr("ethaddr", enetaddr); eth_setenv_enetaddr("ethaddr", enetaddr);
} }
return 0; return 0;

4
common/cmd_elf.c
View File

@ -131,11 +131,11 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_WALNUT) #if defined(CONFIG_WALNUT)
tmp = (char *) CONFIG_SYS_NVRAM_BASE_ADDR + 0x500; tmp = (char *) CONFIG_SYS_NVRAM_BASE_ADDR + 0x500;
eth_getenv_enetaddr("ethaddr", build_buf); eth_getenv_enetaddr("ethaddr", (uchar *)build_buf);
memcpy(tmp, &build_buf[3], 3); memcpy(tmp, &build_buf[3], 3);
#elif defined(CONFIG_SYS_VXWORKS_MAC_PTR) #elif defined(CONFIG_SYS_VXWORKS_MAC_PTR)
tmp = (char *) CONFIG_SYS_VXWORKS_MAC_PTR; tmp = (char *) CONFIG_SYS_VXWORKS_MAC_PTR;
eth_getenv_enetaddr("ethaddr", build_buf); eth_getenv_enetaddr("ethaddr", (uchar *)build_buf);
memcpy(tmp, build_buf, 6); memcpy(tmp, build_buf, 6);
#else #else
puts ("## Ethernet MAC address not copied to NV RAM\n"); puts ("## Ethernet MAC address not copied to NV RAM\n");

1
cpu/mpc512x/cpu.c
View File

@ -30,6 +30,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <mpc512x.h> #include <mpc512x.h>
#include <net.h>
#include <netdev.h> #include <netdev.h>
#include <asm/processor.h> #include <asm/processor.h>

1
include/configs/MBX860T.h
View File

@ -381,6 +381,7 @@
*/ */
#define NR_8259_INTS 0 #define NR_8259_INTS 0
#define CONFIG_CMD_NET
/* /*
* MPC8xx CPM Options * MPC8xx CPM Options
*/ */