diff options
| -rw-r--r-- | board/RPXClassic/RPXClassic.c | 3 | ||||
| -rw-r--r-- | board/etin/debris/debris.c | 1 | ||||
| -rw-r--r-- | board/mbx8xx/mbx8xx.c | 3 | ||||
| -rw-r--r-- | board/nx823/nx823.c | 3 | ||||
| -rw-r--r-- | board/pn62/pn62.c | 1 | ||||
| -rw-r--r-- | board/siemens/IAD210/IAD210.c | 3 | ||||
| -rw-r--r-- | board/sixnet/sixnet.c | 3 | ||||
| -rw-r--r-- | board/v38b/v38b.c | 3 | ||||
| -rw-r--r-- | common/cmd_elf.c | 4 | ||||
| -rw-r--r-- | cpu/mpc512x/cpu.c | 1 | ||||
| -rw-r--r-- | include/configs/MBX860T.h | 1 |
11 files changed, 16 insertions, 10 deletions
diff --git a/board/RPXClassic/RPXClassic.c b/board/RPXClassic/RPXClassic.c index 5aa713fa0b..c3d5385f42 100644 --- a/board/RPXClassic/RPXClassic.c +++ b/board/RPXClassic/RPXClassic.c @@ -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; diff --git a/board/etin/debris/debris.c b/board/etin/debris/debris.c index a971af3aa9..33efe16c29 100644 --- a/board/etin/debris/debris.c +++ b/board/etin/debris/debris.c @@ -23,6 +23,7 @@ #include <common.h> #include <mpc824x.h> +#include <net.h> #include <pci.h> #include <i2c.h> #include <netdev.h> diff --git a/board/mbx8xx/mbx8xx.c b/board/mbx8xx/mbx8xx.c index a3bf1f73d9..255796bd10 100644 --- a/board/mbx8xx/mbx8xx.c +++ b/board/mbx8xx/mbx8xx.c @@ -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; diff --git a/board/nx823/nx823.c b/board/nx823/nx823.c index 6ec29dc857..7867fff67b 100644 --- a/board/nx823/nx823.c +++ b/board/nx823/nx823.c @@ -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) diff --git a/board/pn62/pn62.c b/board/pn62/pn62.c index 53d7e5763d..676f8d34f2 100644 --- a/board/pn62/pn62.c +++ b/board/pn62/pn62.c @@ -22,6 +22,7 @@ #include <common.h> #include <mpc824x.h> +#include <net.h> #include <pci.h> #include <netdev.h> diff --git a/board/siemens/IAD210/IAD210.c b/board/siemens/IAD210/IAD210.c index 67e5c8fc07..7325a93647 100644 --- a/board/siemens/IAD210/IAD210.c +++ b/board/siemens/IAD210/IAD210.c @@ -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; diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c index 4fcd84b6f0..6e39b0196c 100644 --- a/board/sixnet/sixnet.c +++ b/board/sixnet/sixnet.c @@ -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]; diff --git a/board/v38b/v38b.c b/board/v38b/v38b.c index 9e7c1d7e55..978ff8db00 100644 --- a/board/v38b/v38b.c +++ b/board/v38b/v38b.c @@ -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; diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 4a3fff1e86..83e758999a 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -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"); diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c index be532afdc3..8021bc15e3 100644 --- a/cpu/mpc512x/cpu.c +++ b/cpu/mpc512x/cpu.c @@ -30,6 +30,7 @@ #include <common.h> #include <command.h> #include <mpc512x.h> +#include <net.h> #include <netdev.h> #include <asm/processor.h> diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h index 0c28710874..afe23836ce 100644 --- a/include/configs/MBX860T.h +++ b/include/configs/MBX860T.h @@ -381,6 +381,7 @@ */ #define NR_8259_INTS 0 +#define CONFIG_CMD_NET /* * MPC8xx CPM Options */ |