[PATCH] powerpc/boot: cuboot: Fix up ethernet3 MAC address on MPC85xx

[PATCH] powerpc/boot: cuboot: Fix up ethernet3 MAC address on MPC85xx

[Nate Case]

MPC85xx platforms do support 4 ethernet ports, so make sure the boot
wrapper fixes up all of them in the fdt.

Signed-off-by: Nate Case <ncase@xes-inc.com>
---
 arch/powerpc/boot/cuboot-85xx.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/cuboot-85xx.c
index 6776a1a..277ba4a 100644
--- a/arch/powerpc/boot/cuboot-85xx.c
+++ b/arch/powerpc/boot/cuboot-85xx.c
@@ -15,6 +15,7 @@
 #include "cuboot.h"
 
 #define TARGET_85xx
+#define TARGET_HAS_ETH3
 #include "ppcboot.h"
 
 static bd_t bd;
@@ -27,6 +28,7 @@ static void platform_fixups(void)
 	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_mac_address_by_alias("ethernet3", bd.bi_enet3addr);
 	dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq);
 
 	/* Unfortunately, the specific model number is encoded in the
-- 
1.6.0.2

Re: [PATCH] powerpc/boot: cuboot: Fix up ethernet3 MAC address on MPC85xx

[Kumar Gala]

On Jun 8, 2009, at 5:17 PM, Nate Case wrote:

> MPC85xx platforms do support 4 ethernet ports, so make sure the boot
> wrapper fixes up all of them in the fdt.
>
> Signed-off-by: Nate Case <ncase@xes-inc.com>
> ---
> arch/powerpc/boot/cuboot-85xx.c |    2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/ 
> cuboot-85xx.c
> index 6776a1a..277ba4a 100644
> --- a/arch/powerpc/boot/cuboot-85xx.c
> +++ b/arch/powerpc/boot/cuboot-85xx.c
> @@ -15,6 +15,7 @@
> #include "cuboot.h"
>
> #define TARGET_85xx
> +#define TARGET_HAS_ETH3

This is problematic in that we'd be changing the memory layout of the  
bd_t and not ALL 85xx's have HAS_ETH3 set.

- k

Re: [PATCH] powerpc/boot: cuboot: Fix up ethernet3 MAC address on MPC85xx

[Nathaniel Case]

On Wed, 10 Jun 2009 21:54:01 -0500, Kumar Gala <galak@kernel.crashing.org>
wrote:
>> #define TARGET_85xx
>> +#define TARGET_HAS_ETH3
> 
> This is problematic in that we'd be changing the memory layout of the  
> bd_t and not ALL 85xx's have HAS_ETH3 set.

It shouldn't be problematic.  The bi_enet3addr field is at the end of the
structure on MPC85xx.  The only fields after it in ppcboot.h are
4xx-specific
fields.  I believe the MAC addresses were placed at the end of the struct
for
this very reason.

-- 
Nate Case <ncase@xes-inc.com>

Re: [PATCH] powerpc/boot: cuboot: Fix up ethernet3 MAC address on MPC85xx

[Kumar Gala]

On Jun 10, 2009, at 10:40 PM, Nathaniel Case wrote:

> On Wed, 10 Jun 2009 21:54:01 -0500, Kumar Gala <galak@kernel.crashing.org 
> >
> wrote:
>>> #define TARGET_85xx
>>> +#define TARGET_HAS_ETH3
>>
>> This is problematic in that we'd be changing the memory layout of the
>> bd_t and not ALL 85xx's have HAS_ETH3 set.
>
> It shouldn't be problematic.  The bi_enet3addr field is at the end  
> of the
> structure on MPC85xx.  The only fields after it in ppcboot.h are
> 4xx-specific
> fields.  I believe the MAC addresses were placed at the end of the  
> struct
> for
> this very reason.

ahh, good point... I'll add this detail to the commit message when I  
commit this.

- k

Re: [PATCH] powerpc/boot: cuboot: Fix up ethernet3 MAC address on MPC85xx

[Kumar Gala]

On Jun 8, 2009, at 5:17 PM, Nate Case wrote:

> MPC85xx platforms do support 4 ethernet ports, so make sure the boot
> wrapper fixes up all of them in the fdt.
>
> Signed-off-by: Nate Case <ncase@xes-inc.com>
> ---
> arch/powerpc/boot/cuboot-85xx.c |    2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)

applied (updated commit message) to next

- k