diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 23:04:42 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-20 23:04:42 +0200 |
commit | 9fa48022e5883a0826a98979c0156f6ac5a0ef79 (patch) | |
tree | e854c807526ce8b7215446fc34f52832fd0bcc54 /lib_ppc | |
parent | 34a7ceeff449be015a37d0e3f3178ca313618349 (diff) | |
parent | ba999c531ed16ec749b2b6f4b0133cee38842b91 (diff) |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'lib_ppc')
-rw-r--r-- | lib_ppc/board.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index cf0e3fdf4b..3e401bead0 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2004 + * (C) Copyright 2000-2006 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -805,7 +805,10 @@ void board_init_r (gd_t *id, ulong dest_addr) #endif /* CFG_EXTBDINFO */ s = getenv ("ethaddr"); -#if defined (CONFIG_MBX) || defined (CONFIG_RPXCLASSIC) || defined(CONFIG_IAD210) +#if defined (CONFIG_MBX) || \ + defined (CONFIG_RPXCLASSIC) || \ + defined(CONFIG_IAD210) || \ + defined(CONFIG_V38B) if (s == NULL) board_get_enetaddr (bd->bi_enetaddr); else |