[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-59-ge7b41f9
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-59-ge7b41f9
|
From: Julien B a. A. <ar...@us...> - 2009-12-16 14:27:27
|
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 e7b41f962f4dd628828940cc6e45043d33f97f84 (commit)
via 5325f67e3816f9cadf5c1ce0437ec6288a884bb5 (commit)
via 23f1a0840c0e3c85cd565463b4af10a7e9fc67b2 (commit)
via fd70a026fecd446d7993b0bf726541b4a08a4473 (commit)
via 1daa5f62df7246b34233344b626bbd9c6c480f47 (commit)
via f033d952050646c43cbc9ea9d60bb64d16fd52ff (commit)
from 0bd645c82759005f1222b4544439b049212e4f0a (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 e7b41f962f4dd628828940cc6e45043d33f97f84
Merge: 5325f67e3816f9cadf5c1ce0437ec6288a884bb5 0bd645c82759005f1222b4544439b049212e4f0a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 16 15:26:27 2009 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 5325f67e3816f9cadf5c1ce0437ec6288a884bb5
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 16 15:26:00 2009 +0100
[LINUX] Renamed patch 342
commit 23f1a0840c0e3c85cd565463b4af10a7e9fc67b2
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 16 15:24:16 2009 +0100
[LINUX] Add better serial port configuration (RTS/CTS) + config hiding when options are not available. Add configuration options for Bluetooth and WiFi on wireless extension board (APW). Add preliminary power management for APW.
commit fd70a026fecd446d7993b0bf726541b4a08a4473
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 16 10:18:01 2009 +0100
[BUILDROOT] Makes Quake visible/selectable in menuconfig
commit 1daa5f62df7246b34233344b626bbd9c6c480f47
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 15 18:39:34 2009 +0100
[TOOLS] Cleanup Buildroot patches in a better way in quiltify.sh
commit f033d952050646c43cbc9ea9d60bb64d16fd52ff
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 15 17:53:13 2009 +0100
[DEMOS] Fixes Config.in
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/demos/Config.in | 8 +-
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 162 ++++++++++++++++++--
...-apf27-armadeus-add_apf27_to_build_system.patch | 43 ++++-
.../2.6.29/339-apf27-armadeus-spidev.patch | 22 ++--
...ial-add_uart_modules_selection_in_kconfig.patch | 30 ++++-
..._are_not_available_on_apf27_based_designs.patch | 35 +++++
...us-serial-uart4_not_available_on_apf27dev.patch | 13 --
patches/buildroot/081-adds_quake_package.patch | 24 +++-
scripts/quiltify.sh | 6 +-
9 files changed, 281 insertions(+), 62 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
delete 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/package/armadeus/demos/Config.in b/buildroot/package/armadeus/demos/Config.in
index d5e13e6..d3f89ad 100644
--- a/buildroot/package/armadeus/demos/Config.in
+++ b/buildroot/package/armadeus/demos/Config.in
@@ -37,8 +37,8 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_INPUT
config BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER
bool "Music player"
select BR2_PACKAGE_SDL
- select CONFIG_BR2_PACKAGE_SDL_TTF
- select CONFIG_BR2_PACKAGE_SDL_MIXER
+ select BR2_PACKAGE_SDL_TTF
+ select BR2_PACKAGE_SDL_MIXER
help
SDL based music player.
@@ -49,13 +49,13 @@ config BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO
config BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE
bool "Image viewer"
- select CONFIG_BR2_PACKAGE_SDL_IMAGE
+ select BR2_PACKAGE_SDL_IMAGE
help
SDL based image viewer.
config BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD
bool "LCD test"
- select CONFIG_BR2_PACKAGE_SDL
+ select BR2_PACKAGE_SDL
help
Test for LCD dead pixels. Needs SDL.
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 87783ae..13909e1 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.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-12-14 10:35:40.000000000 +0100
-@@ -0,0 +1,737 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2009-12-16 11:43:30.000000000 +0100
+@@ -0,0 +1,745 @@
+ /*
+ * apf27.c
+ *
@@ -191,7 +191,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+
+static int uart_mxc_port0_init(struct platform_device *pdev)
+{
-+ return mxc_gpio_setup_multiple_pins(mxc_uart0_pins, ARRAY_SIZE(mxc_uart0_pins), "UART0");
++ return mxc_gpio_setup_multiple_pins(mxc_uart0_pins, ARRAY_SIZE(mxc_uart0_pins), "UART1");
+}
+
+static int uart_mxc_port0_exit(struct platform_device *pdev)
@@ -210,11 +210,15 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+static int mxc_uart2_pins[] = {
+ PE8_PF_UART3_TXD,
+ PE9_PF_UART3_RXD,
++#ifdef CONFIG_SERIAL_IMX_UART3_USE_RTSCTS
++ PE10_PF_UART3_CTS,
++ PE11_PF_UART3_RTS,
++#endif
+};
+
+static int uart_mxc_port2_init(struct platform_device *pdev)
+{
-+ return mxc_gpio_setup_multiple_pins(mxc_uart2_pins, ARRAY_SIZE(mxc_uart2_pins), "UART2");
++ return mxc_gpio_setup_multiple_pins(mxc_uart2_pins, ARRAY_SIZE(mxc_uart2_pins), "UART3");
+}
+
+static int uart_mxc_port2_exit(struct platform_device *pdev)
@@ -227,7 +231,11 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
+static struct imxuart_platform_data uart2_pdata = {
+ .init = uart_mxc_port2_init,
+ .exit = uart_mxc_port2_exit,
++#ifdef CONFIG_SERIAL_IMX_UART3_USE_RTSCTS
++ .flags = IMXUART_HAVE_RTSCTS,
++#else
+ .flags = 0,
++#endif
+};
+
+/* APF27 has an onboard Ethernet PHY */
@@ -751,8 +759,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-12-14 16:29:06.000000000 +0100
-@@ -0,0 +1,970 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-16 12:07:58.000000000 +0100
+@@ -0,0 +1,1034 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -838,6 +846,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif
+#ifdef CONFIG_MACH_APF27_DEV_EXT
+extern void apf27dev_extension_init(void);
++extern void apf27dev_extension_resume(void);
++extern void apf27dev_extension_suspend(void);
+#endif
+
+#ifdef CONFIG_ARMADEUS_MAX1027_MODULE
@@ -1006,9 +1016,12 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+/* UART2 signals are available on J8 connector (multiplexed with Keypad) */
+#ifdef CONFIG_SERIAL_IMX_UART2
++
+static int mxc_uart1_pins[] = {
++#ifdef CONFIG_SERIAL_IMX_UART2_USE_RTSCTS
+ PE3_PF_UART2_CTS,
+ PE4_PF_UART2_RTS,
++#endif
+ PE6_PF_UART2_TXD,
+ PE7_PF_UART2_RXD,
+};
@@ -1031,7 +1044,11 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+static struct imxuart_platform_data uart1_pdata = {
+ .init = uart_mxc_port1_init,
+ .exit = uart_mxc_port1_exit,
++#ifdef CONFIG_SERIAL_IMX_UART2_USE_RTSCTS
+ .flags = IMXUART_HAVE_RTSCTS,
++#else
++ .flags = 0,
++#endif
+};
+#endif /* CONFIG_SERIAL_IMX_UART2 */
+
@@ -1042,6 +1059,10 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+static int mxc_uart4_pins[] = {
+ PB19_AF_UART5_RXD,
+ PB18_AF_UART5_TXD,
++#ifdef CONFIG_SERIAL_IMX_UART5_USE_RTSCTS
++ PB20_AF_UART5_CTS,
++ PB21_AF_UART5_RTS,
++#endif
+};
+
+static int uart_mxc_port4_init(struct platform_device *pdev)
@@ -1062,10 +1083,52 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+static struct imxuart_platform_data uart4_pdata = {
+ .init = uart_mxc_port4_init,
+ .exit = uart_mxc_port4_exit,
++#ifdef CONFIG_SERIAL_IMX_UART5_USE_RTSCTS
++ .flags = IMXUART_HAVE_RTSCTS,
++#else
+ .flags = 0,
++#endif
+};
+#endif /* CONFIG_SERIAL_IMX_UART5 */
+
++/* UART6 signals are available on J9 connector (multiplexed with CSI) */
++#ifdef CONFIG_SERIAL_IMX_UART6
++
++static int mxc_uart5_pins[] = {
++ PB10_AF_UART6_TXD,
++ PB11_AF_UART6_RXD,
++#ifdef CONFIG_SERIAL_IMX_UART6_USE_RTSCTS
++ PB12_AF_UART6_CTS,
++ PB13_AF_UART6_RTS,
++#endif
++};
++
++static int uart_mxc_port5_init(struct platform_device *pdev)
++{
++ int res = mxc_gpio_setup_multiple_pins(mxc_uart5_pins,
++ ARRAY_SIZE(mxc_uart5_pins), "UART6");
++
++ return res;
++}
++
++static int uart_mxc_port5_exit(struct platform_device *pdev)
++{
++ mxc_gpio_release_multiple_pins(mxc_uart5_pins, ARRAY_SIZE(mxc_uart5_pins));
++
++ return 0;
++}
++
++static struct imxuart_platform_data uart5_pdata = {
++ .init = uart_mxc_port5_init,
++ .exit = uart_mxc_port5_exit,
++#ifdef CONFIG_SERIAL_IMX_UART6_USE_RTSCTS
++ .flags = IMXUART_HAVE_RTSCTS,
++#else
++ .flags = 0,
++#endif
++};
++#endif /* CONFIG_SERIAL_IMX_UART6 */
++
+
+/* Both APF27 SPI ports are used on APF27Dev */
+#ifdef CONFIG_SPI
@@ -1224,7 +1287,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+
+
-+/* APF27Dev has a optional CAN Bus controller */
++/* APF27Dev has an optional CAN Bus controller */
+#ifdef CONFIG_CAN_MCP251X
+
+#define CAN_MCP251X_INT 19
@@ -1620,6 +1683,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+void apf27_baseboard_resume(void)
+{
++#ifdef CONFIG_MACH_APF27_DEV_EXT
++ apf27dev_extension_resume();
++#endif
+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 1);
+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
+ gpio_set_value(GPIO_PORTF | 14, 0);
@@ -1628,6 +1694,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+void apf27_baseboard_suspend(void)
+{
++#ifdef CONFIG_MACH_APF27_DEV_EXT
++ apf27dev_extension_suspend();
++#endif
+ gpio_set_value(APF27DEV_POWER_DOWN_NOT, 0);
+#ifdef CONFIG_USE_APF27DEV_IMX_LED_FOR_PM
+ gpio_set_value(GPIO_PORTF | 14, 1);
@@ -1682,6 +1751,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_SERIAL_IMX_UART5
+ mxc_register_device(&mxc_uart_device4, &uart4_pdata);
+#endif
++#ifdef CONFIG_SERIAL_IMX_UART6
++ mxc_register_device(&mxc_uart_device5, &uart5_pdata);
++#endif
+#ifdef CONFIG_USB_EHCI_MXC
+ mxc_register_device(&mxc_ehci1, &ehci1_pdata);
+#endif
@@ -1726,7 +1798,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-12-14 10:35:40.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2009-12-15 09:32:01.000000000 +0100
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -1951,8 +2023,8 @@ 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 2009-12-14 16:34:11.000000000 +0100
-@@ -0,0 +1,99 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2009-12-16 12:07:45.000000000 +0100
+@@ -0,0 +1,159 @@
+ /*
+ * apf27-dev-ext-apw.c
+ * Support for AFP27Dev's wireless extension board.
@@ -1983,7 +2055,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+
+/* 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)
++
++#define GSM_POK_IN (GPIO_PORTE | 11) /* UART3_RTS */
++
+static int apw_gsm_pins[] = {
+ (GSM_POK_IN | GPIO_OUT | GPIO_GPIO) /* GSM_PWR_ON_not */
+};
@@ -2011,12 +2085,13 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+
+/* 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)
++
++#define GPS_WAKEUP (GPIO_PORTB | 20) /* CSI_VSYNC_UART5_CTS */
++#define GPS_TIMEPULSE (GPIO_PORTB | 21) /* CSI_HSYNC_UART5_RTS */
+
+static int apw_gps_pins[] = {
-+ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO),
-+ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO),
++ (GPS_WAKEUP | GPIO_OUT | GPIO_GPIO),
++ (GPS_TIMEPULSE | GPIO_IN | GPIO_GPIO),
+};
+
+static int apw_gps_init(void)
@@ -2038,6 +2113,60 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS */
+
+
++/* An optionnal Bluetooth + WiFi module can be added to wireless extension board */
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++
++#define BT_RESET (GPIO_PORTB | 14) /* CSI_D4 */
++#define WIFI_PWRDNn (GPIO_PORTE | 10) /* UART3_CTS */
++
++static int apw_bt_wifi_pins[] = {
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
++ (BT_RESET | GPIO_OUT | GPIO_GPIO), /* Shared with CSI */
++#endif
++ (WIFI_PWRDNn | GPIO_OUT | GPIO_GPIO),
++};
++
++static int apw_bt_wifi_init(void)
++{
++ int res = mxc_gpio_setup_multiple_pins(apw_bt_wifi_pins,
++ ARRAY_SIZE(apw_bt_wifi_pins), "BT_WIFI");
++
++ return res;
++}
++#endif /* CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI */
++
++
++void apf27dev_extension_resume(void)
++{
++#ifdef CONFIG_PM
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
++ gpio_set_value(BT_RESET, 0);
++# endif
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
++ gpio_set_value(WIFI_PWRDNn, 1);
++# endif
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
++ gpio_set_value(GPS_WAKEUP, 1);
++# endif
++#endif
++}
++
++void apf27dev_extension_suspend(void)
++{
++#ifdef CONFIG_PM
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
++ gpio_set_value(BT_RESET, 1);
++# endif
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
++ gpio_set_value(WIFI_PWRDNn, 0);
++# endif
++# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
++ gpio_set_value(GPS_WAKEUP, 0);
++# endif
++#endif
++}
++
++
+void __init apf27dev_extension_init(void)
+{
+ printk(" Registering APW ressources:");
@@ -2048,6 +2177,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
+#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_GPS
+ apw_gps_init();
+#endif
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++ apw_bt_wifi_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 657f8a2..1b3ce65 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,7 +1,7 @@
Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
===================================================================
---- 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
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Kconfig 2009-12-15 19:54:59.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/Kconfig 2009-12-16 10:34:20.000000000 +0100
@@ -10,6 +10,21 @@
comment "MX2 Platforms"
depends on ARCH_MX2
@@ -24,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 +41,73 @@
+@@ -26,15 +41,98 @@
choice
prompt "Baseboard"
@@ -51,7 +51,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+ activates the devices you want to use if you have the "Full"
+ version.
+
-+endchoice
+ endchoice
+
+config MACH_APF27_DEV_EXT
+ bool
@@ -74,12 +74,13 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+ help
+ Wireless extension board connected to APF27Dev baseboard.
+
- endchoice
++endchoice
+
+config MACH_APF27_DEV_EXT_WIRELESS_GSM
+ bool "GSM/GPRS Modem"
+ depends on MACH_APF27_DEV_EXT_WIRELESS
+ select SERIAL_IMX_UART2
++ select SERIAL_IMX_UART2_USE_RTSCTS
+ default y
+ help
+ Activates support for the GSM modem on the APW extension board.
@@ -87,22 +88,46 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+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_WIFI
++ bool "WiFi"
++ depends on MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++ default y
++ help
++ Only activates WiFi part of the module.
++
++config MACH_APF27_DEV_EXT_WIRELESS_BT
++ bool "Bluetooth"
++ depends on MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
++ select SERIAL_IMX_UART6
++ select SERIAL_IMX_UART6_USE_RTSCTS
++ help
++ Only activates Bluetooth part of the module
++
++config MACH_APF27_DEV_EXT_WIRELESS_CAMERA
++ bool "CSI (Camera) pass-through"
++ depends on (MACH_APF27_DEV_EXT_WIRELESS) && (!MACH_APF27_DEV_EXT_WIRELESS_GPS) && (!MACH_APF27_DEV_EXT_WIRELESS_BT)
++
++comment "Please check that J3 is unplugged"
++ depends on MACH_APF27_DEV_EXT_WIRELESS_CAMERA
++
+config MACH_APF27_DEV_EXT_WIRELESS_GPS
+ bool "GPS module"
+ depends on MACH_APF27_DEV_EXT_WIRELESS
-+ select SERIAL_IMX_UART6
++ select SERIAL_IMX_UART5
+ help
+ Activates support for the GPS module on the APW extension board.
+
++comment "Please check that J3 is plugged in"
++ depends on MACH_APF27_DEV_EXT_WIRELESS_GPS
++
Index: linux-2.6.29.6/arch/arm/mach-mx2/Makefile
===================================================================
---- 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
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Makefile 2009-12-15 19:54:59.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/Makefile 2009-12-16 10:19:31.000000000 +0100
@@ -10,6 +10,10 @@
obj-$(CONFIG_MACH_MX27) += clock_imx27.o
obj-$(CONFIG_CPU_FREQ_IMX27) += cpufreq_imx27.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 49f5e29..5b47e20 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-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
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-15 09:41:42.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-15 17:06:13.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>
-@@ -94,6 +95,9 @@
+@@ -96,6 +97,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
-@@ -362,7 +366,7 @@
+@@ -417,7 +421,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,
-@@ -506,6 +510,38 @@
+@@ -561,6 +565,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
-@@ -544,6 +580,18 @@
+@@ -599,6 +635,18 @@
.platform_data = &apf27_mcp251x_config,
},
#endif /* CONFIG_CAN_MCP251X */
@@ -93,7 +93,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
};
-@@ -951,7 +999,7 @@
+@@ -1015,7 +1063,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-14 16:06:13.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-14 16:08:25.000000000 +0100
+--- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-12-15 09:20:35.000000000 +0100
++++ linux-2.6.29.6/drivers/spi/spidev.c 2009-12-15 17:06:13.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-14 16:06:13.000000000 +0100
-+++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-14 16:08:25.000000000 +0100
+--- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-12-15 09:20:35.000000000 +0100
++++ linux-2.6.29.6/include/linux/spi/spidev.h 2009-12-15 17:06:13.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
index 044a2ea..5b38d71 100644
--- 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
@@ -5,9 +5,9 @@ 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 @@
+--- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 20:38:17.000000000 +0100
++++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-15 07:51:45.000000000 +0100
+@@ -831,6 +831,67 @@
your boot loader (lilo or loadlin) about how to pass options to the
kernel at boot time.)
@@ -18,36 +18,60 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ help
+ /dev/ttySMX0
+
++config SERIAL_IMX_UART1_USE_RTSCTS
++ bool "Uses UART1 RTS/CTS lines"
++ depends on SERIAL_IMX_UART1
++
+config SERIAL_IMX_UART2
+ bool "UART2"
+ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
+ help
+ /dev/ttySMX1
+
++config SERIAL_IMX_UART2_USE_RTSCTS
++ bool "Uses UART2 RTS/CTS lines"
++ depends on SERIAL_IMX_UART2
++
+config SERIAL_IMX_UART3
+ bool "UART3"
+ depends on SERIAL_IMX && (ARCH_MX2 || ARCH_MX3)
+ help
+ /dev/ttySMX2
+
++config SERIAL_IMX_UART3_USE_RTSCTS
++ bool "Uses UART3 RTS/CTS lines"
++ depends on SERIAL_IMX_UART3
++
+config SERIAL_IMX_UART4
+ bool "UART4"
+ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
+ help
+ /dev/ttySMX3
+
++config SERIAL_IMX_UART4_USE_RTSCTS
++ bool "Uses UART4 RTS/CTS lines"
++ depends on SERIAL_IMX_UART4
++
+config SERIAL_IMX_UART5
+ bool "UART5"
+ depends on SERIAL_IMX && (MACH_MX25 || MACH_MX27 || MACH_MX31)
+ help
+ /dev/ttySMX4
+
++config SERIAL_IMX_UART5_USE_RTSCTS
++ bool "Uses UART5 RTS/CTS lines"
++ depends on SERIAL_IMX_UART5
++
+config SERIAL_IMX_UART6
+ bool "UART6"
+ depends on SERIAL_IMX && (MACH_MX27)
+ help
+ /dev/ttySMX5
+
++config SERIAL_IMX_UART6_USE_RTSCTS
++ bool "Uses UART6 RTS/CTS lines"
++ depends on SERIAL_IMX_UART6
++
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-some_uart_pins_are_not_available_on_apf27_based_designs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
new file mode 100644
index 0000000..291c7cd
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
@@ -0,0 +1,35 @@
+On APF27 based designs some UART pins are missing:
+* UART1 RTS/CTS are not available on APF27Dev (used by MAX1027 and not at the
+ same voltage level as Rx/Tx (console)).
+* UART3 RTS/CTS are not available if an APW with GSM or WiFi is plugged in.
+* UART4 module is not available on APF27Dev (used as USBH1)
+
+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-16 12:08:10.000000000 +0100
++++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-16 12:08:10.000000000 +0100
+@@ -840,7 +840,7 @@
+
+ config SERIAL_IMX_UART1_USE_RTSCTS
+ bool "Uses UART1 RTS/CTS lines"
+- depends on SERIAL_IMX_UART1
++ depends on SERIAL_IMX_UART1 && (!MACH_APF27_DEV)
+
+ config SERIAL_IMX_UART2
+ bool "UART2"
+@@ -860,11 +860,11 @@
+
+ config SERIAL_IMX_UART3_USE_RTSCTS
+ bool "Uses UART3 RTS/CTS lines"
+- depends on SERIAL_IMX_UART3
++ depends on SERIAL_IMX_UART3 && (!MACH_APF27_DEV_EXT_WIRELESS_WIFI) && (!MACH_APF27_DEV_EXT_WIRELESS_GSM)
+
+ 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
+
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
deleted file mode 100644
index 595d930..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-uart4_not_available_on_apf27dev.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-
diff --git a/patches/buildroot/081-adds_quake_package.patch b/patches/buildroot/081-adds_quake_package.patch
index 940748d..cfe32f6 100644
--- a/patches/buildroot/081-adds_quake_package.patch
+++ b/patches/buildroot/081-adds_quake_package.patch
@@ -16,7 +16,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/sdlquake/sdlquake.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake.mk 2009-08-16 14:43:40.000000000 +0200
++++ buildroot/package/games/sdlquake/sdlquake.mk 2009-12-15 17:59:22.000000000 +0100
@@ -0,0 +1,31 @@
+#############################################################
+#
@@ -52,7 +52,7 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2009-08-16 13:37:00.000000000 +0200
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2009-12-15 17:59:22.000000000 +0100
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
@@ -92,7 +92,7 @@ Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
Index: buildroot/package/games/sdlquake/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/Config.in 2009-08-16 14:51:17.000000000 +0200
++++ buildroot/package/games/sdlquake/Config.in 2009-12-15 17:59:22.000000000 +0100
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SDLQUAKE
+ bool "sdlquake"
@@ -107,7 +107,7 @@ Index: buildroot/package/games/sdlquake/Config.in
Index: buildroot/package/games/quake-pak/quake-pak.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/quake-pak.mk 2009-08-16 15:50:54.000000000 +0200
++++ buildroot/package/games/quake-pak/quake-pak.mk 2009-12-15 17:59:22.000000000 +0100
@@ -0,0 +1,34 @@
+#############################################################
+#
@@ -146,7 +146,7 @@ Index: buildroot/package/games/quake-pak/quake-pak.mk
Index: buildroot/package/games/quake-pak/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/Config.in 2009-08-16 15:46:54.000000000 +0200
++++ buildroot/package/games/quake-pak/Config.in 2009-12-15 17:59:22.000000000 +0100
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QUAKE_PAK
+ bool "shareware Quake PAK/WAD file"
@@ -155,3 +155,17 @@ Index: buildroot/package/games/quake-pak/Config.in
+ This will install the shareware pak/wad data file for the Quake game.
+
+ The file will be placed in the /usr/share/games/quake/ directory.
+Index: buildroot/package/games/Config.in
+===================================================================
+--- buildroot.orig/package/games/Config.in 2009-12-15 18:26:09.000000000 +0100
++++ buildroot/package/games/Config.in 2009-12-15 18:28:19.000000000 +0100
+@@ -11,7 +11,9 @@
+ source "package/games/lxdoom/Config.in"
+ source "package/games/magiccube4d/Config.in"
+ source "package/games/prboom/Config.in"
++source "package/games/quake-pak/Config.in"
+ source "package/games/rubix/Config.in"
++source "package/games/sdlquake/Config.in"
+ source "package/games/vice/Config.in"
+ source "package/games/xboard/Config.in"
+ endif
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 058a672..8c0db33 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -84,8 +84,10 @@ if [ "$QUILT_TARGET_NAME" != "Buildroot" ]; then
mv $QUILT_TARGET_DIR "$QUILT_TARGET_DIR"."$EXT"
fi
else # For Buildroot
- rm $QUILT_TARGET_DIR/.patched
- rm $QUILT_TARGET_DIR/.unpacked
+ rm -f $QUILT_TARGET_DIR/.patched
+ rm -f $QUILT_TARGET_DIR/.unpacked
+ rm -rf $QUILT_TARGET_DIR/patches
+ rm -rf $QUILT_TARGET_DIR/.pc
fi
# Get XXX unpacked sources
hooks/post-receive
--
armadeus
|
