[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-251-gc9da409

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  c9da409ef59cc997d6468933139c664b4e2eac0d (commit)
       via  5ddfb54708fe9f51c20711babf91a0f6746381a9 (commit)
       via  59d5781a213e45bb4b00f5046fa671da0213dd13 (commit)
      from  d42b5801ca3ce61773c3cec3bad1292c7b9bfa17 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c9da409ef59cc997d6468933139c664b4e2eac0d
Merge: 5ddfb54708fe9f51c20711babf91a0f6746381a9 d42b5801ca3ce61773c3cec3bad1292c7b9bfa17
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jan 20 23:16:00 2011 +0100

    Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 5ddfb54708fe9f51c20711babf91a0f6746381a9
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jan 20 05:56:05 2011 +0100

    [UBOOT] preload ethernet address to support linux current fec driver

commit 59d5781a213e45bb4b00f5046fa671da0213dd13
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Jan 20 05:53:44 2011 +0100

    [UBOOT] Use eth0 as default ethernet interface

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2010.03.h   |    6 +++---
 .../target/u-boot/u-boot-2010.03-410-imx-iim.patch |    9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index 917a45f..c69d0fb 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -26,8 +26,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"0.2"
-#define CONFIG_IDENT_STRING	" apf51 patch 0.1"
+#define CONFIG_ENV_VERSION 	"0.3"
+#define CONFIG_IDENT_STRING	" apf51 patch 0.2"
 
  /* High Level Configuration Options */
 #define CONFIG_ARMV7		1	/* This is armv7 Cortex-A8 CPU	*/
@@ -164,7 +164,7 @@
 	"addmmcargs=setenv bootargs ${bootargs} "			\
 		"root=${mmcroot} rootfstype=${mmcrootfstype}\0"   	\
 	"addipargs=setenv bootargs ${bootargs} "			\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off \0"\
+		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off \0"\
 	"nfsboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addnfsargs addipargs; setenv autostart yes;"	\
 		"nboot.jffs2 90800000 0 ${kernel_offset}\0"		\
diff --git a/buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch b/buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch
index 15f1c87..6fbec8f 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch
@@ -495,6 +495,15 @@ Index: u-boot-2010.03/drivers/net/fec_mxc.c
  #else
  	struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
  	int i;
+@@ -777,6 +777,8 @@ static int fec_probe(bd_t *bd)
+ 		memcpy(edev->enetaddr, ethaddr, 6);
+ 	}
+ 
++	fec_set_hwaddr(edev);
++
+ 	return 0;
+ }
+ 
 Index: u-boot-2010.03/include/asm-arm/arch-mx51/imx_iim.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000


hooks/post-receive
-- 
armadeus