diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-10-19 12:03:44 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-10-19 12:03:44 -0500 |
| commit | d22200f0204ce3210ed47d4e13864ebc60b93918 (patch) | |
| tree | c47f9526f6d90d5f50018d962e1ad6a7d57bc43c /lib_ppc | |
| parent | 4d45f69e362b05892c9e92a7907e5820995612aa (diff) | |
| parent | fcfed4f2f234836a0b308fd0a782f4625cd40bad (diff) | |
| download | u-boot-imx-d22200f0204ce3210ed47d4e13864ebc60b93918.zip u-boot-imx-d22200f0204ce3210ed47d4e13864ebc60b93918.tar.gz u-boot-imx-d22200f0204ce3210ed47d4e13864ebc60b93918.tar.bz2 | |
Merge branch 'master' of http://www.denx.de/git/u-boot
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 46cea98..844bbc9 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 |