[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-141-g06e4e86
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-141-g06e4e86
|
From: Julien B a. A. <ar...@us...> - 2010-11-25 21:55:01
|
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 06e4e863ed918a4a0e042f8c7d57b148501d55e1 (commit)
via d5ea2327c9cffb100593ca3d5c791944b7ee2849 (commit)
via a4dda0c609397dc9cd04298f5f7376dbbe968b02 (commit)
from 61c0653029aa4b195049c5e570bc16a8c84ff56e (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 06e4e863ed918a4a0e042f8c7d57b148501d55e1
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 22:53:38 2010 +0100
[LINUX] 2.6.36: Activates Ethernet on APF27
commit d5ea2327c9cffb100593ca3d5c791944b7ee2849
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 20:44:50 2010 +0100
[LINUX] 2.6.36: import patches 322 & 323 from 2.6.29
commit a4dda0c609397dc9cd04298f5f7376dbbe968b02
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 20:10:35 2010 +0100
[LINUX] rename 337b-armadeus-imxfb-add_backlight_power_switch_capability.patch to 337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.36.config | 27 +++++++++++++++++--
...fb-add_backlight_power_switch_capability.patch} | 5 +++
.../2.6.36/281-apf27-armadeus-add_apf27.c.patch | 25 ++++++++++--------
.../322-apf27-armadeus-add_mach_fpga_h.patch | 4 +-
...apf27-armadeus-increases_board_irq_number.patch | 17 ++++++++++++
5 files changed, 62 insertions(+), 16 deletions(-)
rename buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/{337b-armadeus-imxfb-add_backlight_power_switch_capability.patch => 337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch} (90%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/322-apf27-armadeus-add_mach_fpga_h.patch (91%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/323-apf27-armadeus-increases_board_irq_number.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
index 9832c7b..83916f6 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36
-# Thu Nov 25 15:52:57 2010
+# Thu Nov 25 20:52:40 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -751,7 +751,27 @@ CONFIG_NETDEVICES=y
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# 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_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
# CONFIG_MII is not set
# CONFIG_AX88796 is not set
@@ -772,7 +792,8 @@ CONFIG_NET_ETHERNET=y
# CONFIG_B44 is not set
# CONFIG_KS8851 is not set
# CONFIG_KS8851_MLL is not set
-# CONFIG_FEC is not set
+CONFIG_FEC=y
+# CONFIG_FEC2 is not set
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_WLAN=y
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch
similarity index 90%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch
index 788d321..d393756 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch
@@ -1,3 +1,8 @@
+Add the capability to Freescale MX2 framebuffer to power on/off LCD's
+backlight.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/imx_fb.h
===================================================================
--- linux-2.6.29.6.orig/arch/arm/plat-mxc/include/mach/imx_fb.h 2010-01-27 18:50:48.000000000 +0100
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch
index c435dbe..73b576e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch
@@ -9,8 +9,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27.c 2010-11-09 10:13:43.000000000 +0100
-@@ -0,0 +1,802 @@
++++ linux-2.6.36/arch/arm/mach-imx/apf27.c 2010-11-25 20:54:01.000000000 +0100
+@@ -0,0 +1,805 @@
+ /*
+ * apf27.c
+ *
@@ -220,7 +220,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+
+
+/* APF27 has an onboard Ethernet PHY */
-+#ifdef CONFIG_FEC_OLD
++#ifdef CONFIG_FEC
+static int mxc_fec_pins[] = {
+ PD0_AIN_FEC_TXD0,
+ PD1_AIN_FEC_TXD1,
@@ -236,7 +236,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ PD11_AOUT_FEC_TX_CLK,
+ PD12_AOUT_FEC_RXD0,
+ PD13_AOUT_FEC_RX_DV,
-+ PD14_AOUT_FEC_CLR,
++ PD14_AOUT_FEC_RX_CLK,
+ PD15_AOUT_FEC_COL,
+ PD16_AIN_FEC_TX_ER,
+ PF23_AIN_FEC_TX_EN
@@ -246,7 +246,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+{
+ mxc_gpio_setup_multiple_pins(mxc_fec_pins, ARRAY_SIZE(mxc_fec_pins), "FEC");
+}
-+#endif /* CONFIG_FEC_OLD */
++#endif /* CONFIG_FEC */
+
+#if 0
+/* APF27 has an onboard PHY (ISP1504) on OTG USB port */
@@ -554,6 +554,9 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+#ifdef CONFIG_MXC_VPU
+ &mxc_vpu_device,
+#endif
++#ifdef CONFIG_FEC
++ &mxc_fec_device,
++#endif
+};
+
+
@@ -747,7 +750,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ /* Init APF27 power management related pins */
+ apf27_pwr_ctl_active();
+
-+#ifdef CONFIG_FEC_OLD
++#ifdef CONFIG_FEC
+ gpio_fec_active();
+#endif
+ /* UART1 and UART3 have "on module" transceivers */
@@ -816,7 +819,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27-dev.c 2010-11-08 16:15:38.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-imx/apf27-dev.c 2010-11-25 19:29:57.000000000 +0100
@@ -0,0 +1,1155 @@
+ /*
+ * apf27-dev.c
@@ -1976,7 +1979,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
Index: linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c 2010-11-08 16:17:07.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c 2010-11-25 19:29:57.000000000 +0100
@@ -0,0 +1,222 @@
+/*
+ * apf27-lcd.c
@@ -2203,7 +2206,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c
Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c 2010-11-07 19:07:30.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c 2010-11-25 19:29:57.000000000 +0100
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -2397,8 +2400,8 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c
+
Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-08 15:21:56.000000000 +0100
-+++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-08 15:22:22.000000000 +0100
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-25 20:58:31.000000000 +0100
@@ -81,6 +81,7 @@
case MACH_TYPE_MX21ADS:
case MACH_TYPE_PCA100:
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/322-apf27-armadeus-add_mach_fpga_h.patch
similarity index 91%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/322-apf27-armadeus-add_mach_fpga_h.patch
index 1e129a6..b6f4507 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/322-apf27-armadeus-add_mach_fpga_h.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.29.4/arch/arm/plat-mxc/include/mach/fpga.h
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/plat-mxc/include/mach/fpga.h 2009-06-08 17:40:21.000000000 +0200
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/fpga.h 2010-11-25 20:23:44.000000000 +0100
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2009 Armadeus Systems
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/323-apf27-armadeus-increases_board_irq_number.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/323-apf27-armadeus-increases_board_irq_number.patch
new file mode 100644
index 0000000..99995aa
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/323-apf27-armadeus-increases_board_irq_number.patch
@@ -0,0 +1,17 @@
+Increases board reserved interrupts to 32. This is needed for the APF27 FPGA.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/irqs.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/irqs.h 2010-11-25 20:27:40.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/irqs.h 2010-11-25 20:28:54.000000000 +0100
+@@ -47,6 +47,8 @@
+
+ #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
+ #define MXC_BOARD_IRQS 80
++#elif defined CONFIG_MACH_APF27
++#define MXC_BOARD_IRQS 32
+ #else
+ #define MXC_BOARD_IRQS 16
+ #endif
hooks/post-receive
--
armadeus
|
