diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-07-03 15:07:56 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-03 15:07:56 +0200 |
| commit | 98c440bee623ecdd5322852732b883e696fb2140 (patch) | |
| tree | ad8b06bc01822cfff8dc53d6651c59c24ac1babe /cpu/mpc86xx | |
| parent | e4feb7638ca0a2138973f14456424acbc332ae43 (diff) | |
| parent | 1f2a05898658900dc5717761e27abf2052e67e13 (diff) | |
| download | u-boot-98c440bee623ecdd5322852732b883e696fb2140.tar.gz u-boot-98c440bee623ecdd5322852732b883e696fb2140.tar.bz2 u-boot-98c440bee623ecdd5322852732b883e696fb2140.zip | |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'cpu/mpc86xx')
| -rw-r--r-- | cpu/mpc86xx/cpu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c index a33acfec4d..9456471e84 100644 --- a/cpu/mpc86xx/cpu.c +++ b/cpu/mpc86xx/cpu.c @@ -278,7 +278,7 @@ ft_cpu_setup(void *blob, bd_t *bd) if (p != NULL) *p = cpu_to_be32(clock); -#if defined(CONFIG_MPC86XX_TSEC1) +#if defined(CONFIG_TSEC1) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enetaddr, 6); @@ -287,7 +287,7 @@ ft_cpu_setup(void *blob, bd_t *bd) memcpy(p, bd->bi_enetaddr, 6); #endif -#if defined(CONFIG_MPC86XX_TSEC2) +#if defined(CONFIG_TSEC2) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enet1addr, 6); @@ -296,7 +296,7 @@ ft_cpu_setup(void *blob, bd_t *bd) memcpy(p, bd->bi_enet1addr, 6); #endif -#if defined(CONFIG_MPC86XX_TSEC3) +#if defined(CONFIG_TSEC3) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@26000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enet2addr, 6); @@ -305,7 +305,7 @@ ft_cpu_setup(void *blob, bd_t *bd) memcpy(p, bd->bi_enet2addr, 6); #endif -#if defined(CONFIG_MPC86XX_TSEC4) +#if defined(CONFIG_TSEC4) p = ft_get_prop(blob, "/" OF_SOC "/ethernet@27000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enet3addr, 6); |