[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-478-g0772ddd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-478-g0772ddd
|
From: Sébastien S. <ss...@us...> - 2014-11-05 15:49:35
|
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 0772dddd7ca2d9bf65c935a18be81432f8115141 (commit)
via 99aa97c118898cfe14c9bd0a39cd6ca4e2a3902c (commit)
from c045a38c469e00aa18ff0d19503593657ed35238 (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 0772dddd7ca2d9bf65c935a18be81432f8115141
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Nov 5 16:52:06 2014 +0100
[LINUX] 3.18: apf6: config file minor updates
commit 99aa97c118898cfe14c9bd0a39cd6ca4e2a3902c
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Nov 5 16:50:38 2014 +0100
[LINUX] 3.18: apf6: fix user key definition in dts
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-linux-3.18.config | 18 +++++------
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 30 ++++++++++---------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
index 5ba387e..8f324ef 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
@@ -113,11 +113,14 @@ CONFIG_INPUT_EVBUG=m
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ELANTECH=y
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_CYPRESS is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_SX8674=y
CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MMA8450=y
CONFIG_SERIO_SERPORT=m
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
@@ -238,15 +241,11 @@ CONFIG_EXT3_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
-CONFIG_ISO9660_FS=m
+CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
@@ -255,11 +254,10 @@ CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
-CONFIG_NLS_DEFAULT="cp437"
CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
+CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_ISO8859_15=y
CONFIG_NLS_UTF8=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_SCHED_DEBUG is not set
diff --git a/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index c744651..5249994 100644
--- a/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.18-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.18-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,10 +31,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -168,11 +168,11 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,451 @@
++++ linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,453 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -184,8 +184,9 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ *
+ */
+
-+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+ display@di0 {
@@ -219,15 +220,16 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+
-+ keys {
++ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpio_keys>;
+
+ user-button {
+ label = "User button";
-+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-+ linux,code = <100>;
++ gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
++ linux,code = <BTN_MISC>;
++ gpio-key,wakeup;
+ };
+ };
+
@@ -479,7 +481,7 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+
+ pinctrl_gpio_keys: gpiokeysgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0
+ >;
+ };
+ pinctrl_gpio_leds: gpioledsgrp {
@@ -624,10 +626,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.18-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.18-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
hooks/post-receive
--
armadeus
|