[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-23-gf7a38a3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-23-gf7a38a3
|
From: Julien B a. A. <ar...@us...> - 2011-03-30 16:59:18
|
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 f7a38a31bd7365dec5ad240d62f208c48a67e926 (commit)
via 225a87afc83f8fef3eda24e1c0b7f79911243e7d (commit)
from 10f21965c7a9d1848cc8296dba584ce92df6b1b4 (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 f7a38a31bd7365dec5ad240d62f208c48a67e926
Merge: 225a87afc83f8fef3eda24e1c0b7f79911243e7d 10f21965c7a9d1848cc8296dba584ce92df6b1b4
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 30 18:58:48 2011 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 225a87afc83f8fef3eda24e1c0b7f79911243e7d
Author: Julien Boibessot <jul...@ar...>
Date: Wed Mar 30 18:57:17 2011 +0200
[LINUX] [2.6.38] APF51: Add Bluetooth preliminary support
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 13 +--
.../2.6.38/400-armadeus-add_apf51_module.patch | 43 +++++---
.../408-armadeus-add_apf51-dev_baseboard.patch | 100 ++++++++++++-------
3 files changed, 96 insertions(+), 60 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index a5aa5f9..1faec4e 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -446,9 +446,11 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
# BR2_PACKAGE_CWIID is not set
+BR2_PACKAGE_DBUS=y
+BR2_DBUS_LIBXML2=y
#
-# dbus not available (need expat or libxml2)
+# dbus-glib needs dbus to be compiled with expat support
#
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DOSFSTOOLS is not set
@@ -679,7 +681,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
#
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_EZXML is not set
-# BR2_PACKAGE_LIBXML2 is not set
+BR2_PACKAGE_LIBXML2=y
# BR2_PACKAGE_LIBXSLT is not set
# BR2_PACKAGE_XERCES is not set
@@ -695,11 +697,8 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
+BR2_PACKAGE_BLUEZ_LIBS=y
+BR2_PACKAGE_BLUEZ_UTILS=y
# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_CTORRENT is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index 4cb98bd..48dcd3a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
+Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-24 10:44:12.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-03-23 17:10:41.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-03-30 18:01:18.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-03-30 18:33:57.000000000 +0200
@@ -162,4 +162,17 @@
Include support for MX50 reference design platform (RDP) board. This
includes specific configurations for the board and its peripherals.
@@ -20,10 +20,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
+ includes specific configurations for the board and its peripherals.
+
endif
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
+Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-03-23 17:10:41.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-03-30 18:33:57.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -32,11 +32,11 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c 2011-03-07 16:17:40.000000000 +0100
-@@ -0,0 +1,432 @@
++++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-03-30 18:33:36.000000000 +0200
+@@ -0,0 +1,443 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems
@@ -89,9 +89,15 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+
+
+static iomux_v3_cfg_t apf51_pads[] = {
++#ifdef APF51_PROD
++ /* UART3 (Console) */
++ MX51_PAD_UART3_RXD__UART3_RXD,
++ MX51_PAD_UART3_TXD__UART3_TXD,
++#else
+ /* UART2 (Console) */
+ MX51_PAD_UART2_RXD__UART2_RXD,
+ MX51_PAD_UART2_TXD__UART2_TXD,
++#endif
+
+ /* USB HOST1 */
+ MX51_PAD_USBH1_CLK__USBH1_CLK,
@@ -423,7 +429,12 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+ mxc_iomux_v3_setup_multiple_pads(apf51_pads,
+ ARRAY_SIZE(apf51_pads));
+
++#ifdef APF51_PROD
++ TODO
++ imx51_add_imx_uart(2, &uart_pdata);
++#else
+ imx51_add_imx_uart(1, &uart_pdata);
++#endif
+
+ imx51_add_imx_i2c(1, &apf51_i2c_data);
+ i2c_register_board_info(1, apf51_i2c1_devices, ARRAY_SIZE(apf51_i2c1_devices));
@@ -469,10 +480,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
+ .timer = &apf51_timer,
+MACHINE_END
+
-Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-24 10:44:13.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-24 10:44:15.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-30 18:01:22.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-03-30 18:01:24.000000000 +0200
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -481,7 +492,7 @@ Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
#define MX50_UART1_BASE_ADDR 0x53fbc000
#define MX53_UART1_BASE_ADDR 0x53fbc000
-@@ -111,6 +112,9 @@
+@@ -113,6 +114,9 @@
case MACH_TYPE_MX53_EVK:
uart_base = MX53_UART1_BASE_ADDR;
break;
@@ -491,10 +502,10 @@ Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
default:
break;
}
-Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-24 10:44:14.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-24 10:44:15.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-03-30 18:01:23.000000000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-03-30 18:01:24.000000000 +0200
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index ce44488..f9c6b5a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -2,10 +2,10 @@ Add APF51Dev baseboard support.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
+Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-24 10:44:15.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-03-23 17:10:35.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-03-30 18:01:24.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-03-30 18:33:48.000000000 +0200
@@ -167,12 +167,32 @@
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART
@@ -41,10 +41,10 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
+endchoice
+
endif
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
+Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-24 10:44:15.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-03-23 17:10:35.000000000 +0100
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-03-30 18:01:24.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-03-30 18:33:48.000000000 +0200
@@ -8,6 +8,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -53,11 +53,11 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
-Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+Index: linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-03-22 18:33:25.000000000 +0100
-@@ -0,0 +1,452 @@
++++ linux-2.6.38.1/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-03-30 18:33:36.000000000 +0200
+@@ -0,0 +1,478 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -123,11 +123,18 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ (_MX51_PAD_EIM_EB2__GPIO2_22 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* WIFI_PWRDN# */
+ (_MX51_PAD_EIM_EB3__GPIO2_23 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* WIFI_RESET# */
+
++#ifdef APF51DEV_PROD
+ /* UART2 (Bluetooth) */
+ MX51_PAD_UART2_RXD__UART2_RXD,
+ MX51_PAD_UART2_TXD__UART2_TXD,
+ MX51_PAD_EIM_D25__UART2_CTS,
+ MX51_PAD_EIM_D26__UART2_RTS,
++#else
++ /* UART3 (Bluetooth) - Protos */
++ MX51_PAD_UART3_RXD__UART3_RXD,
++ MX51_PAD_UART3_TXD__UART3_TXD,
++ /* RTS/CTS on Keypad */
++#endif
+
+ (_MX51_PAD_EIM_CS3__GPIO2_28 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* BT_RESET# */
+
@@ -200,17 +207,22 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ MX51_PAD_KEY_COL1__KEY_COL1,
+ MX51_PAD_KEY_COL2__KEY_COL2,
+ MX51_PAD_KEY_COL3__KEY_COL3,
++#ifdef APF51DEV_PROD
+ MX51_PAD_KEY_COL4__KEY_COL4,
+ MX51_PAD_KEY_COL5__KEY_COL5,
++#else
++ MX51_PAD_KEY_COL4__UART3_RTS,
++ MX51_PAD_KEY_COL5__UART3_CTS,
++#endif
+
+ /* ONEWIRE */
+
+ /* KEYPAD */
+
-+ /* led */
++ /* LED */
+ (_MX51_PAD_GPIO1_2__GPIO1_2 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)),
+
-+ /* user switch */
++ /* User switch */
+ (_MX51_PAD_GPIO1_3__GPIO1_3 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)),
+
+
@@ -377,51 +389,60 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ .cd_gpio = ESDHC_CARD_DETECT, /* card detect pin */
+};
+
-+static int initGPIO(void)
++static int init_gpio(void)
+{
-+#define WIFI_PWRDN (GPIO_PORTB | 22)
-+#define WIFI_RESET (GPIO_PORTB | 23)
+#define USER_LED_GPIO (GPIO_PORTA | 2)
+#define USER_SWITCH_GPIO (GPIO_PORTA | 3)
++#define WIFI_PWRDN (GPIO_PORTB | 22)
++#define WIFI_RESET (GPIO_PORTB | 23)
++#define BT_RESET (GPIO_PORTB | 28)
+#define HDMI_DETECT_GPIO (GPIO_PORTD | 17)
+
-+ int rc;
++ int ret;
+
+ /* WIFI */
-+ rc = gpio_request(WIFI_PWRDN, "WIFI");
-+ if (rc){
-+ pr_debug("failed to get WIFI_PWRDN GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(WIFI_PWRDN, "WIFI");
++ if (ret) {
++ pr_warn("failed to get WIFI_PWRDN GPIO: %d\n", ret);
++ return ret;
+ }
-+ rc = gpio_request(WIFI_RESET, "WIFI");
-+ if (rc){
-+ pr_debug("failed to get WIFI_RESET GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(WIFI_RESET, "WIFI");
++ if (ret) {
++ pr_warn("failed to get WIFI_RESET GPIO: %d\n", ret);
++ return ret;
+ }
+ gpio_direction_output(WIFI_PWRDN, 1);
+ udelay(1000);
+ gpio_direction_output(WIFI_RESET, 1);
+
++ /* BT */
++ ret = gpio_request(BT_RESET, "BT");
++ if (ret) {
++ pr_warn("failed to get BT_RESET GPIO: %d\n", ret);
++ return ret;
++ }
++ gpio_direction_output(BT_RESET, 1);
++
+ /* USER */
-+ rc = gpio_request(USER_LED_GPIO, "USER_LED_GPIO");
-+ if (rc){
-+ pr_debug("failed to get User LED GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(USER_LED_GPIO, "USER_LED_GPIO");
++ if (ret) {
++ pr_warn("failed to get User LED GPIO: %d\n", ret);
++ return ret;
+ }
+ gpio_direction_output(USER_LED_GPIO, 1);
+
-+ rc = gpio_request(USER_SWITCH_GPIO, "USER_SWITCH_GPIO");
-+ if (rc){
-+ pr_debug("failed to get User Switch GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(USER_SWITCH_GPIO, "USER_SWITCH_GPIO");
++ if (ret) {
++ pr_warn("failed to get User Switch GPIO: %d\n", ret);
++ return ret;
+ }
+ gpio_direction_input(USER_SWITCH_GPIO);
+
+ /* HDMI */
-+ rc = gpio_request(HDMI_DETECT_GPIO, "HDMI_DETECT_GPIO");
-+ if (rc){
-+ pr_debug("failed to get HDMI detect GPIO: %d\n", rc);
-+ return rc;
++ ret = gpio_request(HDMI_DETECT_GPIO, "HDMI_DETECT_GPIO");
++ if (ret) {
++ pr_warn("failed to get HDMI detect GPIO: %d\n", ret);
++ return ret;
+ }
+ gpio_direction_input(HDMI_DETECT_GPIO);
+
@@ -471,9 +492,14 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ ARRAY_SIZE(apf51dev_pads));
+
+ imx51_add_imx_uart(0, &apf51dev_uart_pdata);
-+/* imx51_add_imx_uart(1, &apf51dev_uart_pdata);*/
++#ifdef APF51DEV_PROD
++ TODO
++ imx51_add_imx_uart(1, &apf51dev_uart_pdata);
++#else
++ imx51_add_imx_uart(2, &apf51dev_uart_pdata);
++#endif
+
-+ initGPIO();
++ init_gpio();
+
+ imx51_add_sdhci_esdhc_imx(0, &edshc0_pdata);
+ imx51_add_sdhci_esdhc_imx(1, NULL);
hooks/post-receive
--
armadeus
|
