[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-61-g2dc6fac
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-61-g2dc6fac
|
From: Julien B a. A. <ar...@us...> - 2014-01-22 17:43:37
|
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 2dc6fac22b57d52319028543dd6a3d78dc189bd3 (commit)
via 2c8f3fe85696dd408ef33ca5776415c6ab690d0a (commit)
from b2079cb56ca5694f164c7251493102cd09dd081a (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 2dc6fac22b57d52319028543dd6a3d78dc189bd3
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 22 18:42:48 2014 +0100
[BUILD] Updates buildroot/package/.gitignore for BR 2013.11+
commit 2c8f3fe85696dd408ef33ca5776415c6ab690d0a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 22 18:37:48 2014 +0100
[LINUX] 2.6.29: apf27dev: add support for MT9M111 & OV7670 derived camera modules
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 2 +
.../armadeus/apf27/apf27-linux-2.6.29.config | 4 +-
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 58 ++++++++++++++------
3 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index ea0c3b5..c56aec0 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -7,6 +7,8 @@
/Makefile.package.in
/Makefile.in
/buildroot-libtool*.patch
+/Config.in.host
+/pkg-*.mk
# except:
!/armadeus/
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 983338f..7e6d04b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Wed Sep 19 15:58:55 2012
+# Mon Jan 20 10:01:18 2014
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1114,7 +1114,7 @@ CONFIG_VIDEO_VIVI=m
# CONFIG_VIDEO_SAA5249 is not set
CONFIG_SOC_CAMERA=m
# CONFIG_SOC_CAMERA_MT9M001 is not set
-# CONFIG_SOC_CAMERA_MT9M111 is not set
+CONFIG_SOC_CAMERA_MT9M111=m
# CONFIG_SOC_CAMERA_MT9T031 is not set
# CONFIG_SOC_CAMERA_MT9V022 is not set
# CONFIG_SOC_CAMERA_TW9910 is not set
diff --git a/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index be2112a..87aa189 100644
--- a/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/patches/linux/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2012-01-26 10:40:27.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2014-01-22 16:39:52.328884634 +0100
@@ -0,0 +1,739 @@
+ /*
+ * apf27.c
@@ -753,8 +753,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2012-01-26 10:53:41.000000000 +0100
-@@ -0,0 +1,1152 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2014-01-22 17:48:57.000000000 +0100
+@@ -0,0 +1,1178 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -865,9 +865,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_VIDEO_MX27_MODULE
+#define CONFIG_VIDEO_MX27 1
+#endif
-+#ifdef CONFIG_SOC_CAMERA_OV96XX_MODULE
-+#define CONFIG_SOC_CAMERA_OV96XX 1
-+#endif
+#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
+#define CONFIG_PWM
+#endif
@@ -950,9 +947,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+
+/* I2C1 devices: RTC & Optionnal Camera */
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
+static struct soc_camera_link ov96xx_iclink; /* declared later */
-+#endif
++static struct soc_camera_link mt9m111_iclink; /* declared later */
++static struct soc_camera_link ov7670_iclink; /* declared later */
++
+static struct i2c_board_info apf27dev_i2c_devices_bus0[] = {
+ [0] = {
+ /* APF27Dev has an RTC */
@@ -962,15 +960,21 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .platform_data = NULL,
+ .irq = 0
+ },
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
+ [1] = {
+ .type = "ov96xx",
-+ .flags = 0, /* FIXME */
+ .addr = 0x30,
+ .platform_data = &ov96xx_iclink,
-+ .irq = 0
+ },
-+# endif
++ [2] = {
++ .type = "mt9m111",
++ .addr = 0x5d,
++ .platform_data = &mt9m111_iclink,
++ },
++ [3] = {
++ .type = "ov7670",
++ .addr = 0x21,
++ .platform_data = &ov7670_iclink,
++ },
+};
+
+
@@ -1751,7 +1755,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ MX27_CAMERA_SWAP16,
+};
+
-+# ifdef CONFIG_SOC_CAMERA_OV96XX
+static int ov96xx_power(struct device *dev, int state)
+{
+ printk(KERN_DEBUG "*** %s %d (not implemented)\n", __func__, state);
@@ -1763,7 +1766,30 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .bus_id = 0,
+ .power = ov96xx_power,
+};
-+# endif
++
++static int mt9m111_power(struct device *dev, int state)
++{
++ printk(KERN_DEBUG "*** %s %d (not implemented)\n", __func__, state);
++
++ return 0;
++}
++
++static struct soc_camera_link mt9m111_iclink = {
++ .bus_id = 0,
++ .power = mt9m111_power,
++};
++
++static int ov7670_power(struct device *dev, int state)
++{
++ printk(KERN_DEBUG "*** %s %d (not implemented)\n", __func__, state);
++
++ return 0;
++}
++
++static struct soc_camera_link ov7670_iclink = {
++ .bus_id = 0,
++ .power = ov7670_power,
++};
+
+#endif /* CONFIG_VIDEO_MX27 */
+
@@ -1910,7 +1936,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2012-01-26 10:40:27.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2014-01-22 16:39:52.332884647 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -2135,7 +2161,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2012-01-26 10:40:27.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2014-01-22 16:39:52.332884647 +0100
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
hooks/post-receive
--
armadeus
|
