[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-50-gc0c27c0
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-50-gc0c27c0
|
From: Julien B a. A. <ar...@us...> - 2009-12-14 17:38:23
|
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 c0c27c03b7ea3b30d4aec6283a1b495569e6a593 (commit)
via d43a4cac21dc164b0465779cd7200a7803831a86 (commit)
via 531b23851188098515720ed20c32c534b735cddc (commit)
from 3222c687ac1d8372a978d2d4cf91e988dc07cedd (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 c0c27c03b7ea3b30d4aec6283a1b495569e6a593
Merge: d43a4cac21dc164b0465779cd7200a7803831a86 3222c687ac1d8372a978d2d4cf91e988dc07cedd
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 14 18:37:39 2009 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d43a4cac21dc164b0465779cd7200a7803831a86
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 14 18:31:09 2009 +0100
[BUILDROOT] Updates APF27 Linux default configs for wireless extension
commit 531b23851188098515720ed20c32c534b735cddc
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 14 17:50:06 2009 +0100
[LINUX] Move APF27Dev extension board support in a separate file. Ease UART selection for APF27 while we are at it.
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/linux-2.6.29.4.config | 13 ++-
.../armadeus/apf27/apf27-linux-2.6.29.config | 9 +-
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 172 +++++++++++++++-----
...-apf27-armadeus-add_apf27_to_build_system.patch | 63 +++++++-
.../2.6.29/339-apf27-armadeus-spidev.patch | 24 ++--
...ial-add_uart_modules_selection_in_kconfig.patch | 53 ++++++
...us-serial-uart4_not_available_on_apf27dev.patch | 13 ++
7 files changed, 288 insertions(+), 59 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.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 70a8d91..bfe8814 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.6
-# Mon Dec 7 11:18:48 2009
+# Mon Dec 14 18:25:57 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -191,6 +191,12 @@ CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_PCM970_BASEBOARD is not set
CONFIG_MACH_APF27_DEV=y
+CONFIG_MACH_APF27_DEV_EXT=y
+# CONFIG_MACH_APF27_DEV_EXT_NONE is not set
+CONFIG_MACH_APF27_DEV_EXT_WIRELESS=y
+CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM=y
+CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI=y
+CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_ULPI=y
@@ -814,6 +820,11 @@ CONFIG_DEVKMEM=y
#
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_UART1=y
+CONFIG_SERIAL_IMX_UART2=y
+CONFIG_SERIAL_IMX_UART3=y
+CONFIG_SERIAL_IMX_UART5=y
+CONFIG_SERIAL_IMX_UART6=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=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 2548908..43433c6 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
-# Mon Dec 7 11:18:48 2009
+# Mon Dec 14 17:52:14 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -191,6 +191,8 @@ CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_PCM970_BASEBOARD is not set
CONFIG_MACH_APF27_DEV=y
+CONFIG_MACH_APF27_DEV_EXT_NONE=y
+# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_ULPI=y
@@ -814,6 +816,11 @@ CONFIG_DEVKMEM=y
#
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_UART1=y
+# CONFIG_SERIAL_IMX_UART2 is not set
+CONFIG_SERIAL_IMX_UART3=y
+# CONFIG_SERIAL_IMX_UART5 is not set
+# CONFIG_SERIAL_IMX_UART6 is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
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 a470202..87783ae 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
@@ -1,6 +1,6 @@
-Adds support for Armadeus Systems APF27 module (i.MX27 based) and
-APF27Dev companion baseboard.
+Adds support for Armadeus Systems APF27 module (i.MX27 based), APF27Dev
+companion baseboard and APW extension board.
Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
@@ -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 2009-11-13 23:22:19.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2009-12-14 10:35:40.000000000 +0100
@@ -0,0 +1,737 @@
+ /*
+ * apf27.c
@@ -751,8 +751,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 2009-11-15 19:50:35.000000000 +0100
-@@ -0,0 +1,978 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-14 16:29:06.000000000 +0100
+@@ -0,0 +1,970 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -836,6 +836,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_FB_MXC
+extern void apf27_lcd_init(void);
+#endif
++#ifdef CONFIG_MACH_APF27_DEV_EXT
++extern void apf27dev_extension_init(void);
++#endif
+
+#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
+#define CONFIG_ARMADEUS_MAX1027 1
@@ -862,9 +865,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#define CONFIG_PWM
+#endif
+
-+//#define CONFIG_GPS
-+//#define CONFIG_GSM
-+
+
+#ifdef CONFIG_I2C
+
@@ -1004,23 +1004,19 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_I2C */
+
+
-+/* An optional GSM module can be added to APF27Dev (wireless extension board) */
-+#ifdef CONFIG_GSM
-+#define GSM_POK_IN (GPIO_PORTE | 11)
++/* UART2 signals are available on J8 connector (multiplexed with Keypad) */
++#ifdef CONFIG_SERIAL_IMX_UART2
+static int mxc_uart1_pins[] = {
+ PE3_PF_UART2_CTS,
+ PE4_PF_UART2_RTS,
+ PE6_PF_UART2_TXD,
+ PE7_PF_UART2_RXD,
-+ (GSM_POK_IN | GPIO_OUT | GPIO_GPIO) /* GSM_PWR_ON_not */
+};
+
+static int uart_mxc_port1_init(struct platform_device *pdev)
+{
-+ int res = mxc_gpio_setup_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart1_pins), "UART1");
-+ gpio_set_value(GSM_POK_IN, 0); /* start GSM */
-+ mdelay(5000);
-+ gpio_set_value(GSM_POK_IN, 1); /* start GSM */
++ int res = mxc_gpio_setup_multiple_pins(mxc_uart1_pins,
++ ARRAY_SIZE(mxc_uart1_pins), "UART2");
+
+ return res;
+}
@@ -1037,25 +1033,21 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .exit = uart_mxc_port1_exit,
+ .flags = IMXUART_HAVE_RTSCTS,
+};
-+#endif /* CONFIG_GSM */
++#endif /* CONFIG_SERIAL_IMX_UART2 */
+
+
-+/* An optionnal GPS module can be added to APF27Dev (wireless extension board) */
-+#ifdef CONFIG_GPS
-+#define GPS_WAKEUP (GPIO_PORTB | 20)
-+#define GPS_TIMEPULSE (GPIO_PORTB | 21)
++/* UART5 signals are available on J9 connector (multiplexed with CSI) */
++#ifdef CONFIG_SERIAL_IMX_UART5
+
+static int mxc_uart4_pins[] = {
+ PB19_AF_UART5_RXD,
+ PB18_AF_UART5_TXD,
-+ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO),
-+ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO),
+};
+
+static int uart_mxc_port4_init(struct platform_device *pdev)
+{
-+ int res = mxc_gpio_setup_multiple_pins(mxc_uart4_pins, ARRAY_SIZE(mxc_uart4_pins), "UART4");
-+ gpio_set_value(GPS_WAKEUP, 1); /* start GPS */
++ int res = mxc_gpio_setup_multiple_pins(mxc_uart4_pins,
++ ARRAY_SIZE(mxc_uart4_pins), "UART5");
+
+ return res;
+}
@@ -1072,7 +1064,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .exit = uart_mxc_port4_exit,
+ .flags = 0,
+};
-+#endif /* CONFIG_GPS */
++#endif /* CONFIG_SERIAL_IMX_UART5 */
+
+
+/* Both APF27 SPI ports are used on APF27Dev */
@@ -1095,7 +1087,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static int gpio_spi0_active(struct platform_device *pdev)
+{
-+ return mxc_gpio_setup_multiple_pins(mxc_cspi0_pins, ARRAY_SIZE(mxc_cspi0_pins), "CSPI0");
++ return mxc_gpio_setup_multiple_pins(mxc_cspi0_pins,
++ ARRAY_SIZE(mxc_cspi0_pins), "CSPI0");
+}
+
+static int gpio_spi0_inactive(struct platform_device *pdev)
@@ -1106,7 +1099,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static int gpio_spi1_active(struct platform_device *pdev)
+{
-+ return mxc_gpio_setup_multiple_pins(mxc_cspi1_pins, ARRAY_SIZE(mxc_cspi1_pins), "CSPI1");
++ return mxc_gpio_setup_multiple_pins(mxc_cspi1_pins,
++ ARRAY_SIZE(mxc_cspi1_pins), "CSPI1");
+}
+
+static int gpio_spi1_inactive(struct platform_device *pdev)
@@ -1371,8 +1365,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_USB_EHCI_MXC */
+
+
-+#if defined(CONFIG_SND) || defined (CONFIG_SND_MODULE)
-+
+#if defined(CONFIG_SND_IMX_TSC2102) || defined(CONFIG_SND_IMX_TSC2102_MODULE)
+static struct imx_alsa_codec_config tsc2101_alsa_pdata;
+
@@ -1393,13 +1385,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .platform_data = &tsc2101_alsa_pdata,
+ }
+};
-+# define ALSA_SOUND &tsc2101_alsa_device,
-+# endif /* CONFIG_SND_IMX_TSC2102 || CONFIG_SND_IMX_TSC2102_MODULE */
-+
++# define ALSA_SOUND &tsc2101_alsa_device,
+#else
+# define ALSA_SOUND
-+#endif /* CONFIG_SND || CONFIG_SND_MODULE */
-+
++#endif /* CONFIG_SND_IMX_TSC2102 || CONFIG_SND_IMX_TSC2102_MODULE */
+
+static struct platform_device *platform_devices[] __initdata = {
+ ALSA_SOUND
@@ -1687,10 +1676,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+ apf27dev_pwr_ctrl_gpio_active();
+
-+#ifdef CONFIG_GSM
++#ifdef CONFIG_SERIAL_IMX_UART2
+ mxc_register_device(&mxc_uart_device1, &uart1_pdata);
+#endif
-+#ifdef CONFIG_GPS
++#ifdef CONFIG_SERIAL_IMX_UART5
+ mxc_register_device(&mxc_uart_device4, &uart4_pdata);
+#endif
+#ifdef CONFIG_USB_EHCI_MXC
@@ -1727,6 +1716,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_VIDEO_MX27
+ mxc_register_device(&mx27_camera_device, &apf27_camera);
+#endif
++#ifdef CONFIG_MACH_APF27_DEV_EXT
++ apf27dev_extension_init();
++#endif
+
+ printk("done\n");
+}
@@ -1734,7 +1726,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 2009-11-10 15:35:23.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2009-12-14 10:35:40.000000000 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -1956,3 +1948,107 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
+#endif
+}
+
+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 2009-12-14 16:34:11.000000000 +0100
+@@ -0,0 +1,99 @@
++ /*
++ * apf27-dev-ext-apw.c
++ * Support for AFP27Dev's wireless extension board.
++ *
++ * Copyright (C) 2009 Armadeus Systems
++ * Authors: Julien Boibessot <jul...@ar...>
++ * Nicolas Colombain <nic...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ */
++
++#include <linux/platform_device.h>
++#include <linux/delay.h>
++#include <mach/iomux-mx1-mx2.h>
++#include <mach/gpio.h>
++
++
++/* An optional GSM module can be added to wireless extension board */
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM
++#define GSM_POK_IN (GPIO_PORTE | 11)
++static int apw_gsm_pins[] = {
++ (GSM_POK_IN | GPIO_OUT | GPIO_GPIO) /* GSM_PWR_ON_not */
++};
++
++static int apw_gsm_init(void)
++{
++ int res = mxc_gpio_setup_multiple_pins(apw_gsm_pins,
++ ARRAY_SIZE(apw_gsm_pins), "GSM");
++ gpio_set_value(GSM_POK_IN, 0); /* start GSM */
++ mdelay(5000);
++ gpio_set_value(GSM_POK_IN, 1); /* start GSM */
++
++ return res;
++}
++#if 0
++static int apw_gsm_exit(void)
++{
++ mxc_gpio_release_multiple_pins(apw_gsm_pins, ARRAY_SIZE(apw_gsm_pins));
++
++ return 0;
++}
++#endif
++#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM */
++
++
++/* An optionnal GPS module can be added to wireless extension board */
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
++#define GPS_WAKEUP (GPIO_PORTB | 20)
++#define GPS_TIMEPULSE (GPIO_PORTB | 21)
++
++static int apw_gps_pins[] = {
++ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO),
++ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO),
++};
++
++static int apw_gps_init(void)
++{
++ int res = mxc_gpio_setup_multiple_pins(apw_gps_pins,
++ ARRAY_SIZE(apw_gps_pins), "GPS");
++ gpio_set_value(GPS_WAKEUP, 1); /* start GPS */
++
++ return res;
++}
++#if 0
++static int apw_gps_exit(void)
++{
++ mxc_gpio_release_multiple_pins(apw_gps_pins, ARRAY_SIZE(apw_gps_pins));
++
++ return 0;
++}
++#endif
++#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS */
++
++
++void __init apf27dev_extension_init(void)
++{
++ printk(" Registering APW ressources:");
++
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GSM
++ apw_gsm_init();
++#endif
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
++ apw_gps_init();
++#endif
++
++ printk("done\n");
++}
++
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/282-apf27-armadeus-add_apf27_to_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/282-apf27-armadeus-add_apf27_to_build_system.patch
index 06144e1..657f8a2 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/282-apf27-armadeus-add_apf27_to_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/282-apf27-armadeus-add_apf27_to_build_system.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/Kconfig 2009-10-11 15:50:49.000000000 +0200
-+++ linux-2.6.29.6/arch/arm/mach-mx2/Kconfig 2009-10-11 19:03:44.000000000 +0200
-@@ -10,6 +10,20 @@
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Kconfig 2009-12-14 16:45:52.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/Kconfig 2009-12-14 16:57:35.000000000 +0100
+@@ -10,6 +10,21 @@
comment "MX2 Platforms"
depends on ARCH_MX2
@@ -10,6 +10,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+ bool "Armadeus Systems APF27"
+ depends on MACH_MX27
+ select MXC_ULPI
++ select SERIAL_IMX_UART1
+ help
+ Include support for APF27 platform. This includes specific
+ configurations for the module and its peripherals.
@@ -23,7 +24,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
config MACH_MX27ADS
bool "MX27ADS platform"
depends on MACH_MX27
-@@ -26,15 +40,26 @@
+@@ -26,15 +41,73 @@
choice
prompt "Baseboard"
@@ -44,24 +45,72 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+ prompt "Armadeus Systems APF27Dev development board"
+ bool
+ depends on MACH_APF27
++ select SERIAL_IMX_UART3
+ help
+ This selects the APF27Dev as baseboard. You have to manually
+ activates the devices you want to use if you have the "Full"
+ version.
+
++endchoice
++
++config MACH_APF27_DEV_EXT
++ bool
++
++choice
++ prompt "Extension board"
++ depends on MACH_APF27_DEV
++ default MACH_APF27_DEV_EXT_NONE
++
++config MACH_APF27_DEV_EXT_NONE
++ prompt "No extension"
++ bool
++ help
++ No extension board connected to APF27Dev baseboard.
++
++config MACH_APF27_DEV_EXT_WIRELESS
++ prompt "Wireless (APW)"
++ bool
++ select MACH_APF27_DEV_EXT
++ help
++ Wireless extension board connected to APF27Dev baseboard.
++
endchoice
+
++config MACH_APF27_DEV_EXT_WIRELESS_GSM
++ bool "GSM/GPRS Modem"
++ depends on MACH_APF27_DEV_EXT_WIRELESS
++ select SERIAL_IMX_UART2
++ default y
++ help
++ Activates support for the GSM modem on the APW extension board.
++
++config MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++ bool "Bluetooth & WiFi module"
++ depends on MACH_APF27_DEV_EXT_WIRELESS
++ select SERIAL_IMX_UART5
++ help
++ Activates support for the Bluetooth+WiFi module on the APW extension
++ board.
++
++config MACH_APF27_DEV_EXT_WIRELESS_GPS
++ bool "GPS module"
++ depends on MACH_APF27_DEV_EXT_WIRELESS
++ select SERIAL_IMX_UART6
++ help
++ Activates support for the GPS module on the APW extension board.
++
Index: linux-2.6.29.6/arch/arm/mach-mx2/Makefile
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/Makefile 2009-10-11 15:50:49.000000000 +0200
-+++ linux-2.6.29.6/arch/arm/mach-mx2/Makefile 2009-10-11 19:04:39.000000000 +0200
-@@ -10,6 +10,9 @@
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Makefile 2009-12-14 16:45:51.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/Makefile 2009-12-14 16:54:50.000000000 +0100
+@@ -10,6 +10,10 @@
obj-$(CONFIG_MACH_MX27) += clock_imx27.o
obj-$(CONFIG_CPU_FREQ_IMX27) += cpufreq_imx27.o
+obj-$(CONFIG_MACH_APF27) += apf27.o
+obj-$(CONFIG_MACH_APF27_DEV) += apf27-dev.o
+obj-$(CONFIG_MACH_APF27_DEV) += apf27-lcd.o
++obj-$(CONFIG_MACH_APF27_DEV_EXT_WIRELESS) += apf27-dev-ext-apw.o
obj-$(CONFIG_MACH_MX27ADS) += mx27ads.o
obj-$(CONFIG_MACH_PCM038) += pcm038.o
obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
index b28a1db..49f5e29 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
@@ -6,8 +6,8 @@ Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-04 11:50:37.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-04 11:58:32.000000000 +0100
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-14 16:08:03.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-14 16:08:25.000000000 +0100
@@ -24,6 +24,7 @@
#include <linux/mtd/physmap.h>
#include <asm/mach/flash.h>
@@ -16,7 +16,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#include <linux/i2c.h>
#include <linux/serial.h>
#include <linux/delay.h>
-@@ -91,6 +92,9 @@
+@@ -94,6 +95,9 @@
#ifdef CONFIG_CAN_MCP251X_MODULE
#define CONFIG_CAN_MCP251X 1
#endif
@@ -26,7 +26,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#ifdef CONFIG_IMX_BACKLIGHT_MODULE
#define CONFIG_IMX_BACKLIGHT
#endif
-@@ -368,7 +372,7 @@
+@@ -362,7 +366,7 @@
};
static struct spi_imx_master imx_spi1_master_info = {
@@ -35,7 +35,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
.enable_dma = 0,
.init = gpio_spi1_active,
.exit = gpio_spi1_inactive,
-@@ -512,6 +516,38 @@
+@@ -506,6 +510,38 @@
};
#endif /* CONFIG_CAN_MCP251X */
@@ -74,7 +74,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
static struct spi_board_info spi_board_info[] __initdata = {
#ifdef CONFIG_ARMADEUS_MAX1027
-@@ -550,6 +586,18 @@
+@@ -544,6 +580,18 @@
.platform_data = &apf27_mcp251x_config,
},
#endif /* CONFIG_CAN_MCP251X */
@@ -85,7 +85,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .max_speed_hz = 8000000, /* 8MHz */
+ .bus_num = 1, /* SPI2 */
+ .mode = SPI_MODE_1,
-+ .chip_select = 2,
++ .chip_select = 2,
+ .platform_data = &apf27_spidev_config,
+ },
+#endif /* CONFIG_SPI_SPIDEV */
@@ -93,7 +93,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
};
-@@ -962,7 +1010,7 @@
+@@ -951,7 +999,7 @@
/* Reserve "fixed" GPIOs */
tsc2101_init_fixed_gpio();
#endif
@@ -104,8 +104,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
#endif
Index: linux-2.6.29.6/drivers/spi/spidev.c
===================================================================
---- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-04 12:03:08.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-04 12:04:43.000000000 +0100
+--- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-14 16:06:13.000000000 +0100
++++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-14 16:08:25.000000000 +0100
@@ -558,8 +558,9 @@
static int spidev_probe(struct spi_device *spi)
@@ -130,8 +130,8 @@ Index: linux-2.6.29.6/drivers/spi/spidev.c
if (status == 0)
Index: linux-2.6.29.6/include/linux/spi/spidev.h
===================================================================
---- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-04 12:07:09.000000000 +0100
-+++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-04 12:07:34.000000000 +0100
+--- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-14 16:06:13.000000000 +0100
++++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-14 16:08:25.000000000 +0100
@@ -101,6 +101,10 @@
*/
};
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
new file mode 100644
index 0000000..044a2ea
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
@@ -0,0 +1,53 @@
+On i.MX platforms UART controllers pins are multiplexed with other
+functionnalities, so it can be interesting to individually select them or not.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.6/drivers/serial/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 16:10:39.000000000 +0100
++++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-14 16:13:44.000000000 +0100
+@@ -831,6 +831,43 @@
+ your boot loader (lilo or loadlin) about how to pass options to the
+ kernel at boot time.)
+
++config SERIAL_IMX_UART1
++ bool "UART1"
++ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
++ default y
++ help
++ /dev/ttySMX0
++
++config SERIAL_IMX_UART2
++ bool "UART2"
++ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
++ help
++ /dev/ttySMX1
++
++config SERIAL_IMX_UART3
++ bool "UART3"
++ depends on SERIAL_IMX && (ARCH_MX2 || ARCH_MX3)
++ help
++ /dev/ttySMX2
++
++config SERIAL_IMX_UART4
++ bool "UART4"
++ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
++ help
++ /dev/ttySMX3
++
++config SERIAL_IMX_UART5
++ bool "UART5"
++ depends on SERIAL_IMX && (MACH_MX25 || MACH_MX27 || MACH_MX31)
++ help
++ /dev/ttySMX4
++
++config SERIAL_IMX_UART6
++ bool "UART6"
++ depends on SERIAL_IMX && (MACH_MX27)
++ help
++ /dev/ttySMX5
++
+ config SERIAL_UARTLITE
+ tristate "Xilinx uartlite serial port support"
+ depends on PPC32
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch
new file mode 100644
index 0000000..595d930
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch
@@ -0,0 +1,13 @@
+Index: linux-2.6.29.6/drivers/serial/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 17:32:56.000000000 +0100
++++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-14 17:34:13.000000000 +0100
+@@ -852,7 +852,7 @@
+
+ config SERIAL_IMX_UART4
+ bool "UART4"
+- depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
++ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31) && (!MACH_APF27_DEV)
+ help
+ /dev/ttySMX3
+
hooks/post-receive
--
armadeus
|
