[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-20-g38d1593
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-20-g38d1593
|
From: Julien B a. A. <ar...@us...> - 2009-07-17 09:32:44
|
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 38d15936f3517c556f2c20dcb55917ee098f28ea (commit)
via eef32b6bb9e35936772569db46bde2aefd4cfa84 (commit)
via a7d37ae8a25442d5135f00edfdeb3029f1fca467 (commit)
from 801075b691083b3e53cb7331aab0a11aec634a04 (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 38d15936f3517c556f2c20dcb55917ee098f28ea
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 17 11:31:53 2009 +0200
[LINUX] Updates APF27 default Linux configs according to new LCD support
commit eef32b6bb9e35936772569db46bde2aefd4cfa84
Merge: a7d37ae8a25442d5135f00edfdeb3029f1fca467 801075b691083b3e53cb7331aab0a11aec634a04
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 17 11:30:24 2009 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus
commit a7d37ae8a25442d5135f00edfdeb3029f1fca467
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 17 11:28:33 2009 +0200
[LINUX] On APF9328 configure console port without RTS/CTS
-----------------------------------------------------------------------
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/021-armadeus-apf9328.patch | 27 +++++++++----------
3 files changed, 17 insertions(+), 16 deletions(-)
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 46efbe2..fa5791a 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
-# Wed Jul 1 11:16:12 2009
+# Fri Jul 17 11:06:54 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1128,6 +1128,7 @@ CONFIG_FB_IMX_SHARP_LQ043_TFT=y
# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
# 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_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 98f717a..7f66790 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
-# Wed Jul 1 11:16:12 2009
+# Fri Jul 17 11:06:54 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1128,6 +1128,7 @@ CONFIG_FB_IMX_SHARP_LQ043_TFT=y
# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
# 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_MXC=y
#
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
index 543641a..df3fc35 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
@@ -4,8 +4,8 @@ DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/apf9328.c 2009-06-08 19:07:17.000000000 +0200
-@@ -0,0 +1,849 @@
++++ linux-2.6.29.4/arch/arm/mach-imx/apf9328.c 2009-07-15 17:16:18.000000000 +0200
+@@ -0,0 +1,848 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
+ *
@@ -338,8 +338,8 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+
+
+/* --- SERIAL RESSOURCE --- */
-+static struct imxuart_platform_data uart_pdata = {
-+ .flags = IMXUART_HAVE_RTSCTS,
++static struct imxuart_platform_data uart1_pdata = {
++ .flags = 0,
+};
+
+static struct resource imx_uart1_resources[] = {
@@ -358,11 +358,6 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .end = (UART1_MINT_TX),
+ .flags = IORESOURCE_IRQ,
+ },
-+ [3] = { /* Mandatory (even if RTS is not used), otherwise drivers/serial/imx.c fails to allocate IRQs */
-+ .start = UART1_MINT_RTS,
-+ .end = UART1_MINT_RTS,
-+ .flags = IORESOURCE_IRQ,
-+ },
+};
+
+static struct platform_device imx_uart1_device = {
@@ -371,10 +366,14 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .num_resources = ARRAY_SIZE(imx_uart1_resources),
+ .resource = imx_uart1_resources,
+ .dev = {
-+ .platform_data = &uart_pdata,
++ .platform_data = &uart1_pdata,
+ }
+};
+
++static struct imxuart_platform_data uart2_pdata = {
++ .flags = IMXUART_HAVE_RTSCTS,
++};
++
+static struct resource imx_uart2_resources[] = {
+ [0] = {
+ .start = 0x00207000,
@@ -391,7 +390,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .end = (UART2_MINT_TX),
+ .flags = IORESOURCE_IRQ,
+ },
-+ [3] = { /* Mandatory (even if RTS is not used), otherwise drivers/serial/imx.c fails to allocate IRQs */
++ [3] = {
+ .start = UART2_MINT_RTS,
+ .end = UART2_MINT_RTS,
+ .flags = IORESOURCE_IRQ,
@@ -404,7 +403,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .num_resources = ARRAY_SIZE(imx_uart2_resources),
+ .resource = imx_uart2_resources,
+ .dev = {
-+ .platform_data = &uart_pdata,
++ .platform_data = &uart2_pdata,
+ }
+};
+
@@ -858,7 +857,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h 2009-06-08 18:35:27.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h 2009-07-15 16:23:52.000000000 +0200
@@ -0,0 +1,301 @@
+/*
+ *
@@ -1164,7 +1163,7 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h
Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h 2009-06-08 18:35:27.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h 2009-07-15 16:23:52.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
hooks/post-receive
--
armadeus
|
