ppc: cleanup compilererrors/warnings
PATCH v2 1/1 ppc: cleanup compilererrors/warnings
actual 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.
---
changes since v1:
- eth_putenv_enetaddr() substituted by eth_setenv_enetaddr()
board/RPXClassic/RPXClassic.c | 3 ++- board/etin/debris/debris.c | 1 + board/mbx8xx/mbx8xx.c | 3 ++- board/nx823/nx823.c | 5 +++-- board/pn62/pn62.c | 1 + board/siemens/IAD210/IAD210.c | 3 ++- board/sixnet/sixnet.c | 3 --- board/v38b/v38b.c | 3 ++- common/cmd_elf.c | 4 ++-- cpu/mpc512x/cpu.c | 1 + include/configs/MBX860T.h | 1 + 11 files changed, 17 insertions(+), 11 deletions(-)
board/RPXClassic/RPXClassic.c +2 -1
@@ -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 ;
board/etin/debris/debris.c +1 -0
@@ -23,6 +23,7 @@#include <common.h> #include <mpc824x.h> +#include <net.h> #include <pci.h> #include <i2c.h> #include <netdev.h>
board/mbx8xx/mbx8xx.c +2 -1
@@ -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 ;
board/nx823/nx823.c +2 -1
@@ -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)
board/pn62/pn62.c +1 -0
@@ -22,6 +22,7 @@#include <common.h> #include <mpc824x.h> +#include <net.h> #include <pci.h> #include <netdev.h>
board/siemens/IAD210/IAD210.c +2 -1
@@ -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 ;
board/sixnet/sixnet.c +0 -3
@@ -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 ];
board/v38b/v38b.c +2 -1
@@ -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 ;
common/cmd_elf.c +2 -2
@@ -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" );
cpu/mpc512x/cpu.c +1 -0
@@ -30,6 +30,7 @@#include <common.h> #include <command.h> #include <mpc512x.h> +#include <net.h> #include <netdev.h> #include <asm/processor.h>
include/configs/MBX860T.h +1 -0
@@ -381,6 +381,7 @@*/ #define NR_8259_INTS 0 +#define CONFIG_CMD_NET /* * MPC8xx CPM Options */
Signature · 5 lines
1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v2 1/1 ppc: cleanup compilererrors/warnings
Quoted 9 lines · On Thursday 26 March 2009 02:33:59 Heiko Schocher wrote:
actual 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 <[email protected]>
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20090326/7a5b6cf5/attachment.pgp
Wolfgang Denk
AppliedPATCH v2 1/1 ppc: cleanup compilererrors/warnings
In reply to Heiko SchocherDear Heiko Schocher,
Quoted 14 lines · In message <[email protected]> you wrote:
actual 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 <[email protected]>---
changes since v1:
-eth_putenv_enetaddr()substituted byeth_setenv_enetaddr()
Quoted 12 lines
board/RPXClassic/RPXClassic.c | 3 ++- board/etin/debris/debris.c | 1 + board/mbx8xx/mbx8xx.c | 3 ++- board/nx823/nx823.c | 5 +++-- board/pn62/pn62.c | 1 + board/siemens/IAD210/IAD210.c | 3 ++- board/sixnet/sixnet.c | 3 --- board/v38b/v38b.c | 3 ++- common/cmd_elf.c | 4 ++-- cpu/mpc512x/cpu.c | 1 + include/configs/MBX860T.h | 1 + 11 files changed, 17 insertions(+), 11 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The ultimate barrier is one's viewpoint.
- Terry Pratchett, _The Dark Side of the Sun_