[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-178-g36a069c
Brought to you by:
sszy
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2014-03-02 10:41:42
|
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 36a069c2db134b0d403663907f90829c5223cf14 (commit)
via 8f283a2bfb201f436174fdc937fe2b0c0d5476ce (commit)
from aadc1f08cd4b33d931f8a740f92f74169f238bb1 (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 36a069c2db134b0d403663907f90829c5223cf14
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sun Mar 2 11:42:13 2014 +0100
[LINUX][3.14] apf51: add 3.14(-rc4) kernel config
commit 8f283a2bfb201f436174fdc937fe2b0c0d5476ce
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sun Mar 2 11:41:24 2014 +0100
[LINUX][3.14] apf51: add OTG_PWR pin to hog
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-3.14-rc4.config | 1 +
...linux-3.13.5.config => apf51-linux-3.14.config} | 0
.../0401-armadeus-add_apf51dev_baseboard.patch | 16 ++++++++++++----
3 files changed, 13 insertions(+), 4 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.13.5.config => apf51-linux-3.14.config} (100%)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
new file mode 120000
index 0000000..a6a73f6
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
@@ -0,0 +1 @@
+apf51-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.5.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.13.5.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.config
diff --git a/patches/linux/3.14/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.14/0401-armadeus-add_apf51dev_baseboard.patch
index 72506dc..515d37c 100644
--- a/patches/linux/3.14/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.14/0401-armadeus-add_apf51dev_baseboard.patch
@@ -3,10 +3,10 @@ The APF51Dev is a docking board for an APF51 SOM
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Signed-off-by: Laurent Cans <lau...@gm...>
---
-Index: linux-3.13-rc7/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
---- linux-3.13-rc7.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.13-rc7/arch/arm/boot/dts/imx51-apf51dev.dts
+--- linux-3.14-rc4.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.14-rc4/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -61,6 +61,12 @@
gpios = <&gpio1 2 0>;
linux,default-trigger = "heartbeat";
@@ -57,7 +57,15 @@ Index: linux-3.13-rc7/arch/arm/boot/dts/imx51-apf51dev.dts
&iomuxc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_hog>;
-@@ -118,6 +138,8 @@
+@@ -109,6 +129,7 @@
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
++ MX51_PAD_GPIO1_8__GPIO1_8 0x0C5
+ MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
+ MX51_PAD_EIM_EB3__GPIO2_23 0x0C5
+ MX51_PAD_EIM_CS4__GPIO2_29 0x100
+@@ -118,6 +139,8 @@
MX51_PAD_CSPI1_SS1__GPIO4_25 0x0C5
MX51_PAD_GPIO1_2__GPIO1_2 0x0C5
MX51_PAD_GPIO1_3__GPIO1_3 0x0C5
hooks/post-receive
--
armadeus
|