diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-07-13 21:39:13 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-07-13 21:39:13 +0200 |
| commit | bc2962482b707e44e0b43d20bd4dcf2a40230abb (patch) | |
| tree | 751c5e07c5ff0aa7910da0fe33b0a0996bda518c /cpu/mpc83xx/cpu.c | |
| parent | 093172f08d6afb3f34d8a2f26ee0ee874261cf27 (diff) | |
| parent | 239f05ee4dd4cfe0b50f251b533dcebe9e67c360 (diff) | |
| download | u-boot-imx-bc2962482b707e44e0b43d20bd4dcf2a40230abb.zip u-boot-imx-bc2962482b707e44e0b43d20bd4dcf2a40230abb.tar.gz u-boot-imx-bc2962482b707e44e0b43d20bd4dcf2a40230abb.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'cpu/mpc83xx/cpu.c')
| -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); |