From 5091cdc71f75becfe2aa4a9f6bb9740adffd338a Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 15 Jan 2008 09:33:56 -0600 Subject: [PATCH] --- yaml --- r: 81283 b: refs/heads/master c: 3e6f4394ab3ae4480593d5f2612a0d92fd39bf07 h: refs/heads/master i: 81281: 61d5b8361e547a8accfcd26649460f906ee76a9f 81279: 0d6feb905759c65cf995cd6d4fc7c6eb8541772c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/cuboot-83xx.c | 3 ++- trunk/arch/powerpc/boot/cuboot-85xx.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9092d27cc61b..b1bba595141a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad160681c8caa0a73e6abd3ac606cd857608f94a +refs/heads/master: 3e6f4394ab3ae4480593d5f2612a0d92fd39bf07 diff --git a/trunk/arch/powerpc/boot/cuboot-83xx.c b/trunk/arch/powerpc/boot/cuboot-83xx.c index acd860ed7393..61af1c1e8255 100644 --- a/trunk/arch/powerpc/boot/cuboot-83xx.c +++ b/trunk/arch/powerpc/boot/cuboot-83xx.c @@ -24,7 +24,8 @@ static void platform_fixups(void) void *soc; dt_fixup_memory(bd.bi_memstart, bd.bi_memsize); - dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr); + dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr); + dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr); dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq); /* Unfortunately, the specific model number is encoded in the diff --git a/trunk/arch/powerpc/boot/cuboot-85xx.c b/trunk/arch/powerpc/boot/cuboot-85xx.c index 943779ed19be..6776a1a29f13 100644 --- a/trunk/arch/powerpc/boot/cuboot-85xx.c +++ b/trunk/arch/powerpc/boot/cuboot-85xx.c @@ -24,8 +24,9 @@ static void platform_fixups(void) void *soc; dt_fixup_memory(bd.bi_memstart, bd.bi_memsize); - dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr, - bd.bi_enet2addr); + dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr); + dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr); + dt_fixup_mac_address_by_alias("ethernet2", bd.bi_enet2addr); dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq); /* Unfortunately, the specific model number is encoded in the