Commit 76756e41 authored by Heiko Schocher's avatar Heiko Schocher Committed by Wolfgang Denk

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: default avatarHeiko Schocher <hs@denx.de>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 81005758
......@@ -30,6 +30,7 @@
#include <i2c.h>
#include <config.h>
#include <mpc8xx.h>
#include <net.h>
/* ------------------------------------------------------------------------- */
......@@ -151,7 +152,7 @@ int misc_init_r(void)
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
board_get_enetaddr(enetaddr);
eth_putenv_enetaddr("ethaddr", enetaddr);
eth_setenv_enetaddr("ethaddr", enetaddr);
}
return 0;
......
......@@ -23,6 +23,7 @@
#include <common.h>
#include <mpc824x.h>
#include <net.h>
#include <pci.h>
#include <i2c.h>
#include <netdev.h>
......
......@@ -34,6 +34,7 @@
#include <common.h>
#include <commproc.h>
#include <mpc8xx.h>
#include <net.h>
#include "dimm.h"
#include "vpd.h"
#include "csr.h"
......@@ -257,7 +258,7 @@ int misc_init_r(void)
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
board_get_enetaddr(enetaddr);
eth_putenv_enetaddr("ethaddr", enetaddr);
eth_setenv_enetaddr("ethaddr", enetaddr);
}
return 0;
......
......@@ -27,6 +27,7 @@
#include <common.h>
#include <malloc.h>
#include <mpc8xx.h>
#include <net.h>
DECLARE_GLOBAL_DATA_PTR;
......@@ -366,7 +367,7 @@ int misc_init_r (void)
char tmp[50];
uchar ethaddr[6];
bd_t *bd = gd->bd;
ulong my_sernum = bd->bi_sernum;
ulong *my_sernum = (unsigned long *)&bd->bi_sernum;
/* load unique serial number */
for (i = 0; i < 8; ++i)
......
......@@ -22,6 +22,7 @@
#include <common.h>
#include <mpc824x.h>
#include <net.h>
#include <pci.h>
#include <netdev.h>
......
......@@ -23,6 +23,7 @@
#include <common.h>
#include <mpc8xx.h>
#include <net.h>
#include "atm.h"
#include <i2c.h>
......@@ -291,7 +292,7 @@ int misc_init_r(void)
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
board_get_enetaddr(enetaddr);
eth_putenv_enetaddr("ethaddr", enetaddr);
eth_setenv_enetaddr("ethaddr", enetaddr);
}
return 0;
......
......@@ -260,9 +260,6 @@ int misc_init_r (void)
{
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
char* s;
char* e;
int reg;
bd_t *bd = gd->bd;
uchar enetaddr[6];
......
......@@ -26,6 +26,7 @@
#include <common.h>
#include <mpc5xxx.h>
#include <net.h>
#include <asm/processor.h>
......@@ -230,7 +231,7 @@ int misc_init_r(void)
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
board_get_enetaddr(enetaddr);
eth_putenv_enetaddr("ethaddr", enetaddr);
eth_setenv_enetaddr("ethaddr", enetaddr);
}
return 0;
......
......@@ -131,11 +131,11 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_WALNUT)
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);
#elif defined(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);
#else
puts ("## Ethernet MAC address not copied to NV RAM\n");
......
......@@ -30,6 +30,7 @@
#include <common.h>
#include <command.h>
#include <mpc512x.h>
#include <net.h>
#include <netdev.h>
#include <asm/processor.h>
......
......@@ -381,6 +381,7 @@
*/
#define NR_8259_INTS 0
#define CONFIG_CMD_NET
/*
* MPC8xx CPM Options
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment