[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-60-g48e2dba
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2009-09-15 07:30:45
|
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 48e2dba05305ca23833f28a514f0ce716be93024 (commit)
via 286e1870ef8178fa72f207c51e8a357335e3fabe (commit)
via ee3e2d57f2e1c1fc28827add3f7ad5d34586632b (commit)
from bbdb624916d6c964be5b88b3d1d133fbe2800df5 (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 48e2dba05305ca23833f28a514f0ce716be93024
Merge: 286e1870ef8178fa72f207c51e8a357335e3fabe bbdb624916d6c964be5b88b3d1d133fbe2800df5
Author: Julien Boibessot <jul...@ar...>
Date: Tue Sep 15 09:29:56 2009 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 286e1870ef8178fa72f207c51e8a357335e3fabe
Author: Julien Boibessot <jul...@ar...>
Date: Tue Sep 15 09:27:02 2009 +0200
[BUILDROOT] Updates APF27 default Linux configs (for Optrex TFT)
commit ee3e2d57f2e1c1fc28827add3f7ad5d34586632b
Author: Julien Boibessot <jul...@ar...>
Date: Tue Sep 15 09:22:48 2009 +0200
[LINUX] Add Optrex T51638D084 TFT support (APF27 & Freescale framebuffer)
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/linux-2.6.29.4.config | 3 +-
.../armadeus/apf27/apf27-linux-2.6.29.config | 3 +-
.../2.6.29/023-armadeus-fblcd-kconfig.patch | 15 +++++++--
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 31 +++++++++++++------
...-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch | 6 ++--
...eus-add_Optrex-T51638D084_to_mxcfb_modedb.patch | 30 +++++++++++++++++++
6 files changed, 69 insertions(+), 19 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286c-apf27-armadeus-add_Optrex-T51638D084_to_mxcfb_modedb.patch
diff --git a/buildroot/local/apf27_test/linux-2.6.29.4.config b/buildroot/local/apf27_test/linux-2.6.29.4.config
index 88fb225..9c952fd 100644
--- a/buildroot/local/apf27_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf27_test/linux-2.6.29.4.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.4
-# Mon Sep 14 17:42:25 2009
+# Tue Sep 15 09:17:17 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1131,6 +1131,7 @@ CONFIG_FB_IMX_SHARP_LQ043_TFT=y
# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
CONFIG_FB_MXC=y
#
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 1d0b3ae..47befd6 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.4
-# Mon Sep 14 17:42:25 2009
+# Tue Sep 15 09:17:17 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1131,6 +1131,7 @@ CONFIG_FB_IMX_SHARP_LQ043_TFT=y
# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
CONFIG_FB_MXC=y
#
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
index f00aecd..9b42276 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.29.4/drivers/video/Kconfig
===================================================================
---- linux-2.6.29.4.orig/drivers/video/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/drivers/video/Kconfig 2009-06-04 10:03:43.000000000 +0200
+--- linux-2.6.29.4.orig/drivers/video/Kconfig 2009-09-14 18:39:16.000000000 +0200
++++ linux-2.6.29.4/drivers/video/Kconfig 2009-09-14 18:49:16.000000000 +0200
@@ -395,6 +395,7 @@
If you plan to use the LCD display with your SA-1100 system, say
Y here.
@@ -10,7 +10,7 @@ Index: linux-2.6.29.4/drivers/video/Kconfig
config FB_IMX
tristate "Motorola i.MX LCD support"
depends on FB && ARM && ARCH_IMX
-@@ -402,6 +403,48 @@
+@@ -402,6 +403,55 @@
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -50,10 +50,17 @@ Index: linux-2.6.29.4/drivers/video/Kconfig
+ The native resolution is 240x320.
+
+config FB_IMX_CHIMEI_LW700AT9003_TFT
-+ bool "LW700AT9003"
++ bool "Chimei LW700AT9003"
+ help
+ Chimei LW700AT9003, a 7" 18 bits, TFT panel.
+ The native resolution is 800x600.
++
++config FB_IMX_OPTREX_T51638D084_TFT
++ bool "Optrex T51638D084"
++ help
++ OPTREX_T51638D084, a 8.4" 18 bits, TFT panel.
++ The native resolution is 640x480.
++
+endchoice
+
config FB_CYBER2000
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index a567a7d..31cd72a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,8 +9,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-14 15:49:14.000000000 +0200
-@@ -0,0 +1,1263 @@
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27.c 2009-09-14 18:57:53.000000000 +0200
+@@ -0,0 +1,1274 @@
+ /*
+ * apf27.c
+ *
@@ -353,18 +353,23 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ PA23_PF_LD17,
+ PA24_PF_REV,
+ PA25_PF_CLS,
++#ifdef CONFIG_FB_IMX_OPTREX_T51638D084_TFT
++ /* For Optrex T51638D084, PS is used as LCD Display ON/OFF */
++ (GPIO_PORTA | 26 | GPIO_OUT| GPIO_GPIO),
++#else
+ PA26_PF_PS,
++#endif
+ PA27_PF_SPL_SPR,
+ PA28_PF_HSYNC,
+ PA29_PF_VSYNC,
+#ifdef CONFIG_FB_IMX_SHARP_LQ057_TFT
-+ /* for LQO57 CONTRAST is used as backlight's ON/OFF */
++ /* For Sharp LQO57, CONTRAST is used as backlight's ON/OFF */
+ (GPIO_PORTA | 30 | GPIO_OUT| GPIO_GPIO),
+#else
+ PA30_PF_CONTRAST,
+#endif
+#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
-+ /* For LQ043 OE_ACD is used as LCD Display ON/OFF */
++ /* For Sharp LQ043, OE_ACD is used as LCD Display ON/OFF */
+ (GPIO_PORTA | 31 | GPIO_OUT| GPIO_GPIO)
+#else
+ PA31_PF_OE_ACD
@@ -374,12 +379,16 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+static int apf27_fb_init(struct platform_device *pdev)
+{
+#ifdef CONFIG_FB_MXC
++# ifdef CONFIG_FB_IMX_OPTREX_T51638D084_TFT
++ /* For Optrex T51638D084: activates LCD at startup */
++ gpio_set_value(GPIO_PORTA | 26, 1);
++# endif
+# ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
-+ /* For LQ043 OE_ACD is used as LCD Display ON/OFF: activate LCD */
++ /* For Sharp LQ043: activates LCD at startup */
+ gpio_set_value(GPIO_PORTA | 31, 1);
+# endif
+# ifdef CONFIG_FB_IMX_SHARP_LQ057_TFT
-+ /* For LQ057: activate backlight at startup */
++ /* For Sharp LQ057: activates backlight at startup */
+ gpio_set_value(GPIO_PORTA | 30, 0);
+# endif
+#endif
@@ -401,8 +410,10 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
+ .mode = "Sharp-LQ043",
+# elif CONFIG_FB_IMX_SHARP_LQ057_TFT
+ .mode = "Sharp-LQ057",
-+#elif CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT
-+ .mode = "LW700AT9003",
++# elif CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT
++ .mode = "Chimei-LW700AT9003",
++# elif CONFIG_FB_IMX_OPTREX_T51638D084_TFT
++ .mode = "Optrex-T51638D084",
+# endif
+ .init = apf27_fb_init,
+ .exit = apf27_fb_exit,
@@ -1277,7 +1288,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-14 15:05:12.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c 2009-09-14 18:50:02.000000000 +0200
@@ -0,0 +1,576 @@
+ /*
+ * apf27-dev.c
@@ -1718,7 +1729,7 @@ Index: linux-2.6.29.4/arch/arm/mach-mx2/apf27-dev.c
+ .max_speed_hz = 8000000,
+ .bus_num = 0, /* SPI1 */
+ .irq = IRQ_GPIOE(MAX1027_EOC_INT),
-+ .chip_select = 0,
++ .chip_select = 0, /* SS0 */
+ .mode = 0,
+ .platform_data = &apf27_max1027_config,
+ },
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
index e256f83..b2806e2 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286b-apf27-armadeus-add_LW700AT9003_to_mxcfb_modedb.patch
@@ -1,13 +1,13 @@
Index: linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c
===================================================================
---- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c 2009-08-24 12:17:54.000000000 +0200
-+++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c 2009-08-24 12:27:52.000000000 +0200
+--- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c 2009-09-14 18:58:12.000000000 +0200
++++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c 2009-09-14 18:58:53.000000000 +0200
@@ -101,6 +101,19 @@
.vmode = FB_VMODE_NONINTERLACED,
.flag = 0,
},
+ [7] = {
-+ .name = "LW700AT9003",
++ .name = "Chimei-LW700AT9003",
+ .refresh = 60,
+ .xres = 800,
+ .yres = 480,
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286c-apf27-armadeus-add_Optrex-T51638D084_to_mxcfb_modedb.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286c-apf27-armadeus-add_Optrex-T51638D084_to_mxcfb_modedb.patch
new file mode 100644
index 0000000..62732ab
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/286c-apf27-armadeus-add_Optrex-T51638D084_to_mxcfb_modedb.patch
@@ -0,0 +1,30 @@
+
+Adds Optrex-T51638D084 support to Freescale's MX2 Framebuffer.
+Depends on some previously applied patches.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/mxc/mxcfb_modedb.c 2009-09-14 18:28:22.000000000 +0200
++++ linux-2.6.29.4/drivers/video/mxc/mxcfb_modedb.c 2009-09-14 18:29:26.000000000 +0200
+@@ -114,6 +114,19 @@
+ .vmode = FB_VMODE_NONINTERLACED,
+ .flag = 0,
+ },
++ [8] = {
++ .name = "Optrex-T51638D084",
++ .refresh = 60,
++ .xres = 640,
++ .yres = 480,
++ .pixclock = 40000, /* picoS */
++ .left_margin = 48, .right_margin = 144, /* at least 3 & 1 */
++ .upper_margin = 10, .lower_margin = 35,
++ .hsync_len = 64, .vsync_len = 2,
++ .sync = FB_SYNC_CLK_IDLE_EN | FB_SYNC_OE_ACT_HIGH | FB_SYNC_CLK_INVERT,
++ .vmode = FB_VMODE_NONINTERLACED,
++ .flag = 0,
++ },
+ };
+
+ int mxcfb_modedb_sz = ARRAY_SIZE(mxcfb_modedb);
hooks/post-receive
--
armadeus
|