diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-07-03 13:07:56 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-03 13:07:56 (GMT) |
| commit | 98c440bee623ecdd5322852732b883e696fb2140 (patch) | |
| tree | ad8b06bc01822cfff8dc53d6651c59c24ac1babe /cpu/mpc83xx | |
| parent | e4feb7638ca0a2138973f14456424acbc332ae43 (diff) | |
| parent | 1f2a05898658900dc5717761e27abf2052e67e13 (diff) | |
| download | u-boot-fsl-qoriq-98c440bee623ecdd5322852732b883e696fb2140.tar.xz | |
Merge with /home/wd/git/u-boot/custodian/u-boot-testing
Diffstat (limited to 'cpu/mpc83xx')
| -rw-r--r-- | cpu/mpc83xx/cpu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index e078f27..841fe82 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -415,7 +415,7 @@ static const struct { "clock-frequency", fdt_set_busfreq }, -#ifdef CONFIG_MPC83XX_TSEC1 +#ifdef CONFIG_TSEC1 { "/" OF_SOC "/ethernet@24000, "mac-address", fdt_set_eth0 @@ -425,7 +425,7 @@ static const struct { fdt_set_eth0 }, #endif -#ifdef CONFIG_MPC83XX_TSEC2 +#ifdef CONFIG_TSEC2 { "/" OF_SOC "/ethernet@25000, "mac-address", fdt_set_eth1 @@ -525,7 +525,7 @@ ft_cpu_setup(void *blob, bd_t *bd) if (p != NULL) *p = cpu_to_be32(clock); -#ifdef CONFIG_MPC83XX_TSEC1 +#ifdef CONFIG_TSEC1 p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enetaddr, 6); @@ -535,7 +535,7 @@ ft_cpu_setup(void *blob, bd_t *bd) memcpy(p, bd->bi_enetaddr, 6); #endif -#ifdef CONFIG_MPC83XX_TSEC2 +#ifdef CONFIG_TSEC2 p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enet1addr, 6); |