[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2649-g20cfac9

[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  20cfac9e9ab4baa659db09f1750053f375e03977 (commit)
       via  33ac58e24af82158cc30d4b64f06d40cfcc1d152 (commit)
      from  78ee74f0c890d0aaeaa167b8649079f32da8f89f (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 20cfac9e9ab4baa659db09f1750053f375e03977
Merge: 33ac58e 78ee74f
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Dec 20 15:31:43 2011 +0100

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

commit 33ac58e24af82158cc30d4b64f06d40cfcc1d152
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Dec 20 15:31:21 2011 +0100

    [UBOOT][APF28] Fix ethernet 0 FEC identifier

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

Summary of changes:
 patches/u-boot/2011.12/01-uboot-apf28.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/u-boot/2011.12/01-uboot-apf28.patch b/patches/u-boot/2011.12/01-uboot-apf28.patch
index dbe893a..72fd3c1 100644
--- a/patches/u-boot/2011.12/01-uboot-apf28.patch
+++ b/patches/u-boot/2011.12/01-uboot-apf28.patch
@@ -118,10 +118,10 @@
 +
 +int fecmxc_mii_postcall(int phy)
 +{
-+	miiphy_write("FEC", phy, MII_BMCR, 0x9000);
-+	miiphy_write("FEC", phy, MII_OPMODE_STRAP_OVERRIDE, 0x0202);
++	miiphy_write("FEC0", phy, MII_BMCR, 0x9000);
++	miiphy_write("FEC0", phy, MII_OPMODE_STRAP_OVERRIDE, 0x0202);
 +	if (phy == 3)
-+		miiphy_write("FEC", 3, MII_PHY_CTRL2, 0x8180);
++		miiphy_write("FEC0", 3, MII_PHY_CTRL2, 0x8180);
 +	return 0;
 +}
 +


hooks/post-receive
-- 
armadeus