[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-36-g566b354
Brought to you by:
sszy
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-11-01 16:53:42
|
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 566b3542515c08338e6eb8f772faa2b12d327710 (commit)
via dfe4dae5cd8342f72d333755967abadbdccd1419 (commit)
via 0244b43f8a2cd6b3a1b17b5089bf575d7f3d16d6 (commit)
from 73568040163a18dfd048d56438eda2f4c16fefda (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 566b3542515c08338e6eb8f772faa2b12d327710
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Thu Nov 1 17:51:34 2012 +0100
[LINUX][3.7-rc3] APF28: adapt patches 0403, 0418, 0419 from 3.6
commit dfe4dae5cd8342f72d333755967abadbdccd1419
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Thu Nov 1 17:50:41 2012 +0100
[LINUX][3.7-rc3] APF28: import patch 0419
commit 0244b43f8a2cd6b3a1b17b5089bf575d7f3d16d6
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Thu Nov 1 17:49:56 2012 +0100
[LINUX] APF28: Add 3.7-rc3 kernel config file
-----------------------------------------------------------------------
Summary of changes:
...linux-3.6.config => apf28-linux-3.7-rc3.config} | 2 -
...f28-linux-3.6.config => apf28-linux-3.7.config} | 2 -
.../0403-armadeus-Add-apf28-support-dts.patch | 79 +++++++++-----------
...rmadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch | 25 ++++++
...eus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch | 8 +-
.../0420-armadeus-Add-apf28dev-dts.patch | 41 ++++++-----
6 files changed, 85 insertions(+), 72 deletions(-)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.6.config => apf28-linux-3.7-rc3.config} (98%)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.6.config => apf28-linux-3.7.config} (98%)
copy patches/linux/{3.6 => 3.7}/0403-armadeus-Add-apf28-support-dts.patch (66%)
create mode 100644 patches/linux/3.7/0418-armadeus-mx28-Add-pwm-pinmux-to-imx28-dtsi.patch
copy patches/linux/{3.6 => 3.7}/0419-armadeus-mx28-Add-lcdif16-pinmux-to-imx28-dtsi.patch (82%)
copy patches/linux/{3.6 => 3.7}/0420-armadeus-Add-apf28dev-dts.patch (84%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config
index edb8bee..0044f03 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7-rc3.config
@@ -19,7 +19,6 @@ CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MXS=y
CONFIG_MACH_MXS_DT=y
-CONFIG_MACH_MX28EVK=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
@@ -106,7 +105,6 @@ CONFIG_HWMON=m
CONFIG_WATCHDOG=y
CONFIG_MEDIA_SUPPORT=m
CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_VIDEO_VIVI=m
CONFIG_FB=y
CONFIG_FB_MXS=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
index edb8bee..0044f03 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.7.config
@@ -19,7 +19,6 @@ CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MXS=y
CONFIG_MACH_MXS_DT=y
-CONFIG_MACH_MX28EVK=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
@@ -106,7 +105,6 @@ CONFIG_HWMON=m
CONFIG_WATCHDOG=y
CONFIG_MEDIA_SUPPORT=m
CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_VIDEO_VIVI=m
CONFIG_FB=y
CONFIG_FB_MXS=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch b/patches/linux/3.7/0403-armadeus-Add-apf28-support-dts.patch
similarity index 66%
copy from patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
copy to patches/linux/3.7/0403-armadeus-Add-apf28-support-dts.patch
index 2a5614a..5d6d904 100644
--- a/patches/linux/3.6/0403-armadeus-Add-apf28-support-dts.patch
+++ b/patches/linux/3.7/0403-armadeus-Add-apf28-support-dts.patch
@@ -4,11 +4,23 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28.dts
+Index: linux-3.7-rc3/arch/arm/boot/dts/Makefile
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.6-rc6/arch/arm/boot/dts/imx28-apf28.dts 2012-09-24 17:38:15.000000000 +0200
-@@ -0,0 +1,79 @@
+--- linux-3.7-rc3.orig/arch/arm/boot/dts/Makefile
++++ linux-3.7-rc3/arch/arm/boot/dts/Makefile
+@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.
+ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
+ imx23-olinuxino.dtb \
+ imx23-stmp378x_devb.dtb \
++ imx28-apf28.dtb \
+ imx28-apx4devkit.dtb \
+ imx28-cfa10036.dtb \
+ imx28-cfa10049.dtb \
+Index: linux-3.7-rc3/arch/arm/boot/dts/imx2 |