diff mbox

[U-Boot] arm, fdt: update ethernet mac address before booting Linux

Message ID 1316063790-4583-1-git-send-email-hs@denx.de
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Heiko Schocher Sept. 15, 2011, 5:16 a.m. UTC
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Gerald van Baren <gvb.uboot@gmail.com>
---
 arch/arm/lib/bootm.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Comments

Heiko Schocher Dec. 14, 2011, 9:39 a.m. UTC | #1
Hello Albert, Gerald,

Heiko Schocher wrote:
> Signed-off-by: Heiko Schocher <hs@denx.de>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> Cc: Gerald van Baren <gvb.uboot@gmail.com>
> ---
>  arch/arm/lib/bootm.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
> index 802e833..afa0093 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -206,6 +206,8 @@ static int bootm_linux_fdt(int machid, bootm_headers_t *images)
>  
>  	fixup_memory_node(*of_flat_tree);
>  
> +	fdt_fixup_ethernet(*of_flat_tree);
> +
>  	fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
>  
>  	announce_and_cleanup();

Some comments on this patch? Can it go in, in the current release?

bye,
Heiko
Jerry Van Baren Dec. 14, 2011, 2:39 p.m. UTC | #2
Hi Heiko,

On 12/14/2011 04:39 AM, Heiko Schocher wrote:
> Hello Albert, Gerald,
>
> Heiko Schocher wrote:
>> Signed-off-by: Heiko Schocher<hs@denx.de>
>> Cc: Albert ARIBAUD<albert.u.boot@aribaud.net>
>> Cc: Gerald van Baren<gvb.uboot@gmail.com>
>> ---
>>   arch/arm/lib/bootm.c |    2 ++
>>   1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
>> index 802e833..afa0093 100644
>> --- a/arch/arm/lib/bootm.c
>> +++ b/arch/arm/lib/bootm.c
>> @@ -206,6 +206,8 @@ static int bootm_linux_fdt(int machid, bootm_headers_t *images)
>>
>>   	fixup_memory_node(*of_flat_tree);
>>
>> +	fdt_fixup_ethernet(*of_flat_tree);
>> +
>>   	fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
>>
>>   	announce_and_cleanup();
>
> Some comments on this patch? Can it go in, in the current release?

I would defer to Albert, it is in his domain (ARM).

> bye,
> Heiko

Best regards,
gvb
Wolfgang Denk Dec. 17, 2011, 10:53 p.m. UTC | #3
Dear Heiko Schocher,

In message <1316063790-4583-1-git-send-email-hs@denx.de> you wrote:
> Signed-off-by: Heiko Schocher <hs@denx.de>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> Cc: Gerald van Baren <gvb.uboot@gmail.com>
> ---
>  arch/arm/lib/bootm.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)

Acked-by: Wolfgang Denk <wd@denx.de>


Albert, can you please take this through your tree for -rc2 ?

Thanks.

Best regards,

Wolfgang Denk
Albert ARIBAUD Dec. 19, 2011, 10:05 a.m. UTC | #4
Hi Heiko,

Le 15/09/2011 07:16, Heiko Schocher a écrit :
> Signed-off-by: Heiko Schocher<hs@denx.de>
> Cc: Albert ARIBAUD<albert.u.boot@aribaud.net>
> Cc: Gerald van Baren<gvb.uboot@gmail.com>
> ---
>   arch/arm/lib/bootm.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
> index 802e833..afa0093 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -206,6 +206,8 @@ static int bootm_linux_fdt(int machid, bootm_headers_t *images)
>
>   	fixup_memory_node(*of_flat_tree);
>
> +	fdt_fixup_ethernet(*of_flat_tree);
> +
>   	fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
>
>   	announce_and_cleanup();

Applied to u-boot-arm/master, thanks!

Amicalement,
diff mbox

Patch

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 802e833..afa0093 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -206,6 +206,8 @@  static int bootm_linux_fdt(int machid, bootm_headers_t *images)
 
 	fixup_memory_node(*of_flat_tree);
 
+	fdt_fixup_ethernet(*of_flat_tree);
+
 	fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
 
 	announce_and_cleanup();