[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-284-g8349684
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-284-g8349684
|
From: Fabien M <fa...@us...> - 2011-02-07 16:21:10
|
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 834968421832654a422c47112619137a18709c12 (commit)
via 214be2bb261e891ce090630b0af0ee6ab0e30ef9 (commit)
from cdce01dfd04a0667200cbc1156902934e4119a38 (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 834968421832654a422c47112619137a18709c12
Merge: 214be2bb261e891ce090630b0af0ee6ab0e30ef9 cdce01dfd04a0667200cbc1156902934e4119a38
Author: Fabien Marteau <fab...@ar...>
Date: Mon Feb 7 17:20:46 2011 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 214be2bb261e891ce090630b0af0ee6ab0e30ef9
Author: Fabien Marteau <fab...@ar...>
Date: Mon Feb 7 17:20:13 2011 +0100
[linux] Fix ethernet bug
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.38.config | 5 ++-
.../2.6.38/281-apf27-armadeus-add_apf27.c.patch | 29 +++++++++++++++-----
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
index bfb707e..4b68c48 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38-rc3 Kernel Configuration
-# Mon Feb 7 09:38:43 2011
+# Mon Feb 7 17:10:57 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -250,6 +250,7 @@ CONFIG_ARCH_MXC=y
# CONFIG_GPIO_PCA953X is not set
# CONFIG_KEYBOARD_GPIO_POLLED is not set
CONFIG_IMX_HAVE_PLATFORM_FEC=y
+CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT=y
CONFIG_IMX_HAVE_PLATFORM_IMX_FB=y
CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
CONFIG_IMX_HAVE_PLATFORM_IMX_SSI=y
@@ -822,7 +823,7 @@ CONFIG_PHYLIB=y
# CONFIG_LXT_PHY is not set
# CONFIG_CICADA_PHY is not set
# CONFIG_VITESSE_PHY is not set
-# CONFIG_SMSC_PHY is not set
+CONFIG_SMSC_PHY=y
# CONFIG_BROADCOM_PHY is not set
# CONFIG_BCM63XX_PHY is not set
# CONFIG_ICPLUS_PHY is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
index 3a3dd84..3622735 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
@@ -2,6 +2,7 @@
Adds support for Armadeus Systems APF27 module (i.MX27 based), APF27Dev
companion baseboard and APW extension board.
+Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Eric Jarrige <eri...@ar...>
@@ -9,8 +10,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c 2011-02-07 10:38:08.000000000 +0100
-@@ -0,0 +1,731 @@
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c 2011-02-07 17:09:41.000000000 +0100
+@@ -0,0 +1,745 @@
+ /*
+ * apf27.c
+ *
@@ -51,6 +52,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+#include <linux/usb/otg.h>
+#include <linux/usb/ulpi.h>
+#include <linux/fsl_devices.h>
++#include <linux/phy.h>
+
+#include <asm/mach/flash.h>
+#include <asm/io.h>
@@ -146,6 +148,18 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ PC6_PF_I2C2_SCL,
+};
+
++int lan8700_wakeup(struct phy_device *phydev)
++{
++#define LAN87xx_SPECIAL_REG 0x12
++
++ int rc = phy_read(phydev, LAN87xx_SPECIAL_REG);
++
++ phy_write(phydev,LAN87xx_SPECIAL_REG, rc | 0xE0);
++ phy_write(phydev,MII_BMCR, BMCR_RESET);
++ udelay(1000);
++ return 0;
++}
++
+#ifdef CONFIG_PWM
+static int mxc_pwm0_pins[] = {
+ PE5_PF_PWM0
@@ -657,7 +671,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+};
+#endif /* CONFIG_MACH_APF27_FPGA */
+
-+
+static void __init apf27_init(void)
+{
+ int ret;
@@ -679,6 +692,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+
+ /* APF27 has an onboard Ethernet PHY */
+#ifdef CONFIG_FEC
++ /* bring lan8700 out of power down mode */
++ phy_register_fixup_for_id("1:1f", lan8700_wakeup );
+ imx27_add_fec(NULL);
+#endif
+
@@ -745,7 +760,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c 2011-02-07 10:56:14.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c 2011-02-07 16:56:02.000000000 +0100
@@ -0,0 +1,935 @@
+ /*
+ * apf27-dev.c
@@ -1685,7 +1700,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c 2011-02-07 11:03:53.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c 2011-02-07 16:56:02.000000000 +0100
@@ -0,0 +1,226 @@
+/*
+ * apf27-lcd.c
@@ -1916,7 +1931,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-02-07 09:30:21.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-02-07 16:56:02.000000000 +0100
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -2111,7 +2126,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-07 11:22:19.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-07 17:05:16.000000000 +0100
@@ -83,6 +83,7 @@
case MACH_TYPE_MX21ADS:
case MACH_TYPE_PCA100:
hooks/post-receive
--
armadeus
|
