86xx: write MAC address to mac-address and local-mac-address
PATCH 1/1 86xx: write MAC address to mac-address and local-mac-address
Some device trees have a mac-address property, some have local-mac-address, and some have both. To support all of these device trees, ftp_cpu_setup() should write the MAC address to mac-address and local-mac-address, if they exist.
Signed-off-by Timur Tabi <[email protected]>
--- cpu/mpc86xx/cpu.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-)
cpu/mpc86xx/cpu.c +24 -4
@@ -286,22 +286,42 @@ ft_cpu_setup(void *blob, bd_t *bd)#if defined(CONFIG_MPC86XX_TSEC1 ) p =ft_get_prop (blob,"/" OF_SOC "/ethernet at 24000/mac-address" , &len); -memcpy (p, bd->bi_enetaddr,6 ); +if (p) +memcpy (p, bd->bi_enetaddr,6 ); + + p =ft_get_prop (blob,"/" OF_SOC "/ethernet at 24000/local-mac-address" , &len); +if (p) +memcpy (p, bd->bi_enetaddr,6 );#endif #if defined(CONFIG_MPC86XX_TSEC2 ) p =ft_get_prop (blob,"/" OF_SOC "/ethernet at 25000/mac-address" , &len); -memcpy (p, bd->bi_enet1addr,6 ); +if (p) +memcpy (p, bd->bi_enet1addr,6 ); + + p =ft_get_prop (blob,"/" OF_SOC "/ethernet at 25000/local-mac-address" , &len); +if (p) +memcpy (p, bd->bi_enet1addr,6 );#endif #if defined(CONFIG_MPC86XX_TSEC3 ) p =ft_get_prop (blob,"/" OF_SOC "/ethernet at 26000/mac-address" , &len); -memcpy (p, bd->bi_enet2addr,6 ); +if (p) +memcpy (p, bd->bi_enet2addr,6 ); + + p =ft_get_prop (blob,"/" OF_SOC "/ethernet at 26000/local-mac-address" , &len); +if (p) +memcpy (p, bd->bi_enet2addr,6 );#endif #if defined(CONFIG_MPC86XX_TSEC4 ) p =ft_get_prop (blob,"/" OF_SOC "/ethernet at 27000/mac-address" , &len); -memcpy (p, bd->bi_enet3addr,6 ); +if (p) +memcpy (p, bd->bi_enet3addr,6 ); + + p =ft_get_prop (blob,"/" OF_SOC "/ethernet at 27000/local-mac-address" , &len); +if (p) +memcpy (p, bd->bi_enet3addr,6 );#endif }
Signature · 1 line
1.4.4