armadeus-commitlog Mailing List for armadeus (Page 46)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jorasse <jo...@us...> - 2014-04-28 13:33:16
|
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 bfa516708940b73797c0d3a3c381b3900cc54d50 (commit)
from 2d2214930f392bb14ad6d53dd2fa8dfcf62d63c1 (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 bfa516708940b73797c0d3a3c381b3900cc54d50
Author: Eric Jarrige <eri...@ar...>
Date: Mon Apr 28 15:32:52 2014 +0200
[BUILDROOT] openssl: bump to version 1.0.1g to fix critical http://heartbleed.com issue
-----------------------------------------------------------------------
Summary of changes:
.../218-openssl-bump_to_version_1.0.1g.patch | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/218-openssl-bump_to_version_1.0.1g.patch
diff --git a/patches/buildroot/2013.11/218-openssl-bump_to_version_1.0.1g.patch b/patches/buildroot/2013.11/218-openssl-bump_to_version_1.0.1g.patch
new file mode 100644
index 0000000..713dcad
--- /dev/null
+++ b/patches/buildroot/2013.11/218-openssl-bump_to_version_1.0.1g.patch
@@ -0,0 +1,17 @@
+Fixes highly critical CVE-2014-0160. See http://heartbleed.com
+
+Signed-off-by: Baruch Siach <ba...@tk...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+
+diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
+--- a/package/openssl/openssl.mk
++++ b/package/openssl/openssl.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-OPENSSL_VERSION = 1.0.1e
++OPENSSL_VERSION = 1.0.1g
+ OPENSSL_SITE = http://www.openssl.org/source
+ OPENSSL_LICENSE = OpenSSL or SSLeay
+ OPENSSL_LICENSE_FILES = LICENSE
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-04-28 10:09:50
|
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 2d2214930f392bb14ad6d53dd2fa8dfcf62d63c1 (commit)
via 62c9b04ba87166a4063bb723964983f45af0a912 (commit)
via 53520a6d7c21d5a0dc4a90791db83e75a636d5ba (commit)
via 0077924ae012e748b21a687c836aea09126123e7 (commit)
from 554f76146eae46de7ab8c5b54ceddc9747f66d81 (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 2d2214930f392bb14ad6d53dd2fa8dfcf62d63c1
Author: Philippe Reynes <tr...@ya...>
Date: Sun Apr 27 14:33:08 2014 +0200
[LINUX] 3.14: move to 3.14.2
commit 62c9b04ba87166a4063bb723964983f45af0a912
Author: Philippe Reynes <tr...@ya...>
Date: Fri Apr 25 21:31:32 2014 +0200
[LINUX] 3.12: move to 3.12.18
commit 53520a6d7c21d5a0dc4a90791db83e75a636d5ba
Author: Philippe Reynes <tr...@ya...>
Date: Fri Apr 25 20:38:48 2014 +0200
[LINUX] 3.13: move to 3.13.11
commit 0077924ae012e748b21a687c836aea09126123e7
Author: Philippe Reynes <tr...@ya...>
Date: Fri Apr 25 20:38:47 2014 +0200
[LINUX] 3.15: move to 3.15-rc2
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.12.17.config => apf27-linux-3.12.18.config} | 0
...x-3.13.10.config => apf27-linux-3.13.11.config} | 0
...nux-3.14.1.config => apf27-linux-3.14.2.config} | 0
...3.15-rc1.config => apf27-linux-3.15-rc2.config} | 0
...x-3.12.17.config => apf28-linux-3.12.18.config} | 0
...x-3.13.10.config => apf28-linux-3.13.11.config} | 0
...nux-3.14.1.config => apf28-linux-3.14.2.config} | 0
...3.15-rc1.config => apf28-linux-3.15-rc2.config} | 0
...x-3.12.17.config => apf51-linux-3.12.18.config} | 0
...x-3.13.10.config => apf51-linux-3.13.11.config} | 0
...nux-3.14.1.config => apf51-linux-3.14.2.config} | 0
...3.15-rc1.config => apf51-linux-3.15-rc2.config} | 0
patches/linux/{3.12.17 => 3.12.18} | 0
patches/linux/{3.13.10 => 3.13.11} | 0
patches/linux/{3.14.1 => 3.14.2} | 0
18 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.17.config => apf27-linux-3.12.18.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.13.10.config => apf27-linux-3.13.11.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.1.config => apf27-linux-3.14.2.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15-rc1.config => apf27-linux-3.15-rc2.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.17.config => apf28-linux-3.12.18.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.13.10.config => apf28-linux-3.13.11.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.1.config => apf28-linux-3.14.2.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.15-rc1.config => apf28-linux-3.15-rc2.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.17.config => apf51-linux-3.12.18.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.13.10.config => apf51-linux-3.13.11.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.1.config => apf51-linux-3.14.2.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.15-rc1.config => apf51-linux-3.15-rc2.config} (100%)
rename patches/linux/{3.12.17 => 3.12.18} (100%)
rename patches/linux/{3.13.10 => 3.13.11} (100%)
rename patches/linux/{3.14.1 => 3.14.2} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 06201ce..9482145 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.1"
+BR2_DEFAULT_KERNEL_VERSION="3.14.2"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 865b103..6b2e57f 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.1"
+BR2_DEFAULT_KERNEL_VERSION="3.14.2"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index aec57a6..783d73e 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.1"
+BR2_DEFAULT_KERNEL_VERSION="3.14.2"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.17.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.18.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.17.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.18.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.10.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.13.10.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.13.11.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.2.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.17.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.18.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.17.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.18.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.10.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.13.10.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.13.11.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc2.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.17.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.18.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.17.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.18.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.10.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.13.10.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.13.11.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.1.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.2.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc1.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc2.config
diff --git a/patches/linux/3.12.17 b/patches/linux/3.12.18
similarity index 100%
rename from patches/linux/3.12.17
rename to patches/linux/3.12.18
diff --git a/patches/linux/3.13.10 b/patches/linux/3.13.11
similarity index 100%
rename from patches/linux/3.13.10
rename to patches/linux/3.13.11
diff --git a/patches/linux/3.14.1 b/patches/linux/3.14.2
similarity index 100%
rename from patches/linux/3.14.1
rename to patches/linux/3.14.2
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-04-28 08:34: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 554f76146eae46de7ab8c5b54ceddc9747f66d81 (commit)
from 666ad5c647767745de002f63eae18bab38302f9f (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 554f76146eae46de7ab8c5b54ceddc9747f66d81
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Apr 28 10:36:31 2014 +0200
[LINUX] apf6: move to linux 3.15-rc3
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...-3.15-rc2.config => apf6-linux-3.15-rc3.config} | 0
patches/linux/{3.15-rc2 => 3.15-rc3} | 0
3 files changed, 1 insertions(+), 1 deletions(-)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.15-rc2.config => apf6-linux-3.15-rc3.config} (100%)
rename patches/linux/{3.15-rc2 => 3.15-rc3} (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 967b4d7..4e30b0c 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -22,7 +22,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15-rc2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15-rc3"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc2.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc2.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc3.config
diff --git a/patches/linux/3.15-rc2 b/patches/linux/3.15-rc3
similarity index 100%
rename from patches/linux/3.15-rc2
rename to patches/linux/3.15-rc3
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2014-04-25 15:58:09
|
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 666ad5c647767745de002f63eae18bab38302f9f (commit)
from f8f1f6b56a8a480ddbd1f75d65e629d8760cc55a (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 666ad5c647767745de002f63eae18bab38302f9f
Author: Fabien Marteau <fab...@ar...>
Date: Fri Apr 25 17:57:39 2014 +0200
[fpga] adding a standard/example bistream for apf27dev
-----------------------------------------------------------------------
Summary of changes:
firmware/pod_scripts/apf27_uarts_gpios.bit | Bin 0 -> 149618 bytes
firmware/pod_scripts/apf27_uarts_gpios.pod | 98 ++++++++++++++++++++++++++++
2 files changed, 98 insertions(+), 0 deletions(-)
create mode 100644 firmware/pod_scripts/apf27_uarts_gpios.bit
create mode 100644 firmware/pod_scripts/apf27_uarts_gpios.pod
diff --git a/firmware/pod_scripts/apf27_uarts_gpios.bit b/firmware/pod_scripts/apf27_uarts_gpios.bit
new file mode 100644
index 0000000..52b5661
Binary files /dev/null and b/firmware/pod_scripts/apf27_uarts_gpios.bit differ
diff --git a/firmware/pod_scripts/apf27_uarts_gpios.pod b/firmware/pod_scripts/apf27_uarts_gpios.pod
new file mode 100644
index 0000000..d4534ad
--- /dev/null
+++ b/firmware/pod_scripts/apf27_uarts_gpios.pod
@@ -0,0 +1,98 @@
+create apf27uartgpio
+
+selectplatform standard.apf27
+addinstance components.uart16750.wb16 uart0
+addinstance components.uart16750.wb16 uart1
+addinstance components.uart16750.wb16 uart2
+
+connectpin uart0.interrupt.int_o.0 irq_mngr00.irq.0
+connectpin uart0.interrupt.int_o.0 irq_mngr00.irq.irqport.0
+connectpin uart1.interrupt.int_o.0 irq_mngr00.irq.irqport.1
+connectpin uart2.interrupt.int_o.0 irq_mngr00.irq.irqport.2
+
+connectpin uart0.uart.stx_pad_o.0 apf27.fpga.IO_L08P_0.0
+connectpin uart0.uart.srx_pad_i.0 apf27.fpga.IO_L09N_0.0
+connectpin uart1.uart.srx_pad_i.0 apf27.fpga.IO_L10N_0
+connectpin uart1.uart.stx_pad_o.0 apf27.fpga.IO_L10P_0
+connectpin uart2.uart.stx_pad_o.0 apf27.fpga.IO_L11N_0.0
+
+addinstance components.pod_gpio.wb16 gpio0
+addinstance components.pod_gpio.wb16 gpio1
+addinstance components.pod_gpio.wb16 gpio2
+addinstance components.pod_gpio.wb16 gpio3
+
+connectpin gpio0.irq.interrupt.0 irq_mngr00.irq.irqport.3
+connectpin gpio1.irq.interrupt.0 irq_mngr00.irq.irqport.4
+connectpin gpio2.irq.interrupt.0 irq_mngr00.irq.irqport.5
+connectpin gpio3.irq.interrupt.0 irq_mngr00.irq.irqport.6
+
+connectpin gpio0.pod_gpio.gpio.0 apf27.fpga.IO_L01N_0
+connectpin gpio0.pod_gpio.gpio.1 apf27.fpga.IO_L02N_0
+connectpin gpio0.pod_gpio.gpio.2 apf27.fpga.IO_L01P_0
+connectpin gpio0.pod_gpio.gpio.3 apf27.fpga.IO_L02P_0
+connectpin gpio0.pod_gpio.gpio.4 apf27.fpga.IO_L03N_0
+connectpin gpio0.pod_gpio.gpio.5 apf27.fpga.IO_L04N_0
+connectpin gpio0.pod_gpio.gpio.6 apf27.fpga.IO_L03P_0
+connectpin gpio0.pod_gpio.gpio.7 apf27.fpga.IO_L04P_0
+connectpin gpio0.pod_gpio.gpio.8 apf27.fpga.IO_L07N_0
+connectpin gpio0.pod_gpio.gpio.9 apf27.fpga.IO_L08N_0
+connectpin gpio0.pod_gpio.gpio.10 apf27.fpga.IO_L07P_0
+connectpin gpio0.pod_gpio.gpio.11 apf27.fpga.IO_L12P_0
+connectpin gpio0.pod_gpio.gpio.12 apf27.fpga.IO_L15N_0
+connectpin gpio0.pod_gpio.gpio.13 apf27.fpga.IO_L16N_0
+connectpin gpio0.pod_gpio.gpio.14 apf27.fpga.IO_L15P_0
+connectpin gpio0.pod_gpio.gpio.15 apf27.fpga.IO_L16P_0
+
+connectpin gpio1.pod_gpio.gpio.0 apf27.fpga.IO_L17N_0
+connectpin gpio1.pod_gpio.gpio.1 apf27.fpga.IO_L18N_0
+connectpin gpio1.pod_gpio.gpio.2 apf27.fpga.IO_L17P_0
+connectpin gpio1.pod_gpio.gpio.3 apf27.fpga.IO_L18P_0
+connectpin gpio1.pod_gpio.gpio.4 apf27.fpga.IO_L19N_0
+connectpin gpio1.pod_gpio.gpio.5 apf27.fpga.IO_L20N_1
+connectpin gpio1.pod_gpio.gpio.6 apf27.fpga.IO_L24P_1
+connectpin gpio1.pod_gpio.gpio.7 apf27.fpga.IO_L20P_1
+connectpin gpio1.pod_gpio.gpio.8 apf27.fpga.IO_L24N_1
+connectpin gpio1.pod_gpio.gpio.9 apf27.fpga.IO_L23N_1
+connectpin gpio1.pod_gpio.gpio.10 apf27.fpga.IO_L22P_1
+connectpin gpio1.pod_gpio.gpio.11 apf27.fpga.IO_L23P_1
+connectpin gpio1.pod_gpio.gpio.12 apf27.fpga.IO_L22N_1
+connectpin gpio1.pod_gpio.gpio.13 apf27.fpga.IO_L24N_3
+connectpin gpio1.pod_gpio.gpio.14 apf27.fpga.IO_L24P_3
+connectpin gpio1.pod_gpio.gpio.15 apf27.fpga.IO_L23N_3
+
+connectpin gpio2.pod_gpio.gpio.0 apf27.fpga.IO_L23P_3
+connectpin gpio2.pod_gpio.gpio.1 apf27.fpga.IO_L22N_3
+connectpin gpio2.pod_gpio.gpio.2 apf27.fpga.IO_L22P_3
+connectpin gpio2.pod_gpio.gpio.3 apf27.fpga.IO_L20N_3
+connectpin gpio2.pod_gpio.gpio.4 apf27.fpga.IO_L20P_3
+connectpin gpio2.pod_gpio.gpio.5 apf27.fpga.IO_L15N_3
+connectpin gpio2.pod_gpio.gpio.6 apf27.fpga.IO_L15P_3
+connectpin gpio2.pod_gpio.gpio.7 apf27.fpga.IO_L14N_3
+connectpin gpio2.pod_gpio.gpio.8 apf27.fpga.IO_L14P_3
+connectpin gpio2.pod_gpio.gpio.9 apf27.fpga.IO_L12N_3
+connectpin gpio2.pod_gpio.gpio.10 apf27.fpga.IO_L12P_3
+connectpin gpio2.pod_gpio.gpio.11 apf27.fpga.IO_L11N_3
+connectpin gpio2.pod_gpio.gpio.12 apf27.fpga.IO_L11P_3
+connectpin gpio2.pod_gpio.gpio.13 apf27.fpga.IO_L08N_3
+connectpin gpio2.pod_gpio.gpio.14 apf27.fpga.IO_L08P_3
+connectpin gpio2.pod_gpio.gpio.15 apf27.fpga.IO_L03N_3
+
+connectpin gpio3.pod_gpio.gpio.0 apf27.fpga.IO_L03P_3
+connectpin gpio3.pod_gpio.gpio.1 apf27.fpga.IO_L02N_3
+connectpin gpio3.pod_gpio.gpio.2 apf27.fpga.IO_L02P_3
+connectpin gpio3.pod_gpio.gpio.3 apf27.fpga.IO_L01N_3
+connectpin gpio3.pod_gpio.gpio.4 apf27.fpga.IO_L01P_3
+connectpin gpio3.pod_gpio.gpio.5 apf27.fpga.IO_L12N_0
+connectpin gpio3.pod_gpio.gpio.6 apf27.fpga.IO_L11P_0
+
+autoconnectbus
+generateintercon imx27_wb16_wrapper00.mwb16
+generateintercon rstgen_syscon00.candroutput
+generatetop
+synthesis.selecttoolchain ise
+synthesis.generateproject
+driver.selecttoolchain armadeus
+driver.generateproject
+driver.selectprojecttree ../../target/linux/modules/fpga/POD
+driver.copydrivers
+exit
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2014-04-25 13:42:11
|
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 f8f1f6b56a8a480ddbd1f75d65e629d8760cc55a (commit)
from 8db7516a6383bd4626ab6ceb9cc5a1804422cc4a (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 f8f1f6b56a8a480ddbd1f75d65e629d8760cc55a
Author: Fabien Marteau <fab...@ar...>
Date: Fri Apr 25 15:41:33 2014 +0200
[uboot] firmware_autoload set to 0 by default
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2013.04.h | 3 ++-
.../device/armadeus/apf27/apf27-u-boot-2014.04.h | 5 +++--
.../device/armadeus/apf51/apf51-u-boot-2013.04.h | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index ef0aa87..4a8db7a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -249,6 +249,7 @@
"then echo Firmware successfully loaded;" \
"else echo Loading firmware failed!;" \
"fi;\0" \
+ "firmware_autoload=0\0" \
"checknload_firmware=if test ${firmware_autoload} -eq 1;" \
"then run load_firmware; else exit; fi;\0"\
"download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
@@ -277,7 +278,7 @@
"update_all=run update_kernel update_rootfs update_uboot &&" \
"if test -n ${fdt_addr_r};" \
"then run update_dtb; else exit; fi &&" \
- "if test -n ${firmware_autoload};" \
+ "if test ${firmware_autoload} -eq 1;" \
"then run update_firmware; else exit; fi;\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
index f395b8d..913fce3 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
@@ -244,7 +244,8 @@
"then echo Firmware successfully loaded;" \
"else echo Loading firmware failed!;" \
"fi;\0" \
- "checknload_firmware=if test -n ${firmware_autoload};" \
+ "firmware_autoload=0\0" \
+ "checknload_firmware=if test ${firmware_autoload} -eq 1;" \
"then run load_firmware; else exit; fi;\0"\
"download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
"flash_dtb=nand erase.part dtb;" \
@@ -272,7 +273,7 @@
"update_all=run update_kernel update_rootfs update_uboot &&" \
"if test -n ${fdt_addr_r};" \
"then run update_dtb; else exit; fi &&" \
- "if test -n ${firmware_autoload};" \
+ "if test ${firmware_autoload} -eq 1;" \
"then run update_firmware; else exit; fi;\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
index 2af3e74..79440f1 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
@@ -255,6 +255,7 @@
"then echo Firmware successfully loaded;" \
"else echo Loading firmware failed!;" \
"fi;\0" \
+ "firmware_autoload=0\0" \
"checknload_firmware=if test ${firmware_autoload} -eq 1;" \
"then run load_firmware; else exit; fi;\0"\
"download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
@@ -283,7 +284,7 @@
"update_all=run update_kernel update_rootfs update_uboot &&" \
"if test -n ${fdt_addr_r};" \
"then run update_dtb; else exit; fi &&" \
- "if test -n ${firmware_autoload};" \
+ "if test ${firmware_autoload} -eq 1;" \
"then run update_firmware; else exit; fi;\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2014-04-25 11:59:34
|
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 8db7516a6383bd4626ab6ceb9cc5a1804422cc4a (commit)
from 6f8d32920c7d66a753ca230d58e58be546433d5b (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 8db7516a6383bd4626ab6ceb9cc5a1804422cc4a
Author: Fabien Marteau <fab...@ar...>
Date: Fri Apr 25 13:58:54 2014 +0200
[uboot] firmware_autoload must be set to 1 for autoload
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2013.04.h | 2 +-
.../device/armadeus/apf51/apf51-u-boot-2013.04.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index ad7006c..ef0aa87 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -249,7 +249,7 @@
"then echo Firmware successfully loaded;" \
"else echo Loading firmware failed!;" \
"fi;\0" \
- "checknload_firmware=if test -n ${firmware_autoload};" \
+ "checknload_firmware=if test ${firmware_autoload} -eq 1;" \
"then run load_firmware; else exit; fi;\0"\
"download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
"flash_dtb=nand erase.part dtb;" \
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
index 670b96a..2af3e74 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
@@ -255,7 +255,7 @@
"then echo Firmware successfully loaded;" \
"else echo Loading firmware failed!;" \
"fi;\0" \
- "checknload_firmware=if test -n ${firmware_autoload};" \
+ "checknload_firmware=if test ${firmware_autoload} -eq 1;" \
"then run load_firmware; else exit; fi;\0"\
"download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
"flash_dtb=nand erase.part dtb;" \
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-04-25 07:55:12
|
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 6f8d32920c7d66a753ca230d58e58be546433d5b (commit)
from e03b7e9bcbb643c2f5c62609e137e78c095b0bb1 (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 6f8d32920c7d66a753ca230d58e58be546433d5b
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Apr 25 09:56:16 2014 +0200
[BUILDROOT] 2013.11: imagemagick bump to version 6.8.9-0
-----------------------------------------------------------------------
Summary of changes:
.../217-imagemagick-bump_to_version_6.8.9-0.patch | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/217-imagemagick-bump_to_version_6.8.9-0.patch
diff --git a/patches/buildroot/2013.11/217-imagemagick-bump_to_version_6.8.9-0.patch b/patches/buildroot/2013.11/217-imagemagick-bump_to_version_6.8.9-0.patch
new file mode 100644
index 0000000..e791923
--- /dev/null
+++ b/patches/buildroot/2013.11/217-imagemagick-bump_to_version_6.8.9-0.patch
@@ -0,0 +1,14 @@
+Index: buildroot/package/imagemagick/imagemagick.mk
+===================================================================
+--- buildroot.orig/package/imagemagick/imagemagick.mk
++++ buildroot/package/imagemagick/imagemagick.mk
+@@ -4,8 +4,7 @@
+ #
+ ################################################################################
+
+-IMAGEMAGICK_MAJOR = 6.8.7
+-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-5
++IMAGEMAGICK_VERSION = 6.8.9-0
+ IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
+ # The official ImageMagick site only keeps the latest versions
+ # available, which is annoying. Use an alternate site that keeps all
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-04-24 15:45:20
|
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 e03b7e9bcbb643c2f5c62609e137e78c095b0bb1 (commit)
from 035a4e5fb9b5450cfaa06066849141103925aa16 (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 e03b7e9bcbb643c2f5c62609e137e78c095b0bb1
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Apr 24 17:43:29 2014 +0200
[LINUX] 3.15: apf6: dts: fix pinctrl of uart4
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 1b107ba..f9ba889 100644
--- a/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.15-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.15-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,10 +31,10 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -165,10 +165,10 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-3.15-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,443 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -511,7 +511,7 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+
+ pinctrl_uart4: uart4grp {
+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+ >;
+ };
@@ -613,10 +613,10 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ fsl,mode = "i2s-slave";
+ status = "okay";
+};
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.15-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.15-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-04-24 07:35:15
|
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 035a4e5fb9b5450cfaa06066849141103925aa16 (commit)
from 8e8fe7be8c0ac4a4ac78e6bfe7d94b7289d30c81 (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 035a4e5fb9b5450cfaa06066849141103925aa16
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 24 09:32:48 2014 +0200
[TOOLS] Add some comments in gpio_helpers.sh
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/gpio_helpers.sh | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/target/linux/modules/gpio/gpio_helpers.sh b/target/linux/modules/gpio/gpio_helpers.sh
index 894a7ad..e88f113 100755
--- a/target/linux/modules/gpio/gpio_helpers.sh
+++ b/target/linux/modules/gpio/gpio_helpers.sh
@@ -11,6 +11,10 @@
# (at your option) any later version.
#
+#
+# For old GPIO custom driver:
+#
+
GPIO_DEV_DIR=/dev/gpio
GPIO_PROC_DIR=/proc/driver/gpio
@@ -53,6 +57,7 @@ gpio_mode()
#
# For gpiolib:
#
+
gpio_direction_output()
{
if [ "$1" != "" ]; then
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-04-23 10:02:48
|
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 8e8fe7be8c0ac4a4ac78e6bfe7d94b7289d30c81 (commit)
via b90933a172098a002685827abfb4b640decc5e59 (commit)
via 438166aa1a788e0ae5d72e146bc40b202eea2bd6 (commit)
from 6845a28396b7db9bec99983e2226725b3d576d0a (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 8e8fe7be8c0ac4a4ac78e6bfe7d94b7289d30c81
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 23 12:02:21 2014 +0200
[LINUX] 3.4: Add watchdog driver for i.MX28 (vanilla/mainline backport)
commit b90933a172098a002685827abfb4b640decc5e59
Author: Julien Boibessot <jul...@ar...>
Date: Wed Apr 23 11:58:29 2014 +0200
[BUILDROOT] Add gnash package (Flash player, Work In Progress)
commit 438166aa1a788e0ae5d72e146bc40b202eea2bd6
Author: Julien Boibessot <jul...@ar...>
Date: Sun Mar 30 18:25:28 2014 +0200
[BUILDROOT] Add agg package
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/007-armadeus-add-agg-package.patch | 74 +++++
.../2013.11/008-armadeus-add-gnash-package.patch | 155 +++++++++
.../buildroot/2013.11/097-adds_flite_package.patch | 2 +-
patches/buildroot/2013.11/cleanup_buildroot.sh | 2 +
...nx-add-simple-binding-for-the-stmp3xx-rtc.patch | 71 ++++
...linaro-drivers-rtc-use-of-match-ptr-macro.patch | 62 ++++
...ix-rtc-stmp3xxx-add-wdt-accessor-function.patch | 147 +++++++++
...rtc-stmp3xxx-use-stmp-reset-block-instead.patch | 47 +++
...-add-new-driver-for-STMP3xxx-and-iMX23-28.patch | 171 ++++++++++
...ronix-watchdog-remove-old-STMP3xxx-driver.patch | 339 ++++++++++++++++++++
10 files changed, 1069 insertions(+), 1 deletions(-)
create mode 100644 patches/buildroot/2013.11/007-armadeus-add-agg-package.patch
create mode 100644 patches/buildroot/2013.11/008-armadeus-add-gnash-package.patch
create mode 100644 patches/linux/3.4/803-denx-add-simple-binding-for-the-stmp3xx-rtc.patch
create mode 100644 patches/linux/3.4/804-linaro-drivers-rtc-use-of-match-ptr-macro.patch
create mode 100644 patches/linux/3.4/805-pengutronix-rtc-stmp3xxx-add-wdt-accessor-function.patch
create mode 100644 patches/linux/3.4/806-linaro-rtc-stmp3xxx-use-stmp-reset-block-instead.patch
create mode 100644 patches/linux/3.4/807-pengutronix-watchdog-add-new-driver-for-STMP3xxx-and-iMX23-28.patch
create mode 100644 patches/linux/3.4/808-pengutronix-watchdog-remove-old-STMP3xxx-driver.patch
diff --git a/patches/buildroot/2013.11/007-armadeus-add-agg-package.patch b/patches/buildroot/2013.11/007-armadeus-add-agg-package.patch
new file mode 100644
index 0000000..bd7c9f8
--- /dev/null
+++ b/patches/buildroot/2013.11/007-armadeus-add-agg-package.patch
@@ -0,0 +1,74 @@
+Needed by Gnash.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/agg/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/agg/Config.in 2014-03-20 15:17:04.490514039 +0100
+@@ -0,0 +1,8 @@
++config BR2_PACKAGE_AGG
++ bool "agg"
++ help
++ The Anti-Grain Geometry project. A High Quality 2D Graphics Rendering
++ Engine for C++.
++ We use the SDL backend by default.
++
++ http://www.antigrain.com/index.html
+Index: buildroot/package/agg/agg.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/agg/agg.mk 2014-03-20 15:20:47.779621260 +0100
+@@ -0,0 +1,40 @@
++###############################################################################
++#
++# agg
++#
++###############################################################################
++
++AGG_VERSION = 2.5
++AGG_SITE = http://www.antigrain.com/
++AGG_LICENSE = GPLv3+
++AGG_LICENSE_FILES = COPYING
++AGG_INSTALL_STAGING = YES
++AGG_AUTORECONF = YES
++
++AGG_DEPENDENCIES = sdl
++
++AGG_CONF_OPT = \
++ --with-sdl-prefix=$(STAGING_DIR)/usr \
++ --disable-sdltest
++
++ifeq ($(BR2_PACKAGE_SDL_X11),)
++AGG_CONF_OPT += \
++ --with-x=NO \
++ --disable-examples # examples require X11
++endif
++
++ifeq ($(BR2_PACKAGE_FREETYPE),y)
++AGG_DEPENDENCIES += freetype
++AGG_CONF_OPT += --enable-freetype
++else
++AGG_CONF_OPT += --disable-freetype
++endif
++
++define AGG_CREATE_MISSING_FILES
++ touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/README
++# Fixes reconfiguring with recent automake:
++ $(SED) 's/AM_C_PROTOTYPES//' $(@D)/configure.in
++endef
++AGG_POST_EXTRACT_HOOKS += AGG_CREATE_MISSING_FILES
++
++$(eval $(autotools-package))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2014-03-20 15:12:38.513195116 +0100
++++ buildroot/package/Config.in 2014-03-20 15:13:46.937534410 +0100
+@@ -517,6 +517,7 @@
+ endmenu
+
+ menu "Graphics"
++source "package/agg/Config.in"
+ source "package/atk/Config.in"
+ source "package/cairo/Config.in"
+ source "package/fltk/Config.in"
diff --git a/patches/buildroot/2013.11/008-armadeus-add-gnash-package.patch b/patches/buildroot/2013.11/008-armadeus-add-gnash-package.patch
new file mode 100644
index 0000000..328cf62
--- /dev/null
+++ b/patches/buildroot/2013.11/008-armadeus-add-gnash-package.patch
@@ -0,0 +1,155 @@
+WIP.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/gnash/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnash/Config.in 2014-03-19 15:36:25.255835492 +0100
+@@ -0,0 +1,11 @@
++config BR2_PACKAGE_GNASH
++ bool "gnash"
++ select BR2_PACKAGE_BOOST
++ select BR2_PACKAGE_BOOST_IOSTREAMS
++ select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
++ select BR2_PACKAGE_BOOST_THREAD
++
++ help
++ GNU Gnash is the GNU Flash movie player.
++
++ http://www.gnu.org/software/gnash/
+Index: buildroot/package/gnash/gnash.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnash/gnash.mk 2014-03-19 16:26:28.838729457 +0100
+@@ -0,0 +1,118 @@
++###############################################################################
++#
++# gnash
++#
++###############################################################################
++
++# inspired from LFS
++
++GNASH_VERSION = 0.8.10
++GNASH_SOURCE = gnash-$(GNASH_VERSION).tar.bz2
++GNASH_SITE = http://ftp.gnu.org/pub/gnu/gnash/$(GNASH_VERSION)/
++GNASH_LICENSE = LGPLv2.1+
++GNASH_LICENSE_FILES = COPYING
++
++GNASH_CONF_OPT = --without-gconf --disable-extensions --disable-jemalloc --disable-cygnal
++GNASH_CONF_OPT += --disable-nls # To fix
++GNASH_DEPENDENCIES += gettext # even if NLS disabled...
++
++GNASH_CONF_OPT += --with-ltdl-incl=$(STAGING_DIR)/usr/include/ --with-ltdl-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += libtool
++
++define GNASH_FIXES_BOOST_LINK
++ $(SED) '/^LIBS/s/\(.*\)/\1 -lboost_system/' \
++ $(@D)/gui/Makefile.in $(@D)/utilities/Makefile.in
++endef
++GNASH_POST_CONFIGURE_HOOKS += GNASH_FIXES_BOOST_LINK
++
++ifeq ($(BR2_PACKAGE_GNASH_SHOW_PROPERTIES),y)
++# to check
++GNASH_DEPENDENCIES += pango
++GNASH_CONF_OPT += --with-pango-incl=$(STAGING_DIR)/usr/include/pango --with-pango-lib=$(STAGING_DIR)/usr/lib \
++else
++GNASH_CONF_OPT += --disable-swftree
++endif
++
++ifeq ($(BR2_PACKAGE_QT),)
++#(accept: gtk|kde3|qt4|fltk|sdl|aqua|fb|qtopia3|qtopia4|dump|aos4|haiku)
++#GNASH_CONF_OPT += --disable-gui ??
++GNASH_CONF_OPT += --enable-gui=sdl
++GNASH_CONF_OPT += --with-sdl-incl=$(STAGING_DIR)/usr/include/SDL --with-sdl-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += sdl
++else
++GNASH_CONF_OPT += --enable-gui=qt4
++GNASH_DEPENDENCIES += qt
++endif
++
++GNASH_CONF_OPT += --enable-media=none
++
++GNASH_CONF_OPT += --enable-sound=none
++
++GNASH_CONF_OPT += --enable-renderer=agg
++GNASH_CONF_OPT += --with-agg-incl=$(STAGING_DIR)/usr/include/agg2 --with-agg-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += agg
++
++GNASH_CONF_OPT += --with-curl-incl=$(STAGING_DIR)/usr/include
++GNASH_DEPENDENCIES += libcurl
++
++GNASH_CONF_OPT += --with-boost-incl=$(STAGING_DIR)/usr/include/boost --with-boost-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += boost
++
++# What for ?
++GNASH_CONF_OPT += --with-jpeg-incl=$(STAGING_DIR)/usr/include --with-jpeg-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += libjpeg
++
++# What for ?
++GNASH_CONF_OPT += --with-ungif-incl=$(STAGING_DIR)/usr/include --with-ungif-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += libungif
++
++# Needed otherwise utilities/ fails to build
++GNASH_CONF_OPT += --with-png-incl=$(STAGING_DIR)/usr/include --with-png-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += libpng
++
++# Otherwise build fails in FreetypeGlyphsProvider.cpp
++GNASH_DEPENDENCIES += freetype
++GNASH_CONF_OPT += --with-freetype-incl=$(STAGING_DIR)/usr/include/freetype2 --with-freetype-lib=$(STAGING_DIR)/usr/lib
++
++# --enable-sound=sdl|ahi|mkit
++# Use the specified sound handler (default=sdl)
++# --enable-media=handler Enable media handling support using the specified
++# handler: gst, ffmpeg or none (no sound) [gst]
++# --enable-input Enable support for the specified input devices for
++# the framebuffer GUI
++# (default=ps2mouse|ps2keyboard|events|touchscreen)
++# --enable-renderer Enable support for the specified renderers
++# (agg|cairo|opengl|openvg|all, default=all)
++
++
++$(eval $(autotools-package))
++
++# RECOMMENDED: No PNG library development package installed!
++# Gnash will be built without support for dynamic loading of
++# PNG files.
++# Install it from http://www.libpng.org
++# or .deb users: apt-get install libpng12-dev
++# or .rpm users: yum install libpng-devel
++# RECOMMENDED: If you install the CURL library, Gnash will be able to
++# display remote content (streaming from URLs) using CURL.
++# Install libcurl from http://curl.haxx.se/libcurl
++# or .deb users: apt-get install libcurl4-gnutls-dev
++# or maybe : apt-get install libcurl-dev
++# or .rpm users: yum install curl-devel
++# RECOMMENDED: If you install the Speex library, Gnash will be able to
++# decoded Speex encoded audio in FLV files.
++# Install libspeex from http://speex.org
++# or .deb users: apt-get install libspeex-dev
++# or .rpm users: yum install speex-devel
++# RECOMMENDED: If you install the Speex DSP library, Gnash will be able to
++# resample Speex encoded audio in FLV files.
++# Install libspeexdsp from http://speex.org
++# or .deb users: apt-get install libspeexdsp-dev
++# or .rpm users: yum install speex-devel
++# RECOMMENDED: You need to have the fontconfig development packages
++# installed to use device fonts.
++# Install it from http://fontconfig.org
++# or .deb users: apt-get install libfontconfig1-dev
++# or .rpm users: yum install fontconfig-devel
++# It may still be possible to configure without fontconfig.
++
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2014-03-19 15:31:54.782494289 +0100
++++ buildroot/package/Config.in 2014-03-19 15:32:23.326635847 +0100
+@@ -13,6 +13,7 @@
+ source "package/faad2/Config.in"
+ source "package/ffmpeg/Config.in"
+ source "package/flac/Config.in"
++source "package/gnash/Config.in"
+ source "package/gstreamer/Config.in"
+ source "package/gstreamer1/Config.in"
+ source "package/lame/Config.in"
diff --git a/patches/buildroot/2013.11/097-adds_flite_package.patch b/patches/buildroot/2013.11/097-adds_flite_package.patch
index a90dc58..9ad19bc 100644
--- a/patches/buildroot/2013.11/097-adds_flite_package.patch
+++ b/patches/buildroot/2013.11/097-adds_flite_package.patch
@@ -20,9 +20,9 @@ index 273d9bc..3ca0531 100644
source "package/ffmpeg/Config.in"
source "package/flac/Config.in"
+source "package/flite/Config.in"
+ source "package/gnash/Config.in"
source "package/gstreamer/Config.in"
source "package/gstreamer1/Config.in"
- source "package/lame/Config.in"
diff --git a/package/flite/Config.in b/package/flite/Config.in
new file mode 100644
index 0000000..bef989c
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 6e53b5a..70352f8 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -83,3 +83,5 @@ rm -rf buildroot/package/mmc-utils/
rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch
rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch
rm -rf buildroot/package/owfs/
+rm -rf buildroot/package/agg/
+rm -rf buildroot/package/gnash/
diff --git a/patches/linux/3.4/803-denx-add-simple-binding-for-the-stmp3xx-rtc.patch b/patches/linux/3.4/803-denx-add-simple-binding-for-the-stmp3xx-rtc.patch
new file mode 100644
index 0000000..d76f241
--- /dev/null
+++ b/patches/linux/3.4/803-denx-add-simple-binding-for-the-stmp3xx-rtc.patch
@@ -0,0 +1,71 @@
+From dd8d20a3f32a7ba37526f5b4dfd4d35a93e5342f Mon Sep 17 00:00:00 2001
+From: Marek Vasut <ma...@de...>
+Date: Tue, 26 Jun 2012 16:29:27 +0800
+Subject: rtc: stmp3xxx: Add simple binding for the stmp3xxx-rtc
+
+Signed-off-by: Marek Vasut <ma...@de...>
+Cc: Alessandro Zummo <a....@to...>
+Cc: dev...@li...
+Cc: Grant Likely <gra...@se...>
+Cc: rtc...@go...
+Acked-by: Rob Herring <rob...@ca...>
+Signed-off-by: Shawn Guo <sha...@li...>
+
+diff --git a/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt b/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
+new file mode 100644
+index 0000000..b800070
+--- /dev/null
++++ b/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
+@@ -0,0 +1,16 @@
++* STMP3xxx/i.MX28 Time Clock controller
++
++Required properties:
++- compatible: should be one of the following.
++ * "fsl,stmp3xxx-rtc"
++- reg: physical base address of the controller and length of memory mapped
++ region.
++- interrupts: rtc alarm interrupt
++
++Example:
++
++rtc@80056000 {
++ compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";
++ reg = <0x80056000 2000>;
++ interrupts = <29>;
++};
+diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
+index 1028786..739ef556 100644
+--- a/drivers/rtc/rtc-stmp3xxx.c
++++ b/drivers/rtc/rtc-stmp3xxx.c
+@@ -25,6 +25,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/rtc.h>
+ #include <linux/slab.h>
++#include <linux/of_device.h>
+
+ #include <mach/common.h>
+
+@@ -265,6 +266,12 @@ static int stmp3xxx_rtc_resume(struct platform_device *dev)
+ #define stmp3xxx_rtc_resume NULL
+ #endif
+
++static const struct of_device_id rtc_dt_ids[] = {
++ { .compatible = "fsl,stmp3xxx-rtc", },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, rtc_dt_ids);
++
+ static struct platform_driver stmp3xxx_rtcdrv = {
+ .probe = stmp3xxx_rtc_probe,
+ .remove = stmp3xxx_rtc_remove,
+@@ -273,6 +280,7 @@ static struct platform_driver stmp3xxx_rtcdrv = {
+ .driver = {
+ .name = "stmp3xxx-rtc",
+ .owner = THIS_MODULE,
++ .of_match_table = rtc_dt_ids,
+ },
+ };
+
+--
+cgit v0.10.1
+
diff --git a/patches/linux/3.4/804-linaro-drivers-rtc-use-of-match-ptr-macro.patch b/patches/linux/3.4/804-linaro-drivers-rtc-use-of-match-ptr-macro.patch
new file mode 100644
index 0000000..d9c8d4e
--- /dev/null
+++ b/patches/linux/3.4/804-linaro-drivers-rtc-use-of-match-ptr-macro.patch
@@ -0,0 +1,62 @@
+JB: I have removed the stuff concerning other RTC drivers than i.MX23/28
+that didn't apply...
+
+
+From c8a6046e1e0bb03406e4fc6c0a204ef58a1868e4 Mon Sep 17 00:00:00 2001
+From: Sachin Kamat <sac...@li...>
+Date: Thu, 21 Feb 2013 16:44:28 -0800
+Subject: drivers/rtc: use of_match_ptr() macro
+
+This eliminates having an #ifdef returning NULL for the case when OF is
+disabled. Maintains consistency in cases where OF is always selected.
+
+Signed-off-by: Sachin Kamat <sac...@li...>
+Cc: Alessandro Zummo <a....@to...>
+Signed-off-by: Andrew Morton <ak...@li...>
+Signed-off-by: Linus Torvalds <tor...@li...>
+
+diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
+index 16630aa..9deb9e4 100644
+--- a/drivers/rtc/rtc-cmos.c
++++ b/drivers/rtc/rtc-cmos.c
+@@ -1098,7 +1098,6 @@ static __init void cmos_of_init(struct platform_device *pdev)
+ }
+ #else
+ static inline void cmos_of_init(struct platform_device *pdev) {}
+-#define of_cmos_match NULL
+ #endif
+ /*----------------------------------------------------------------*/
+
+@@ -1140,7 +1139,7 @@ static struct platform_driver cmos_platform_driver = {
+ #ifdef CONFIG_PM
+ .pm = &cmos_pm_ops,
+ #endif
+- .of_match_table = of_cmos_match,
++ .of_match_table = of_match_ptr(of_cmos_match),
+ }
+ };
+
+diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
+index 739ef556..b2a8ed9 100644
+--- a/drivers/rtc/rtc-stmp3xxx.c
++++ b/drivers/rtc/rtc-stmp3xxx.c
+@@ -26,6 +26,7 @@
+ #include <linux/rtc.h>
+ #include <linux/slab.h>
+ #include <linux/of_device.h>
++#include <linux/of.h>
+
+ #include <mach/common.h>
+
+@@ -280,7 +281,7 @@ static struct platform_driver stmp3xxx_rtcdrv = {
+ .driver = {
+ .name = "stmp3xxx-rtc",
+ .owner = THIS_MODULE,
+- .of_match_table = rtc_dt_ids,
++ .of_match_table = of_match_ptr(rtc_dt_ids),
+ },
+ };
+
+--
+cgit v0.10.1
+
diff --git a/patches/linux/3.4/805-pengutronix-rtc-stmp3xxx-add-wdt-accessor-function.patch b/patches/linux/3.4/805-pengutronix-rtc-stmp3xxx-add-wdt-accessor-function.patch
new file mode 100644
index 0000000..b0ba7f9
--- /dev/null
+++ b/patches/linux/3.4/805-pengutronix-rtc-stmp3xxx-add-wdt-accessor-function.patch
@@ -0,0 +1,147 @@
+From 1a71fb84fda651105e1e194c2d3a3a13a38210a9 Mon Sep 17 00:00:00 2001
+From: Wolfram Sang <w....@pe...>
+Date: Tue, 27 Sep 2011 22:21:37 +0200
+Subject: rtc: stmp3xxx: add wdt-accessor function
+
+This RTC also includes a watchdog timer. Provide an accessor function
+for setting the watchdog timeout value which will be picked up by a
+watchdog driver. Also register the platform_device for the watchdog here
+to get the boot-time dependencies right.
+
+Signed-off-by: Wolfram Sang <w....@pe...>
+Acked-by: Andrew Morton <ak...@li...>
+Signed-off-by: Wim Van Sebroeck <wi...@ig...>
+
+diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
+index b2a8ed9..98f0d3c 100644
+--- a/drivers/rtc/rtc-stmp3xxx.c
++++ b/drivers/rtc/rtc-stmp3xxx.c
+@@ -27,6 +27,8 @@
+ #include <linux/slab.h>
+ #include <linux/of_device.h>
+ #include <linux/of.h>
++#include <linux/stmp_device.h>
++#include <linux/stmp3xxx_rtc_wdt.h>
+
+ #include <mach/common.h>
+
+@@ -36,6 +38,7 @@
+ #define STMP3XXX_RTC_CTRL_ALARM_IRQ_EN 0x00000001
+ #define STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN 0x00000002
+ #define STMP3XXX_RTC_CTRL_ALARM_IRQ 0x00000004
++#define STMP3XXX_RTC_CTRL_WATCHDOGEN 0x00000010
+
+ #define STMP3XXX_RTC_STAT 0x10
+ #define STMP3XXX_RTC_STAT_STALE_SHIFT 16
+@@ -45,6 +48,8 @@
+
+ #define STMP3XXX_RTC_ALARM 0x40
+
++#define STMP3XXX_RTC_WATCHDOG 0x50
++
+ #define STMP3XXX_RTC_PERSISTENT0 0x60
+ #define STMP3XXX_RTC_PERSISTENT0_SET 0x64
+ #define STMP3XXX_RTC_PERSISTENT0_CLR 0x68
+@@ -52,12 +57,70 @@
+ #define STMP3XXX_RTC_PERSISTENT0_ALARM_EN 0x00000004
+ #define STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE 0x00000080
+
++#define STMP3XXX_RTC_PERSISTENT1 0x70
++/* missing bitmask in headers */
++#define STMP3XXX_RTC_PERSISTENT1_FORCE_UPDATER 0x80000000
++
+ struct stmp3xxx_rtc_data {
+ struct rtc_device *rtc;
+ void __iomem *io;
+ int irq_alarm;
+ };
+
++#if IS_ENABLED(CONFIG_STMP3XXX_RTC_WATCHDOG)
++/**
++ * stmp3xxx_wdt_set_timeout - configure the watchdog inside the STMP3xxx RTC
++ * @dev: the parent device of the watchdog (= the RTC)
++ * @timeout: the desired value for the timeout register of the watchdog.
++ * 0 disables the watchdog
++ *
++ * The watchdog needs one register and two bits which are in the RTC domain.
++ * To handle the resource conflict, the RTC driver will create another
++ * platform_device for the watchdog driver as a child of the RTC device.
++ * The watchdog driver is passed the below accessor function via platform_data
++ * to configure the watchdog. Locking is not needed because accessing SET/CLR
++ * registers is atomic.
++ */
++
++static void stmp3xxx_wdt_set_timeout(struct device *dev, u32 timeout)
++{
++ struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
++
++ if (timeout) {
++ writel(timeout, rtc_data->io + STMP3XXX_RTC_WATCHDOG);
++ writel(STMP3XXX_RTC_CTRL_WATCHDOGEN,
++ rtc_data->io + STMP3XXX_RTC_CTRL + STMP_OFFSET_REG_SET);
++ writel(STMP3XXX_RTC_PERSISTENT1_FORCE_UPDATER,
++ rtc_data->io + STMP3XXX_RTC_PERSISTENT1 + STMP_OFFSET_REG_SET);
++ } else {
++ writel(STMP3XXX_RTC_CTRL_WATCHDOGEN,
++ rtc_data->io + STMP3XXX_RTC_CTRL + STMP_OFFSET_REG_CLR);
++ writel(STMP3XXX_RTC_PERSISTENT1_FORCE_UPDATER,
++ rtc_data->io + STMP3XXX_RTC_PERSISTENT1 + STMP_OFFSET_REG_CLR);
++ }
++}
++
++static struct stmp3xxx_wdt_pdata wdt_pdata = {
++ .wdt_set_timeout = stmp3xxx_wdt_set_timeout,
++};
++
++static void stmp3xxx_wdt_register(struct platform_device *rtc_pdev)
++{
++ struct platform_device *wdt_pdev =
++ platform_device_alloc("stmp3xxx_rtc_wdt", rtc_pdev->id);
++
++ if (wdt_pdev) {
++ wdt_pdev->dev.parent = &rtc_pdev->dev;
++ wdt_pdev->dev.platform_data = &wdt_pdata;
++ platform_device_add(wdt_pdev);
++ }
++}
++#else
++static void stmp3xxx_wdt_register(struct platform_device *rtc_pdev)
++{
++}
++#endif /* CONFIG_STMP3XXX_RTC_WATCHDOG */
++
+ static void stmp3xxx_wait_time(struct stmp3xxx_rtc_data *rtc_data)
+ {
+ /*
+@@ -233,6 +296,7 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
+ goto out_irq_alarm;
+ }
+
++ stmp3xxx_wdt_register(pdev);
+ return 0;
+
+ out_irq_alarm:
+diff --git a/include/linux/stmp3xxx_rtc_wdt.h b/include/linux/stmp3xxx_rtc_wdt.h
+new file mode 100644
+index 0000000..1dd12c9
+--- /dev/null
++++ b/include/linux/stmp3xxx_rtc_wdt.h
+@@ -0,0 +1,15 @@
++/*
++ * stmp3xxx_rtc_wdt.h
++ *
++ * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K.
++ *
++ * This file is released under the GPLv2.
++ */
++#ifndef __LINUX_STMP3XXX_RTC_WDT_H
++#define __LINUX_STMP3XXX_RTC_WDT_H
++
++struct stmp3xxx_wdt_pdata {
++ void (*wdt_set_timeout)(struct device *dev, u32 timeout);
++};
++
++#endif /* __LINUX_STMP3XXX_RTC_WDT_H */
+--
+cgit v0.10.1
+
diff --git a/patches/linux/3.4/806-linaro-rtc-stmp3xxx-use-stmp-reset-block-instead.patch b/patches/linux/3.4/806-linaro-rtc-stmp3xxx-use-stmp-reset-block-instead.patch
new file mode 100644
index 0000000..c585545
--- /dev/null
+++ b/patches/linux/3.4/806-linaro-rtc-stmp3xxx-use-stmp-reset-block-instead.patch
@@ -0,0 +1,47 @@
+From 36d1da1d15743e8d25e2699a2edb19d7c492bec8 Mon Sep 17 00:00:00 2001
+From: Shawn Guo <sha...@li...>
+Date: Thu, 28 Mar 2013 23:13:14 +0800
+Subject: rtc: stmp3xxx: use stmp_reset_block() instead
+
+The function stmp_reset_block() provides the exactly same functionality
+as mxs_reset_block(). So use stmp_reset_block() instead, so that
+<mach/common.h> inclusion can be removed.
+
+Signed-off-by: Shawn Guo <sha...@li...>
+Cc: Andrew Morton <ak...@li...>
+Cc: rtc...@go...
+
+diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
+index 98f0d3c..67d2612 100644
+--- a/drivers/rtc/rtc-stmp3xxx.c
++++ b/drivers/rtc/rtc-stmp3xxx.c
+@@ -30,8 +30,6 @@
+ #include <linux/stmp_device.h>
+ #include <linux/stmp3xxx_rtc_wdt.h>
+
+-#include <mach/common.h>
+-
+ #define STMP3XXX_RTC_CTRL 0x0
+ #define STMP3XXX_RTC_CTRL_SET 0x4
+ #define STMP3XXX_RTC_CTRL_CLR 0x8
+@@ -271,7 +269,7 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
+
+ platform_set_drvdata(pdev, rtc_data);
+
+- mxs_reset_block(rtc_data->io);
++ stmp_reset_block(rtc_data->io);
+ writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
+ STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
+ STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
+@@ -319,7 +317,7 @@ static int stmp3xxx_rtc_resume(struct platform_device *dev)
+ {
+ struct stmp3xxx_rtc_data *rtc_data = platform_get_drvdata(dev);
+
+- mxs_reset_block(rtc_data->io);
++ stmp_reset_block(rtc_data->io);
+ writel(STMP3XXX_RTC_PERSISTENT0_ALARM_EN |
+ STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE_EN |
+ STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE,
+--
+cgit v0.10.1
+
diff --git a/patches/linux/3.4/807-pengutronix-watchdog-add-new-driver-for-STMP3xxx-and-iMX23-28.patch b/patches/linux/3.4/807-pengutronix-watchdog-add-new-driver-for-STMP3xxx-and-iMX23-28.patch
new file mode 100644
index 0000000..6a67339
--- /dev/null
+++ b/patches/linux/3.4/807-pengutronix-watchdog-add-new-driver-for-STMP3xxx-and-iMX23-28.patch
@@ -0,0 +1,171 @@
+From de6303ab934b1386cad1f62ea6e2200ab7be7d78 Mon Sep 17 00:00:00 2001
+From: Wolfram Sang <w....@pe...>
+Date: Tue, 27 Sep 2011 22:35:40 +0200
+Subject: watchdog: add new driver for STMP3xxx and i.MX23/28
+
+Replace the existing STMP3xxx driver because it has enough drawbacks
+that a rewrite is apropriate. The new driver is designed to use the
+watchdog framework which makes it a lot smaller and avoids open coding
+the watchdog API again. It also uses now an explicitly exported function
+from the RTC driver to set up its registers (the old driver silently
+reused the hopefully(!) already remapped RTC registers). Also, this
+driver is mach independent, while the old one depends on a mach replaced
+by another one a year ago. Since the user interface is still the
+standard watchdog API, users don't need to adapt.
+
+Signed-off-by: Wolfram Sang <w....@pe...>
+Signed-off-by: Wim Van Sebroeck <wi...@ig...>
+
+diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
+index 7f61687..8792321 100644
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -326,6 +326,16 @@ config STMP3XXX_WATCHDOG
+ To compile this driver as a module, choose M here: the
+ module will be called stmp3xxx_wdt.
+
++config STMP3XXX_RTC_WATCHDOG
++ tristate "Freescale STMP3XXX & i.MX23/28 watchdog"
++ depends on RTC_DRV_STMP
++ select WATCHDOG_CORE
++ help
++ Say Y here to include support for the watchdog timer inside
++ the RTC for the STMP37XX/378X or i.MX23/28 SoC.
++ To compile this driver as a module, choose M here: the
++ module will be called stmp3xxx_rtc_wdt.
++
+ config NUC900_WATCHDOG
+ tristate "Nuvoton NUC900 watchdog"
+ depends on ARCH_W90X900
+diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
+index f7a612c..f1fc6a1 100644
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -49,6 +49,7 @@ obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
+ obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
+ obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
+ obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
++obj-$(CONFIG_STMP3XXX_RTC_WATCHDOG) += stmp3xxx_rtc_wdt.o
+ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
+ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
+ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
+diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c
+new file mode 100644
+index 0000000..c97e98d
+--- /dev/null
++++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c
+@@ -0,0 +1,111 @@
++/*
++ * Watchdog driver for the RTC based watchdog in STMP3xxx and i.MX23/28
++ *
++ * Author: Wolfram Sang <w....@pe...>
++ *
++ * Copyright (C) 2011-12 Wolfram Sang, Pengutronix
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 as published by
++ * the Free Software Foundation.
++ */
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/miscdevice.h>
++#include <linux/watchdog.h>
++#include <linux/platform_device.h>
++#include <linux/stmp3xxx_rtc_wdt.h>
++
++#define WDOG_TICK_RATE 1000 /* 1 kHz clock */
++#define STMP3XXX_DEFAULT_TIMEOUT 19
++#define STMP3XXX_MAX_TIMEOUT (UINT_MAX / WDOG_TICK_RATE)
++
++static int heartbeat = STMP3XXX_DEFAULT_TIMEOUT;
++module_param(heartbeat, uint, 0);
++MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to "
++ __MODULE_STRING(STMP3XXX_MAX_TIMEOUT) ", default "
++ __MODULE_STRING(STMP3XXX_DEFAULT_TIMEOUT));
++
++static int wdt_start(struct watchdog_device *wdd)
++{
++ struct device *dev = watchdog_get_drvdata(wdd);
++ struct stmp3xxx_wdt_pdata *pdata = dev->platform_data;
++
++ pdata->wdt_set_timeout(dev->parent, wdd->timeout * WDOG_TICK_RATE);
++ return 0;
++}
++
++static int wdt_stop(struct watchdog_device *wdd)
++{
++ struct device *dev = watchdog_get_drvdata(wdd);
++ struct stmp3xxx_wdt_pdata *pdata = dev->platform_data;
++
++ pdata->wdt_set_timeout(dev->parent, 0);
++ return 0;
++}
++
++static int wdt_set_timeout(struct watchdog_device *wdd, unsigned new_timeout)
++{
++ wdd->timeout = new_timeout;
++ return wdt_start(wdd);
++}
++
++static const struct watchdog_info stmp3xxx_wdt_ident = {
++ .options = WDIOF_MAGICCLOSE | WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
++ .identity = "STMP3XXX RTC Watchdog",
++};
++
++static const struct watchdog_ops stmp3xxx_wdt_ops = {
++ .owner = THIS_MODULE,
++ .start = wdt_start,
++ .stop = wdt_stop,
++ .set_timeout = wdt_set_timeout,
++};
++
++static struct watchdog_device stmp3xxx_wdd = {
++ .info = &stmp3xxx_wdt_ident,
++ .ops = &stmp3xxx_wdt_ops,
++ .min_timeout = 1,
++ .max_timeout = STMP3XXX_MAX_TIMEOUT,
++ .status = WATCHDOG_NOWAYOUT_INIT_STATUS,
++};
++
++static int stmp3xxx_wdt_probe(struct platform_device *pdev)
++{
++ int ret;
++
++ watchdog_set_drvdata(&stmp3xxx_wdd, &pdev->dev);
++
++ stmp3xxx_wdd.timeout = clamp_t(unsigned, heartbeat, 1, STMP3XXX_MAX_TIMEOUT);
++
++ ret = watchdog_register_device(&stmp3xxx_wdd);
++ if (ret < 0) {
++ dev_err(&pdev->dev, "cannot register watchdog device\n");
++ return ret;
++ }
++
++ dev_info(&pdev->dev, "initialized watchdog with heartbeat %ds\n",
++ stmp3xxx_wdd.timeout);
++ return 0;
++}
++
++static int stmp3xxx_wdt_remove(struct platform_device *pdev)
++{
++ watchdog_unregister_device(&stmp3xxx_wdd);
++ return 0;
++}
++
++static struct platform_driver stmp3xxx_wdt_driver = {
++ .driver = {
++ .name = "stmp3xxx_rtc_wdt",
++ },
++ .probe = stmp3xxx_wdt_probe,
++ .remove = stmp3xxx_wdt_remove,
++};
++module_platform_driver(stmp3xxx_wdt_driver);
++
++MODULE_DESCRIPTION("STMP3XXX RTC Watchdog Driver");
++MODULE_LICENSE("GPL v2");
++MODULE_AUTHOR("Wolfram Sang <w....@pe...>");
++MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+--
+cgit v0.10.1
+
diff --git a/patches/linux/3.4/808-pengutronix-watchdog-remove-old-STMP3xxx-driver.patch b/patches/linux/3.4/808-pengutronix-watchdog-remove-old-STMP3xxx-driver.patch
new file mode 100644
index 0000000..bfc24a9
--- /dev/null
+++ b/patches/linux/3.4/808-pengutronix-watchdog-remove-old-STMP3xxx-driver.patch
@@ -0,0 +1,339 @@
+From e4504daba1d9391968df4698406bb81318b340a0 Mon Sep 17 00:00:00 2001
+From: Wolfram Sang <w....@pe...>
+Date: Tue, 27 Sep 2011 22:53:15 +0200
+Subject: watchdog: remove old STMP3xxx driver
+
+Now that the new driver is in place, we can remove the old one.
+
+Signed-off-by: Wolfram Sang <w....@pe...>
+Signed-off-by: Wim Van Sebroeck <wi...@ig...>
+
+diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
+index 8792321..100caabf 100644
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -317,15 +317,6 @@ config TWL4030_WATCHDOG
+ Support for TI TWL4030 watchdog. Say 'Y' here to enable the
+ watchdog timer support for TWL4030 chips.
+
+-config STMP3XXX_WATCHDOG
+- tristate "Freescale STMP3XXX watchdog"
+- depends on ARCH_STMP3XXX
+- help
+- Say Y here if to include support for the watchdog timer
+- for the Sigmatel STMP37XX/378X SoC.
+- To compile this driver as a module, choose M here: the
+- module will be called stmp3xxx_wdt.
+-
+ config STMP3XXX_RTC_WATCHDOG
+ tristate "Freescale STMP3XXX & i.MX23/28 watchdog"
+ depends on RTC_DRV_STMP
+diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
+index f1fc6a1..a300b94 100644
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -48,7 +48,6 @@ obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
+ obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
+ obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o
+ obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o
+-obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
+ obj-$(CONFIG_STMP3XXX_RTC_WATCHDOG) += stmp3xxx_rtc_wdt.o
+ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
+ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
+diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c
+deleted file mode 100644
+index 1f4f697..0000000
+--- a/drivers/watchdog/stmp3xxx_wdt.c
++++ /dev/null
+@@ -1,288 +0,0 @@
+-/*
+- * Watchdog driver for Freescale STMP37XX/STMP378X
+- *
+- * Author: Vitaly Wool <vi...@em...>
+- *
+- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
+- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
+- */
+-
+-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+-
+-#include <linux/init.h>
+-#include <linux/kernel.h>
+-#include <linux/fs.h>
+-#include <linux/miscdevice.h>
+-#include <linux/watchdog.h>
+-#include <linux/platform_device.h>
+-#include <linux/spinlock.h>
+-#include <linux/uaccess.h>
+-#include <linux/module.h>
+-
+-#include <mach/platform.h>
+-#include <mach/regs-rtc.h>
+-
+-#define DEFAULT_HEARTBEAT 19
+-#define MAX_HEARTBEAT (0x10000000 >> 6)
+-
+-/* missing bitmask in headers */
+-#define BV_RTC_PERSISTENT1_GENERAL__RTC_FORCE_UPDATER 0x80000000
+-
+-#define WDT_IN_USE 0
+-#define WDT_OK_TO_CLOSE 1
+-
+-#define WDOG_COUNTER_RATE 1000 /* 1 kHz clock */
+-
+-static DEFINE_SPINLOCK(stmp3xxx_wdt_io_lock);
+-static unsigned long wdt_status;
+-static const bool nowayout = WATCHDOG_NOWAYOUT;
+-static int heartbeat = DEFAULT_HEARTBEAT;
+-static unsigned long boot_status;
+-
+-static void wdt_enable(u32 value)
+-{
+- spin_lock(&stmp3xxx_wdt_io_lock);
+- __raw_writel(value, REGS_RTC_BASE + HW_RTC_WATCHDOG);
+- stmp3xxx_setl(BM_RTC_CTRL_WATCHDOGEN, REGS_RTC_BASE + HW_RTC_CTRL);
+- stmp3xxx_setl(BV_RTC_PERSISTENT1_GENERAL__RTC_FORCE_UPDATER,
+- REGS_RTC_BASE + HW_RTC_PERSISTENT1);
+- spin_unlock(&stmp3xxx_wdt_io_lock);
+-}
+-
+-static void wdt_disable(void)
+-{
+- spin_lock(&stmp3xxx_wdt_io_lock);
+- stmp3xxx_clearl(BV_RTC_PERSISTENT1_GENERAL__RTC_FORCE_UPDATER,
+- REGS_RTC_BASE + HW_RTC_PERSISTENT1);
+- stmp3xxx_clearl(BM_RTC_CTRL_WATCHDOGEN, REGS_RTC_BASE + HW_RTC_CTRL);
+- spin_unlock(&stmp3xxx_wdt_io_lock);
+-}
+-
+-static void wdt_ping(void)
+-{
+- wdt_enable(heartbeat * WDOG_COUNTER_RATE);
+-}
+-
+-static int stmp3xxx_wdt_open(struct inode *inode, struct file *file)
+-{
+- if (test_and_set_bit(WDT_IN_USE, &wdt_status))
+- return -EBUSY;
+-
+- clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+- wdt_ping();
+-
+- return nonseekable_open(inode, file);
+-}
+-
+-static ssize_t stmp3xxx_wdt_write(struct file *file, const char __user *data,
+- size_t len, loff_t *ppos)
+-{
+- if (len) {
+- if (!nowayout) {
+- size_t i;
+-
+- clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+-
+- for (i = 0; i != len; i++) {
+- char c;
+-
+- if (get_user(c, data + i))
+- return -EFAULT;
+- if (c == 'V')
+- set_bit(WDT_OK_TO_CLOSE, &wdt_status);
+- }
+- }
+- wdt_ping();
+- }
+-
+- return len;
+-}
+-
+-static const struct watchdog_info ident = {
+- .options = WDIOF_CARDRESET |
+- WDIOF_MAGICCLOSE |
+- WDIOF_SETTIMEOUT |
+- WDIOF_KEEPALIVEPING,
+- .identity = "STMP3XXX Watchdog",
+-};
+-
+-static long stmp3xxx_wdt_ioctl(struct file *file, unsigned int cmd,
+- unsigned long arg)
+-{
+- void __user *argp = (void __user *)arg;
+- int __user *p = argp;
+- int new_heartbeat, opts;
+- int ret = -ENOTTY;
+-
+- switch (cmd) {
+- case WDIOC_GETSUPPORT:
+- ret = copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
+- break;
+-
+- case WDIOC_GETSTATUS:
+- ret = put_user(0, p);
+- break;
+-
+- case WDIOC_GETBOOTSTATUS:
+- ret = put_user(boot_status, p);
+- break;
+-
+- case WDIOC_SETOPTIONS:
+- if (get_user(opts, p)) {
+- ret = -EFAULT;
+- break;
+- }
+- if (opts & WDIOS_DISABLECARD)
+- wdt_disable();
+- else if (opts & WDIOS_ENABLECARD)
+- wdt_ping();
+- else {
+- pr_debug("%s: unknown option 0x%x\n", __func__, opts);
+- ret = -EINVAL;
+- break;
+- }
+- ret = 0;
+- break;
+-
+- case WDIOC_KEEPALIVE:
+- wdt_ping();
+- ret = 0;
+- break;
+-
+- case WDIOC_SETTIMEOUT:
+- if (get_user(new_heartbeat, p)) {
+- ret = -EFAULT;
+- break;
+- }
+- if (new_heartbeat <= 0 || new_heartbeat > MAX_HEARTBEAT) {
+- ret = -EINVAL;
+- break;
+- }
+-
+- heartbeat = new_heartbeat;
+- wdt_ping();
+- /* Fall through */
+-
+- case WDIOC_GETTIMEOUT:
+- ret = put_user(heartbeat, p);
+- break;
+- }
+- return ret;
+-}
+-
+-static int stmp3xxx_wdt_release(struct inode *inode, struct file *file)
+-{
+- int ret = 0;
+-
+- if (!nowayout) {
+- if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status)) {
+- wdt_ping();
+- pr_debug("%s: Device closed unexpectedly\n", __func__);
+- ret = -EINVAL;
+- } else {
+- wdt_disable();
+- clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
+- }
+- }
+- clear_bit(WDT_IN_USE, &wdt_status);
+-
+- return ret;
+-}
+-
+-static const struct file_operations stmp3xxx_wdt_fops = {
+- .owner = THIS_MODULE,
+- .llseek = no_llseek,
+- .write = stmp3xxx_wdt_write,
+- .unlocked_ioctl = stmp3xxx_wdt_ioctl,
+- .open = stmp3xxx_wdt_open,
+- .release = stmp3xxx_wdt_release,
+-};
+-
+-static struct miscdevice stmp3xxx_wdt_miscdev = {
+- .minor = WATCHDOG_MINOR,
+- .name = "watchdog",
+- .fops = &stmp3xxx_wdt_fops,
+-};
+-
+-static int __devinit stmp3xxx_wdt_probe(struct platform_device *pdev)
+-{
+- int ret = 0;
+-
+- if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
+- heartbeat = DEFAULT_HEARTBEAT;
+-
+- boot_status = __raw_readl(REGS_RTC_BASE + HW_RTC_PERSISTENT1) &
+- BV_RTC_PERSISTENT1_GENERAL__RTC_FORCE_UPDATER;
+- boot_status = !!boot_status;
+- stmp3xxx_clearl(BV_RTC_PERSISTENT1_GENERAL__RTC_FORCE_UPDATER,
+- REGS_RTC_BASE + HW_RTC_PERSISTENT1);
+- wdt_disable(); /* disable for now */
+-
+- ret = misc_register(&stmp3xxx_wdt_miscdev);
+- if (ret < 0) {
+- dev_err(&pdev->dev, "cannot register misc device\n");
+- return ret;
+- }
+-
+- pr_info("initialized, heartbeat %d sec\n", heartbeat);
+-
+- return ret;
+-}
+-
+-static int __devexit stmp3xxx_wdt_remove(struct platform_device *pdev)
+-{
+- misc_deregister(&stmp3xxx_wdt_miscdev);
+- return 0;
+-}
+-
+-#ifdef CONFIG_PM
+-static int wdt_suspended;
+-static u32 wdt_saved_time;
+-
+-static int stmp3xxx_wdt_suspend(struct platform_device *pdev,
+- pm_message_t state)
+-{
+- if (__raw_readl(REGS_RTC_BASE + HW_RTC_CTRL) &
+- BM_RTC_CTRL_WATCHDOGEN) {
+- wdt_suspended = 1;
+- wdt_saved_time = __raw_readl(REGS_RTC_BASE + HW_RTC_WATCHDOG);
+- wdt_disable();
+- }
+- return 0;
+-}
+-
+-static int stmp3xxx_wdt_resume(struct platform_device *pdev)
+-{
+- if (wdt_suspended) {
+- wdt_enable(wdt_saved_time);
+- wdt_suspended = 0;
+- }
+- return 0;
+-}
+-#else
+-#define stmp3xxx_wdt_suspend NULL
+-#define stmp3xxx_wdt_resume NULL
+-#endif
+-
+-static struct platform_driver platform_wdt_driver = {
+- .driver = {
+- .name = "stmp3xxx_wdt",
+- },
+- .probe = stmp3xxx_wdt_probe,
+- .remove = __devexit_p(stmp3xxx_wdt_remove),
+- .suspend = stmp3xxx_wdt_suspend,
+- .resume = stmp3xxx_wdt_resume,
+-};
+-
+-module_platform_driver(platform_wdt_driver);
+-
+-MODULE_DESCRIPTION("STMP3XXX Watchdog Driver");
+-MODULE_LICENSE("GPL");
+-
+-module_param(heartbeat, int, 0);
+-MODULE_PARM_DESC(heartbeat,
+- "Watchdog heartbeat period in seconds from 1 to "
+- __MODULE_STRING(MAX_HEARTBEAT) ", default "
+- __MODULE_STRING(DEFAULT_HEARTBEAT));
+-
+-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+--
+cgit v0.10.1
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-04-22 16:06:41
|
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 6845a28396b7db9bec99983e2226725b3d576d0a (commit)
from c55e59a95951b864b9917c9ad48a23c3a0f2fda6 (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 6845a28396b7db9bec99983e2226725b3d576d0a
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Apr 22 10:16:13 2014 +0200
[LINUX] apf6: move to 3.15-rc2
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...-3.15-rc1.config => apf6-linux-3.15-rc2.config} | 0
patches/linux/{3.15-rc1 => 3.15-rc2} | 0
3 files changed, 1 insertions(+), 1 deletions(-)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.15-rc1.config => apf6-linux-3.15-rc2.config} (100%)
rename patches/linux/{3.15-rc1 => 3.15-rc2} (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 7a3fa2a..967b4d7 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -22,7 +22,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15-rc1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15-rc2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc1.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc1.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc2.config
diff --git a/patches/linux/3.15-rc1 b/patches/linux/3.15-rc2
similarity index 100%
rename from patches/linux/3.15-rc1
rename to patches/linux/3.15-rc2
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-04-21 09:43:40
|
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 c55e59a95951b864b9917c9ad48a23c3a0f2fda6 (commit)
via 12752a6e9cf40e94b5663d00d61f81e8d97dc7e5 (commit)
via 307877b00ec622200054c844ff3c96e3577b8dc1 (commit)
from b81811d4893d0b906fcdb836ec1b2a253f05f15a (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 c55e59a95951b864b9917c9ad48a23c3a0f2fda6
Author: Philippe Reynes <tr...@ya...>
Date: Sun Apr 20 14:39:20 2014 +0200
[LINUX] 3.10: move to 3.10.37
commit 12752a6e9cf40e94b5663d00d61f81e8d97dc7e5
Author: Philippe Reynes <tr...@ya...>
Date: Wed Apr 16 21:41:02 2014 +0200
[LINUX] 3.13: move to 3.13.10
commit 307877b00ec622200054c844ff3c96e3577b8dc1
Author: Philippe Reynes <tr...@ya...>
Date: Wed Apr 16 21:41:01 2014 +0200
[LINUX] 3.14: move to 3.14.1
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.36.config => apf27-linux-3.10.37.config} | 0
...ux-3.13.9.config => apf27-linux-3.13.10.config} | 0
.../armadeus/apf27/apf27-linux-3.14.1.config | 1 +
...x-3.10.36.config => apf28-linux-3.10.37.config} | 0
...ux-3.13.9.config => apf28-linux-3.13.10.config} | 0
.../armadeus/apf28/apf28-linux-3.14.1.config | 1 +
...x-3.10.36.config => apf51-linux-3.10.37.config} | 0
...ux-3.13.9.config => apf51-linux-3.13.10.config} | 0
...x-3.14-rc4.config => apf51-linux-3.14.1.config} | 0
patches/linux/{3.10.36 => 3.10.37} | 0
patches/linux/{3.13.9 => 3.13.10} | 0
patches/linux/3.14.1 | 1 +
15 files changed, 9 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.36.config => apf27-linux-3.10.37.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.13.9.config => apf27-linux-3.13.10.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.14.1.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.36.config => apf28-linux-3.10.37.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.13.9.config => apf28-linux-3.13.10.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.14.1.config
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.36.config => apf51-linux-3.10.37.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.13.9.config => apf51-linux-3.13.10.config} (100%)
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.14-rc4.config => apf51-linux-3.14.1.config} (100%)
rename patches/linux/{3.10.36 => 3.10.37} (100%)
rename patches/linux/{3.13.9 => 3.13.10} (100%)
create mode 120000 patches/linux/3.14.1
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 7d28e54..06201ce 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.9"
+BR2_DEFAULT_KERNEL_VERSION="3.14.1"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 3985fc9..865b103 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.9"
+BR2_DEFAULT_KERNEL_VERSION="3.14.1"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 2dd928e..aec57a6 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.9"
+BR2_DEFAULT_KERNEL_VERSION="3.14.1"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.37.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.36.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.37.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.9.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.13.9.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.13.10.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.1.config
new file mode 120000
index 0000000..22d6c37
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.1.config
@@ -0,0 +1 @@
+apf27-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.36.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.37.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.36.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.37.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.9.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.13.9.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.13.10.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.1.config
new file mode 120000
index 0000000..18126c3
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.1.config
@@ -0,0 +1 @@
+apf28-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.36.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.37.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.36.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.37.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.9.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.13.9.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.13.10.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.1.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.1.config
diff --git a/patches/linux/3.10.36 b/patches/linux/3.10.37
similarity index 100%
rename from patches/linux/3.10.36
rename to patches/linux/3.10.37
diff --git a/patches/linux/3.13.9 b/patches/linux/3.13.10
similarity index 100%
rename from patches/linux/3.13.9
rename to patches/linux/3.13.10
diff --git a/patches/linux/3.14.1 b/patches/linux/3.14.1
new file mode 120000
index 0000000..3767b4b
--- /dev/null
+++ b/patches/linux/3.14.1
@@ -0,0 +1 @@
+3.14
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-04-14 15:31:07
|
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 b81811d4893d0b906fcdb836ec1b2a253f05f15a (commit)
from 9d225a2f73634dd888211fb1fecd92ee8053285b (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 b81811d4893d0b906fcdb836ec1b2a253f05f15a
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Apr 14 17:27:49 2014 +0200
[LINUX] 3.15: add 3.15-rc1
The following patches have been removed because they are mainlined or no
more needed:
0206-c-imx-dts-pin_functions.patch
0206-d-linaro-dts-imx27-pinctrl.patch
0206-e-linaro-imx27-enable_pinctrl.patch
0207-armadeus-apf27dev-add_hog_pinctrl.patch
0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
0213-armadeus-add_cspi_pinctrl.patch
0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
0443-armadeus-apf28-fix_mac_address_issue.patch
0455-linux-arm-freescale-ARM-dts-mx6qdl-Add-HDMI-support.patch
0456-linux-arm-freescale-ARM-dts-imx6qdl-wandboard-Add-HDMI.patch
0503-1-4-ARM-dts-imx6qdl-add-aliases-for-can-interfaces.patch
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
.../armadeus/apf27/apf27-linux-3.15-rc1.config | 1 +
...7-linux-3.13.config => apf27-linux-3.15.config} | 0
.../armadeus/apf28/apf28-linux-3.15-rc1.config | 1 +
...8-linux-3.14.config => apf28-linux-3.15.config} | 0
.../armadeus/apf51/apf51-linux-3.15-rc1.config | 1 +
...1-linux-3.13.config => apf51-linux-3.15.config} | 0
.../armadeus/apf6/apf6-linux-3.15-rc1.config | 1 +
.../device/armadeus/apf6/apf6-linux-3.15.config | 283 +
patches/linux/3.15-rc1 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch |19265 ++++++++++++++++++++
patches/linux/3.15/0021-armadeus-apf9328.patch | 1088 ++
...s-apf9328-add_board_to_linux_build_system.patch | 60 +
.../3.15/0025-armadeus-imx-correct_dma_shift.patch | 18 +
.../0029-armadeus-add_csi_and_spi_registers.patch | 14 +
.../3.15/0029b-armadeus-add_csi_registers.patch | 29 +
...rmadeus-devices-imx1-add_udc_registration.patch | 17 +
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 112 +
...50-armadeus-add_custom_drivers_to_kconfig.patch | 25 +
.../{3.10 => 3.15}/0073-armadeus-tsc2102.patch | 0
...02_integrate_driver_to_linux_build_system.patch | 31 +
...chscreen-add_driver_to_linux_build_system.patch | 37 +
.../0074-armadeus-tsc2102-touchscreen.patch | 0
.../0075-armadeus-spi2-reg-defines.patch | 0
.../0076-Add-tsc210x-device-tree-support.patch | 116 +
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 33 +
...madeus-clock-imx1_avoid_crash_with_module.tofix | 12 +
...re_to_setup_PWM_Contrast_Control_Register.tofix | 49 +
...-tsc210x-device-tree-support-for-apf27dev.patch | 33 +
...deus-dts-apf27dev-fixes-user-led-polarity.patch | 17 +
...1-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch | 27 +
...dts-apf27dev-add_gpio_key_wakeup_behavior.patch | 17 +
...-armadeus-fixes-vpu-spll-clock-dependency.patch | 18 +
.../0322-armadeus-add_mach_fpga_h.patch | 0
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 26 +
.../3.15/0400-Add-apf51-basic-dt-support.patch | 61 +
.../0401-armadeus-add_apf51dev_baseboard.patch | 76 +
...-imx51_dts-add_usbphy_for_host1_and_host2.patch | 37 +
...51-chipidea-usbmisc_imx-add_imx51_support.patch | 143 +
...adeus-chipidea-add_node_to_select_clk_phy.patch | 29 +
...us-imx51-dts-add-pin-definition-for-uart1.patch | 29 +
...imx-drm-fix_clk_polarity_for_apf51_screen.patch | 15 +
...dts-apf51dev-add_gpio_key_wakeup_behavior.patch | 34 +
.../3.15/0420-armadeus-Add-apf28dev-dts.patch | 45 +
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 17 +
..._star_completion_for_source_in_menuconfig.patch | 81 +
...low_to_use_the_wakeupalarm_functionnality.patch | 22 +
.../3.15/0444-armadeus-imx27-add-usb.patch.tofix | 212 +
...deus-add-apf27-apf27dev-dts-for-USB.patch.tofix | 147 +
.../0446-armadeus_add_pm_power_off_function.patch | 39 +
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 644 +
...around-fec-tx-queue-timeouts-when-SATA-SD.patch | 50 +
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 154 +
...6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch | 116 +
...-remove-pwr_in_suspend-from-platform-data.patch | 92 +
...-instead-of-enumerations-for-pdata-clocks.patch | 210 +
...al-device-tree-support-to-the-sdio-module.patch | 143 +
...-8-wlcore-sdio-add-wilink-clock-providers.patch | 75 +
...8-wlcore-sdio-get-clocks-from-device-tree.patch | 114 +
...heck-if-we-got-correct-clock-data-from-DT.patch | 124 +
...umentation-dt-bindings-TI-WiLink-modules.patch} | 0
...i-add-platfrom-get_max_timeout_count-hook.patch | 60 +
...mx-fix-incorrect-max_discard_to-for-uSDHC.patch | 54 +
...5-mmc-sdhci-add-platform-set_timeout-hook.patch | 84 +
...t-the-correct-max-timeout-value-for-uSDHC.patch | 62 +
...y-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch | 124 +
...04-armadeus-add_sx8674_touchscreen_driver.patch | 0
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 0
68 files changed, 24426 insertions(+), 1 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc1.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.13.config => apf27-linux-3.15.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc1.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.config => apf28-linux-3.15.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc1.config
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.13.config => apf51-linux-3.15.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc1.config
create mode 100644 buildroot/target/device/armadeus/apf6/apf6-linux-3.15.config
create mode 120000 patches/linux/3.15-rc1
create mode 100644 patches/linux/3.15/0015-armadeus-logo-add_armadeus-project_tux.patch
create mode 100644 patches/linux/3.15/0021-armadeus-apf9328.patch
create mode 100644 patches/linux/3.15/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
create mode 100644 patches/linux/3.15/0025-armadeus-imx-correct_dma_shift.patch
create mode 100644 patches/linux/3.15/0029-armadeus-add_csi_and_spi_registers.patch
create mode 100644 patches/linux/3.15/0029b-armadeus-add_csi_registers.patch
create mode 100644 patches/linux/3.15/0030-armadeus-devices-imx1-add_udc_registration.patch
create mode 100644 patches/linux/3.15/0035-armadeus-re_add_pwm_and_correct_driver.tofix
create mode 100644 patches/linux/3.15/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy patches/linux/{3.10 => 3.15}/0073-armadeus-tsc2102.patch (100%)
create mode 100644 patches/linux/3.15/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
create mode 100644 patches/linux/3.15/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy patches/linux/{3.10 => 3.15}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.10 => 3.15}/0075-armadeus-spi2-reg-defines.patch (100%)
create mode 100644 patches/linux/3.15/0076-Add-tsc210x-device-tree-support.patch
create mode 100644 patches/linux/3.15/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
create mode 100644 patches/linux/3.15/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
create mode 100644 patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
create mode 100644 patches/linux/3.15/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
create mode 100644 patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
create mode 100644 patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
create mode 100644 patches/linux/3.15/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
create mode 100644 patches/linux/3.15/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
copy patches/linux/{3.10 => 3.15}/0322-armadeus-add_mach_fpga_h.patch (100%)
create mode 100644 patches/linux/3.15/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
create mode 100644 patches/linux/3.15/0400-Add-apf51-basic-dt-support.patch
create mode 100644 patches/linux/3.15/0401-armadeus-add_apf51dev_baseboard.patch
create mode 100644 patches/linux/3.15/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
create mode 100644 patches/linux/3.15/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
create mode 100644 patches/linux/3.15/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
create mode 100644 patches/linux/3.15/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
create mode 100644 patches/linux/3.15/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
create mode 100644 patches/linux/3.15/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
create mode 100644 patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
create mode 100644 patches/linux/3.15/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
create mode 100644 patches/linux/3.15/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
create mode 100644 patches/linux/3.15/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
create mode 100644 patches/linux/3.15/0444-armadeus-imx27-add-usb.patch.tofix
create mode 100644 patches/linux/3.15/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
create mode 100644 patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch
create mode 100644 patches/linux/3.15/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
create mode 100644 patches/linux/3.15/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
create mode 100644 patches/linux/3.15/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
create mode 100644 patches/linux/3.15/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
create mode 100644 patches/linux/3.15/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
create mode 100644 patches/linux/3.15/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
create mode 100644 patches/linux/3.15/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
create mode 100644 patches/linux/3.15/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
create mode 100644 patches/linux/3.15/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
create mode 100644 patches/linux/3.15/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
copy patches/linux/{3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch => 3.15/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch} (100%)
create mode 100644 patches/linux/3.15/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch
create mode 100644 patches/linux/3.15/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch
create mode 100644 patches/linux/3.15/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch
create mode 100644 patches/linux/3.15/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch
create mode 100644 patches/linux/3.15/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch
copy patches/linux/{3.14 => 3.15}/0504-armadeus-add_sx8674_touchscreen_driver.patch (100%)
copy patches/linux/{3.14 => 3.15}/0505-armadeus-add_mcp7940x_rtc_driver.patch (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 2b64c28..7a3fa2a 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -22,7 +22,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15-rc1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc1.config
new file mode 120000
index 0000000..badcea0
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15-rc1.config
@@ -0,0 +1 @@
+apf27-linux-3.15.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc1.config
new file mode 120000
index 0000000..3ba4223
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15-rc1.config
@@ -0,0 +1 @@
+apf28-linux-3.15.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.15.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc1.config
new file mode 120000
index 0000000..4865fee
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15-rc1.config
@@ -0,0 +1 @@
+apf51-linux-3.15.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.13.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.15.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc1.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc1.config
new file mode 120000
index 0000000..fadcb0d
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.15-rc1.config
@@ -0,0 +1 @@
+apf6-linux-3.15.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.15.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.15.config
new file mode 100644
index 0000000..414af30
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.15.config
@@ -0,0 +1,283 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_KERNEL_LZO=y
+CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_CGROUPS=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+CONFIG_PERF_EVENTS=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_ARCH_MULTI_V6=y
+CONFIG_ARCH_MXC=y
+CONFIG_MXC_DEBUG_BOARD=y
+# CONFIG_MACH_MX31ADS is not set
+# CONFIG_MACH_BUG is not set
+CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX53=y
+CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6SL=y
+CONFIG_PCI=y
+CONFIG_PCI_IMX6=y
+CONFIG_SMP=y
+CONFIG_VMSPLIT_2G=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_AEABI=y
+CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
+CONFIG_VFP=y
+CONFIG_NEON=y
+CONFIG_BINFMT_MISC=m
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TEST_SUSPEND=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_IPV6=y
+CONFIG_NETFILTER=y
+CONFIG_CAN=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_FLEXCAN=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_CFG80211=y
+CONFIG_NL80211_TESTMODE=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+CONFIG_IMX_WEIM=y
+CONFIG_CONNECTOR=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+# CONFIG_SCSI_PROC_FS is not set
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_IMX=y
+CONFIG_PATA_IMX=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+CONFIG_CS89x0=y
+CONFIG_CS89x0_PLATFORM=y
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_SMC91X=y
+CONFIG_SMC911X=y
+CONFIG_SMSC911X=y
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_AT803X_PHY=y
+# CONFIG_RTL_CARDS is not set
+CONFIG_WL_TI=y
+CONFIG_WL12XX=m
+CONFIG_WLCORE_SDIO=m
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=m
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_IMX=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_SX8674=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_MMA8450=y
+CONFIG_SERIO_SERPORT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_FSL_LPUART=y
+CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=y
+# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+CONFIG_I2C_IMX=y
+CONFIG_SPI=y
+CONFIG_SPI_IMX=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+CONFIG_IMX2_WDT=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_MC13XXX_SPI=y
+CONFIG_MFD_MC13XXX_I2C=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_DA9052=y
+CONFIG_REGULATOR_MC13783=y
+CONFIG_REGULATOR_MC13892=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=y
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+# CONFIG_DVB_AU8522_V4L is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+# CONFIG_DVB_TUNER_DIB0090 is not set
+# CONFIG_VGA_ARB is not set
+CONFIG_DRM=y
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_MX3 is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_PLATFORM=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_BACKLIGHT_GPIO=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_PCI is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_IMX_SOC=y
+CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_SPDIF=y
+CONFIG_HID_MULTITOUCH=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_MXS_PHY=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_MCP7940X=m
+CONFIG_RTC_DRV_SNVS=y
+CONFIG_DMADEVICES=y
+CONFIG_IMX_SDMA=y
+CONFIG_MXS_DMA=y
+CONFIG_STAGING=y
+CONFIG_DRM_IMX=y
+CONFIG_DRM_IMX_FB_HELPER=y
+CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
+CONFIG_DRM_IMX_LDB=y
+CONFIG_DRM_IMX_IPUV3_CORE=y
+CONFIG_DRM_IMX_IPUV3=y
+CONFIG_DRM_IMX_HDMI=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_PWM=y
+CONFIG_PWM_IMX=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+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_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+# CONFIG_MISC_FILESYSTEMS is not set
+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_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_UTF8=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_PROVE_LOCKING=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_FTRACE is not set
+# CONFIG_ARM_UNWIND is not set
+CONFIG_SECURITYFS=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_CCITT=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
diff --git a/patches/linux/3.15-rc1 b/patches/linux/3.15-rc1
new file mode 120000
index 0000000..230693c
--- /dev/null
+++ b/patches/linux/3.15-rc1
@@ -0,0 +1 @@
+3.15
\ No newline at end of file
diff --git a/patches/linux/3.15/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.15/0015-armadeus-logo-add_armadeus-project_tux.patch
new file mode 100644
index 0000000..744c0e0
--- /dev/null
+++ b/patches/linux/3.15/0015-armadeus-logo-add_armadeus-project_tux.patch
@@ -0,0 +1,19265 @@
+Index: linux-2.6.36/drivers/video/logo/Kconfig
+===================================================================
+--- linux-2.6.36.orig/drivers/video/logo/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/video/logo/Kconfig 2010-10-21 14:29:22.000000000 +0200
+@@ -82,4 +82,11 @@
+ depends on M32R
+ default y
+
++config LOGO_ARMADEUS_CLUT224
++ bool "224-color Armadeus Linux logo"
++ depends on ARM
++ default y
++ help
++ Choose this if you want to have the Armadeus Tux as boot logo
++
+ endif # LOGO
+Index: linux-2.6.36/drivers/video/logo/logo.c
+===================================================================
+--- linux-2.6.36.orig/drivers/video/logo/logo.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/video/logo/logo.c 2010-10-21 14:29:22.000000000 +0200
+@@ -100,6 +100,10 @@
+ /* M32R Linux logo */
+ logo = &logo_m32r_clut224;
+ #endif
++#ifdef CONFIG_LOGO_ARMADEUS_CLUT224
++ /* Armadeus Linux logo */
++ logo = &logo_armadeus_clut224;
++#endif
+ }
+ return logo;
+ }
+Index: linux-2.6.36/include/linux/linux_logo.h
+===================================================================
+--- linux-2.6.36.orig/include/linux/linux_logo.h 2010-10-21 14:42:43.000000000 +0200
++++ linux-2.6.36/include/linux/linux_logo.h 2010-10-21 14:45:46.000000000 +0200
+@@ -35,6 +35,7 @@
+ extern const struct linux_logo logo_linux_mono;
+ extern const struct linux_logo logo_linux_vga16;
+ extern const struct linux_logo logo_linux_clut224;
++extern const struct linux_logo logo_armadeus_clut224;
+ extern const struct linux_logo logo_blackfin_vga16;
+ extern const struct linux_logo logo_blackfin_clut224;
+ extern const struct linux_logo logo_dec_clut224;
+Index: linux-2.6.36/drivers/video/logo/Makefile
+===================================================================
+--- linux-2.6.36.orig/drivers/video/logo/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/video/logo/Makefile 2010-10-21 14:29:22.000000000 +0200
+@@ -15,6 +15,7 @@
+ obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
+ obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
+ obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
++obj-$(CONFIG_LOGO_ARMADEUS_CLUT224) += logo_armadeus_clut224.o
+
+ obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
+
+Index: linux-2.6.36/drivers/video/logo/logo_armadeus_clut224.ppm
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.36/drivers/video/logo/logo_armadeus_clut224.ppm 2010-10-21 14:29:22.000000000 +0200
+@@ -0,0 +1,19205 @@
++P3
++# CREATOR: The GIMP's PNM Filter Version 1.0
++# Armadeus project 224 colors Tux logo
++80 80
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++6
++6
++6
++10
++10
++10
++10
++10
++10
++10
++10
++10
++6
++6
++6
++6
++6
++6
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++10
++10
++10
++14
++14
++14
++22
++22
++22
++26
++26
++26
++30
++30
++30
++34
++34
++34
++30
++30
++30
++30
++30
++30
++26
++26
++26
++18
++18
++18
++14
++14
++14
++10
++10
++10
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++14
++14
++14
++26
++26
++26
++42
++42
++42
++54
++54
++54
++66
++66
++66
++78
++78
++78
++78
++78
++78
++78
++78
++78
++74
++74
++74
++66
++66
++66
++54
++54
++54
++42
++42
++42
++26
++26
++26
++18
++18
++18
++10
++10
++10
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++22
++22
++22
++42
++42
++42
++66
++66
++66
++86
++86
++86
++66
++66
++66
++38
++38
++38
++38
++38
++38
++22
++22
++22
++26
++26
++26
++34
++34
++34
++54
++54
++54
++66
++66
++66
++86
++86
++86
++70
++70
++70
++46
++46
++46
++26
++26
++26
++14
++14
++14
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++26
++26
++26
++50
++50
++50
++82
++82
++82
++58
++58
++58
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++54
++54
++54
++86
++86
++86
++66
++66
++66
++38
++38
++38
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++22
++22
++22
++50
++50
++50
++78
++78
++78
++34
++34
++34
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++70
++70
++70
++78
++78
++78
++46
++46
++46
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++42
++42
++42
++82
++82
++82
++26
++26
++26
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++14
++14
++14
++46
++46
++46
++34
++34
++34
++6
++6
++6
++2
++2
++6
++42
++42
++42
++78
++78
++78
++42
++42
++42
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++30
++30
++30
++66
++66
++66
++58
++58
++58
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++26
++26
++26
++86
++86
++86
++101
++101
++101
++46
++46
++46
++10
++10
++10
++2
++2
++6
++58
++58
++58
++70
++70
++70
++34
++34
++34
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++86
++86
++86
++10
++10
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++30
++30
++30
++94
++94
++94
++94
++94
++94
++58
++58
++58
++26
++26
++26
++2
++2
++6
++6
++6
++6
++78
++78
++78
++54
++54
++54
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++22
++22
++22
++62
++62
++62
++62
++62
++62
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++26
++26
++26
++54
++54
++54
++38
++38
++38
++18
++18
++18
++10
++10
++10
++2
++2
++6
++2
++2
++6
++34
++34
++34
++82
++82
++82
++38
++38
++38
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++30
++30
++30
++78
++78
++78
++30
++30
++30
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++10
++10
++10
++10
++10
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++78
++78
++78
++50
++50
++50
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++38
++38
++38
++86
++86
++86
++14
++14
++14
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++54
++54
++54
++66
++66
++66
++26
++26
++26
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++82
++82
++82
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++10
++10
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++14
++14
++14
++10
++10
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++18
++18
++18
++82
++82
++82
++34
++34
++34
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++86
++86
++86
++2
++2
++6
++2
++2
++6
++6
++6
++6
++6
++6
++6
++22
++22
++22
++34
++34
++34
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++18
++18
++18
++34
++34
++34
++10
++10
++10
++50
++50
++50
++22
++22
++22
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++10
++10
++10
++86
++86
++86
++42
++42
++42
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++86
++86
++86
++2
++2
++6
++2
++2
++6
++38
++38
++38
++116
++116
++116
++94
++94
++94
++22
++22
++22
++22
++22
++22
++2
++2
++6
++2
++2
++6
++2
++2
++6
++14
++14
++14
++86
++86
++86
++137
++137
++137
++161
++161
++161
++154
++153
++152
++38
++38
++38
++26
++26
++26
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++86
++86
++86
++46
++46
++46
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++86
++86
++86
++2
++2
++6
++14
++14
++14
++134
++134
++134
++198
++198
++198
++195
++195
++195
++116
++116
++116
++10
++10
++10
++2
++2
++6
++2
++2
++6
++6
++6
++6
++101
++98
++89
++187
++187
++187
++210
++210
++210
++218
++218
++218
++214
++214
++214
++134
++134
++134
++14
++14
++14
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++86
++86
++86
++50
++50
++50
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++86
++86
++86
++2
++2
++6
++54
++54
++54
++218
++218
++218
++195
++195
++195
++226
++226
++226
++246
++246
++246
++58
++58
++58
++2
++2
++6
++2
++2
++6
++30
++30
++30
++210
++210
++210
++253
++253
++253
++173
++173
++172
++123
++123
++123
++221
++221
++221
++234
++234
++234
++74
++74
++74
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++70
++70
++70
++58
++58
++58
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++46
++46
++46
++82
++82
++82
++2
++2
++6
++106
++106
++106
++171
++171
++170
++26
++26
++26
++86
++86
++86
++226
++226
++226
++123
++123
++123
++10
++10
++10
++14
++14
++14
++46
++46
++46
++231
++231
++231
++190
++190
++190
++6
++6
++6
++70
++70
++70
++90
++90
++90
++238
++238
++238
++159
++158
++157
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++70
++70
++70
++58
++58
++58
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++86
++86
++86
++6
++6
++6
++116
++116
++116
++106
++106
++106
++6
++6
++6
++70
++70
++70
++147
++147
++147
++127
++127
++127
++18
++18
++18
++38
++38
++38
++54
++54
++54
++221
++221
++221
++106
++106
++106
++2
++2
++6
++14
++14
++14
++46
++46
++46
++190
++190
++190
++198
++198
++198
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++74
++74
++74
++62
++62
++62
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++42
++42
++42
++94
++94
++94
++14
++14
++14
++101
++101
++101
++127
++127
++127
++2
++2
++6
++18
++18
++18
++116
++116
++116
++130
++98
++46
++121
++92
++8
++121
++92
++8
++100
++78
++10
++161
++161
++161
++106
++106
++106
++2
++2
++6
++2
++2
++6
++2
++2
++6
++195
++195
++195
++195
++195
++195
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++74
++74
++74
++62
++62
++62
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++1
++0
++0
++1
++0
++0
++1
++0
++0
++0
++0
++0
++1
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++38
++38
++38
++90
++90
++90
++14
++14
++14
++58
++58
++58
++210
++210
++210
++26
++26
++26
++52
++36
++6
++155
++116
++10
++226
++170
++11
++236
++186
++11
++225
++175
++15
++184
++144
++12
++215
++174
++15
++182
++146
++52
++37
++28
++9
++2
++2
++6
++70
++70
++70
++246
++246
++246
++137
++137
++137
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++70
++70
++70
++66
++66
++66
++26
++26
++26
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++38
++38
++38
++86
++86
++86
++14
++14
++14
++10
++10
++10
++195
++195
++195
++203
++179
++129
++192
++133
++9
++225
++175
++15
++239
++182
++13
++236
++190
++10
++232
++195
++16
++232
++200
++30
++245
++216
++46
++241
++208
++19
++232
++195
++16
++184
++144
++12
++203
++179
++129
++211
++206
++186
++42
++42
++42
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++50
++50
++50
++74
++74
++74
++30
++30
++30
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++34
++34
++34
++86
++86
++86
++14
++14
++14
++2
++2
++6
++121
++87
++25
++192
++133
++9
++219
++162
++10
++239
++182
++13
++236
++186
++11
++232
++195
++16
++241
++208
++19
++245
++216
++46
++245
++216
++46
++245
++216
++46
++246
++215
++20
++241
++208
++19
++241
++208
++19
++226
++184
++13
++121
++87
++25
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++50
++50
++50
++82
++82
++82
++34
++34
++34
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++34
++34
++34
++82
++82
++82
++30
++30
++30
++61
++42
++6
++180
++123
++7
++206
++145
++10
++230
++174
++11
++239
++182
++13
++236
++190
++10
++238
++202
++15
++241
++208
++19
++237
++201
++75
++245
++216
++46
++246
++215
++20
++246
++215
++20
++246
++215
++20
++226
++184
++13
++215
++174
++15
++184
++144
++12
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++26
++26
++26
++94
++94
++94
++42
++42
++42
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++30
++30
++30
++78
++78
++78
++50
++50
++50
++104
++69
++6
++192
++133
++9
++216
++158
++10
++236
++178
++12
++236
++186
++11
++232
++195
++16
++241
++208
++19
++245
++216
++46
++245
++216
++46
++246
++215
++20
++246
++215
++20
++241
++208
++19
++198
++155
++10
++200
++144
++11
++216
++158
++10
++155
++116
++10
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++6
++6
++6
++90
++90
++90
++54
++54
++54
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++30
++30
++30
++78
++78
++78
++46
++46
++46
++22
++22
++22
++137
++92
++6
++210
++164
++10
++239
++182
++13
++236
++190
++10
++238
++202
++15
++241
++208
++19
++246
++215
++20
++246
++215
++20
++241
++208
++19
++210
++164
++10
++185
++133
++11
++210
++150
++10
++216
++158
++10
++210
++150
++10
++100
++78
++10
++2
++2
++6
++6
++6
++6
++54
++54
++54
++14
++14
++14
++2
++2
++6
++2
++2
++6
++62
++62
++62
++74
++74
++74
++30
++30
++30
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++34
++34
++34
++78
++78
++78
++50
++50
++50
++6
++6
++6
++80
++60
++22
++139
++102
++15
++190
++146
++13
++226
++184
++13
++232
++200
++30
++232
++195
++16
++215
++174
++15
++190
++146
++13
++168
++122
++10
++192
++133
++9
++210
++150
++10
++213
++154
++11
++202
++158
++25
++168
++150
++104
++101
++98
++89
++2
++2
++6
++2
++2
++6
++78
++78
++78
++116
++116
++116
++58
++58
++58
++2
++2
++6
++22
++22
++22
++90
++90
++90
++46
++46
++46
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++38
++38
++38
++86
++86
++86
++50
++50
++50
++6
++6
++6
++127
++127
++127
++168
++150
++104
++156
++107
++11
++168
++122
++10
++198
++155
++10
++184
++144
++12
++197
++138
++11
++200
++144
++11
++206
++145
++10
++206
++145
++10
++197
++138
++11
++203
++179
++129
++195
++195
++195
++198
++198
++198
++173
++173
++172
++14
++14
++14
++2
++2
++6
++22
++22
++22
++116
++116
++116
++116
++116
++116
++22
++22
++22
++2
++2
++6
++74
++74
++74
++70
++70
++70
++30
++30
++30
++10
++10
++10
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++50
++50
++50
++101
++101
++101
++26
++26
++26
++10
++10
++10
++137
++137
++137
++190
++190
++190
++168
++150
++104
++156
++107
++11
++197
++138
++11
++200
++144
++11
++197
++138
++11
++192
++133
++9
++180
++123
++7
++190
++142
++34
++203
++179
++129
++187
++187
++187
++202
++202
++202
++221
++221
++221
++214
++214
++214
++66
++66
++66
++2
++2
++6
++2
++2
++6
++50
++50
++50
++62
++62
++62
++6
++6
++6
++2
++2
++6
++10
++10
++10
++90
++90
++90
++50
++50
++50
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++34
++34
++34
++74
++74
++74
++74
++74
++74
++2
++2
++6
++6
++6
++6
++144
++144
++144
++198
++198
++198
++190
++190
++190
++170
++164
++156
++154
++121
++60
++156
++107
++11
++156
++107
++11
++168
++124
++44
++168
++150
++104
++187
++187
++187
++190
++190
++190
++210
++210
++210
++246
++246
++246
++253
++253
++253
++253
++253
++253
++182
++182
++182
++6
++6
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++62
++62
++62
++74
++74
++74
++34
++34
++34
++14
++14
++14
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++10
++10
++10
++22
++22
++22
++54
++54
++54
++94
++94
++94
++18
++18
++18
++2
++2
++6
++46
++46
++46
++234
++234
++234
++221
++221
++221
++190
++190
++190
++190
++190
++190
++190
++190
++190
++187
++187
++187
++187
++187
++187
++190
++190
++190
++190
++190
++190
++195
++195
++195
++214
++214
++214
++242
++242
++242
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++82
++82
++82
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++14
++14
++14
++86
++86
++86
++54
++54
++54
++22
++22
++22
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++18
++18
++18
++46
++46
++46
++90
++90
++90
++46
++46
++46
++18
++18
++18
++6
++6
++6
++182
++182
++182
++253
++253
++253
++246
++246
++246
++206
++206
++206
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++190
++206
++206
++206
++231
++231
++231
++250
++250
++250
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++202
++202
++202
++14
++14
++14
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++42
++42
++42
++86
++86
++86
++42
++42
++42
++18
++18
++18
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++6
++6
++6
++14
++14
++14
++38
++38
++38
++74
++74
++74
++66
++66
++66
++2
++2
++6
++6
++6
++6
++90
++90
++90
++250
++250
++250
++253
++253
++253
++253
++253
++253
++238
++238
++238
++198
++198
++198
++190
++190
++190
++190
++190
++190
++195
++195
++195
++221
++221
++221
++246
++246
++246
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++82
++82
++82
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++2
++2
++6
++78
++78
++78
++70
++70
++70
++34
++34
++34
++14
++14
++14
++6
++6
++6
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++14
++14
++14
++34
++34
++34
++66
++66
++66
++78
++78
++78
++6
++6
++6
++2
++2
++6
++18
++18
++18
++218
++218
++218
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++246
++246
++246
++226
++226
++226
++231
++231
++231
++246
++246
++246
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++253
++179
++17...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2014-04-14 14:31:53
|
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 9d225a2f73634dd888211fb1fecd92ee8053285b (commit)
from 30fd948ed6b2da5b4539928d3628f4a1bc77c951 (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 9d225a2f73634dd888211fb1fecd92ee8053285b
Author: Philippe Reynes <tr...@ya...>
Date: Tue Apr 8 21:16:54 2014 +0200
[LINUX] 3.12: move to 3.12.17
-----------------------------------------------------------------------
Summary of changes:
...x-3.12.16.config => apf27-linux-3.12.17.config} | 0
...x-3.12.16.config => apf28-linux-3.12.17.config} | 0
...x-3.12.16.config => apf51-linux-3.12.17.config} | 0
patches/linux/{3.12.16 => 3.12.17} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.16.config => apf27-linux-3.12.17.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.16.config => apf28-linux-3.12.17.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.16.config => apf51-linux-3.12.17.config} (100%)
rename patches/linux/{3.12.16 => 3.12.17} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.16.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.17.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.16.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.17.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.16.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.17.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.16.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.17.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.16.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.17.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.16.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.17.config
diff --git a/patches/linux/3.12.16 b/patches/linux/3.12.17
similarity index 100%
rename from patches/linux/3.12.16
rename to patches/linux/3.12.17
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-04-11 14:21:09
|
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 30fd948ed6b2da5b4539928d3628f4a1bc77c951 (commit)
via d955bffcc773f46d7101bcadee79d1b2d0853bf6 (commit)
from 3c5da1522acb95b4f41facde82063b18aa389f57 (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 30fd948ed6b2da5b4539928d3628f4a1bc77c951
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Apr 11 16:14:34 2014 +0200
[LINUX] 3.14: apf6: dts: update device trees
- Add new devices: rtc, touchscreen controller, tft, sound.
- Make pinctrl nodes board specific. See [1].
[1] https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/arch/arm/boot/dts/imx6qdl.dtsi?id=817c27a128e18aed840adc295f988e1656fed7d1
commit d955bffcc773f46d7101bcadee79d1b2d0853bf6
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Apr 11 16:13:06 2014 +0200
[LINUX] 3.14: apf6: add driver for rtc and touchscreen controller.
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-linux-3.14.config | 10 +-
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 460 +++++++++++++++---
...04-armadeus-add_sx8674_touchscreen_driver.patch | 516 ++++++++++++++++++++
.../0505-armadeus-add_mcp7940x_rtc_driver.patch} | 134 +++---
4 files changed, 976 insertions(+), 144 deletions(-)
create mode 100644 patches/linux/3.14/0504-armadeus-add_sx8674_touchscreen_driver.patch
copy patches/linux/{common/000-armadeus-add_mcp7940x_rtc_driver.patch => 3.14/0505-armadeus-add_mcp7940x_rtc_driver.patch} (87%)
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
index 5cef7a5..5c39d1f 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
@@ -73,6 +73,7 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
CONFIG_IMX_WEIM=y
CONFIG_CONNECTOR=y
+CONFIG_PROC_DEVICETREE=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=65536
@@ -117,7 +118,7 @@ CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_EGALAX=y
+CONFIG_TOUCHSCREEN_SX8674=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_MMA8450=y
CONFIG_SERIO_SERPORT=m
@@ -127,8 +128,7 @@ CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_FSL_LPUART=y
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_MXC_RNGA=y
+# CONFIG_HW_RANDOM is not set
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_HELPER_AUTO is not set
@@ -163,6 +163,7 @@ CONFIG_VIDEO_CODA=y
# CONFIG_DVB_TUNER_DIB0090 is not set
# CONFIG_VGA_ARB is not set
CONFIG_DRM=y
+CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_MX3 is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
@@ -215,8 +216,7 @@ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_MC13XXX=y
-CONFIG_RTC_DRV_MXC=y
+CONFIG_RTC_DRV_MCP7940X=m
CONFIG_RTC_DRV_SNVS=y
CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
diff --git a/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 0c87e22..ee794ef 100644
--- a/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.14-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.14/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.14-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.14/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,11 +31,11 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.14/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,87 @@
++++ linux-3.14/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,129 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -48,6 +48,7 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
++#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ wlan {
@@ -71,63 +72,104 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+};
+
-+&iomuxc {
++&fec {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
++ pinctrl-0 = <&pinctrl_enet>;
++ phy-mode = "rgmii";
++ phy-reset-gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
++ status = "okay";
++};
+
-+ hog {
-+ pinctrl_hog: hoggrp {
++&iomuxc {
++ apf6 {
++ pinctrl_enet: enetgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
-+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
-+ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
++ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
++ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
++ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
++ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
++ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
++ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
++ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
++ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
++ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
++ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
++ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
++ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
++ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
++ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
++ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
++ MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0
++ MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24 0x80000000
+ >;
+ };
+
-+ pinctrl_uart2_3: uart2grp-3 {
++ pinctrl_uart2: uart2grp {
+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
++ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
+ >;
+ };
-+ };
-+};
+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_1>;
-+ phy-mode = "rgmii";
-+ status = "okay";
++ pinctrl_usdhc1: usdhc1grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17059
++ MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10059
++ MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
++ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
++ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
++ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ >;
++ };
++
++ pinctrl_usdhc3: usdhc3grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
++ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
++ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
++ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
++ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
++ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
++ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
++ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
++ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
++ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
++ >;
++ };
++ };
+};
+
+/* Bluetooth */
+&uart2 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart2_3>;
++ pinctrl-0 = <&pinctrl_uart2>;
+ status = "okay";
+};
+
+/* Wi-Fi */
+&usdhc1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc1_2>;
++ pinctrl-0 = <&pinctrl_usdhc1>;
+ status = "okay";
+};
+
+/* eMMC */
+&usdhc3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc3_1>;
++ pinctrl-0 = <&pinctrl_usdhc3>;
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.14/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,172 @@
++++ linux-3.14/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,434 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -139,79 +181,184 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ *
+ */
+
-+/ {
-+ regulators {
-+ compatible = "simple-bus";
++#include <dt-bindings/interrupt-controller/irq.h>
++#include <dt-bindings/gpio/gpio.h>
+
-+ reg_2p5v: 2p5v {
-+ compatible = "regulator-fixed";
-+ regulator-name = "2P5V";
-+ regulator-min-microvolt = <2500000>;
-+ regulator-max-microvolt = <2500000>;
-+ regulator-always-on;
++/ {
++ display@di0 {
++ compatible = "fsl,imx-parallel-display";
++ crtcs = <&ipu1 0>;
++ interface-pix-fmt = "bgr666";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ipu1>;
++
++ display-timings {
++ lw700 {
++ clock-frequency = <33000033>;
++ hactive = <800>;
++ vactive = <480>;
++ hback-porch = <96>;
++ hfront-porch = <96>;
++ vback-porch = <20>;
++ vfront-porch = <21>;
++ hsync-len = <64>;
++ vsync-len = <4>;
++ hsync-active = <1>;
++ vsync-active = <1>;
++ de-active = <1>;
++ pixelclk-active = <0>;
++ };
+ };
++ };
+
-+ reg_3p3v: 3p3v {
-+ compatible = "regulator-fixed";
-+ regulator-name = "3P3V";
-+ regulator-min-microvolt = <3300000>;
-+ regulator-max-microvolt = <3300000>;
-+ regulator-always-on;
++ 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>;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpio_leds>;
+
+ user-led {
+ label = "User LED";
-+ gpios = <&gpio7 12 0>;
++ gpios = <&gpio7 12 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ default-state = "on";
+ };
+ };
+
-+ keys {
-+ compatible = "gpio-keys";
++ regulators {
++ compatible = "simple-bus";
+
-+ user-button {
-+ label = "User button";
-+ gpios = <&gpio1 9 0>;
-+ linux,code = <100>;
++ reg_3p3v: 3p3v {
++ compatible = "regulator-fixed";
++ regulator-name = "3P3V";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ regulator-always-on;
++ };
++
++ reg_usbh1_vbus: usb-h1-vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usb_h1_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ regulator-always-on;
++ };
++
++ reg_otg_vbus: usb-otg-vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usb_otg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ regulator-always-on;
+ };
+ };
++
++ sound {
++ compatible = "fsl,imx6-armadeus-sgtl5000",
++ "fsl,imx-audio-sgtl5000";
++ model = "imx6-armadeus-sgtl5000";
++ ssi-controller = <&ssi1>;
++ audio-codec = <&codec>;
++ audio-routing =
++ "MIC_IN", "Mic Jack",
++ "Mic Jack", "Mic Bias",
++ "Headphone Jack", "HP_OUT";
++ mux-int-port = <1>;
++ mux-ext-port = <3>;
++ };
++
++ sound-spdif {
++ compatible = "fsl,imx-audio-spdif";
++ model = "imx-spdif";
++ spdif-controller = <&spdif>;
++ spdif-out;
++ };
++};
++
++&audmux {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_audmux>;
++ status = "okay";
+};
+
+&can2 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_flexcan2_1>;
++ pinctrl-0 = <&pinctrl_flexcan2>;
+ status = "okay";
+};
+
+&ecspi1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_ecspi1_2>;
++ pinctrl-0 = <&pinctrl_ecspi1>;
+ fsl,spi-num-chipselects = <3>;
-+ cs-gpios = <&gpio4 9 0>, <&gpio4 10 0>, <&gpio4 11 0>;
++ cs-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>,
++ <&gpio4 10 GPIO_ACTIVE_HIGH>,
++ <&gpio4 11 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+&hdmi {
-+ ddc = <&i2c1>;
++ ddc = <&i2c3>;
+ status = "okay";
+};
+
+&i2c1 {
-+ clock-frequency = <100000>;
++ clock-frequency = <400000>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c1_1>;
++ pinctrl-0 = <&pinctrl_i2c1>;
+ status = "okay";
++
++ touchscreen@48 {
++ compatible = "semtech,sx8654";
++ reg = <0x48>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_touchscreen>;
++ interrupt-parent = <&gpio6>;
++ interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
++ x-plate-ohms = <1100>;
++ y-plate-ohms = <500>;
++ min-x = <0>;
++ max-x = <800>;
++ min-y = <0>;
++ max-y = <480>;
++ };
+};
+
+&i2c2 {
-+ clock-frequency = <100000>;
++ clock-frequency = <400000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2>;
++ status = "okay";
++
++ rtc@6f {
++ compatible = "microchip,mcp7940x-rtc";
++ reg = <0x6F>;
++ };
++
++ codec: sgtl5000@0a {
++ compatible = "fsl,sgtl5000";
++ reg = <0x0a>;
++ clocks = <&clks 201>;
++ VDDA-supply = <®_3p3v>;
++ VDDIO-supply = <®_3p3v>;
++ };
++};
++
++&i2c3 {
++ clock-frequency = <400000>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_i2c2_2>;
++ pinctrl-0 = <&pinctrl_i2c3>;
+ status = "okay";
+};
+
@@ -222,16 +369,129 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x80000000
++ MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x80000000
++ MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x80000000
++ MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000
++ MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 0x80000000
++ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000
++ MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x80000000
++ MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19 0x80000000
++ MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x80000000
++ MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x80000000
++ >;
++ };
++ };
++
++ apf6dev {
++ pinctrl_audmux: audmuxgrp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x80000000
++ MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x80000000
++ MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x80000000
++ MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
++ MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
++ >;
++ };
++
++ pinctrl_ecspi1: ecspi1grp {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL1__ECSPI1_MISO 0x100b1
++ MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI 0x100b1
++ MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK 0x100b1
++ MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x80000000
++ MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x80000000
++ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x80000000
++ >;
++ };
++
++ pinctrl_flexcan2: flexcan2grp {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x80000000
++ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000
++ >;
++ };
++
++ pinctrl_gpio_keys: gpiokeysgrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ >;
++ };
++ pinctrl_gpio_leds: gpioledsgrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ >;
++ };
++
++ pinctrl_i2c1: i2c1grp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
++ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
++ >;
++ };
++
++ pinctrl_i2c2: i2c2grp {
++ fsl,pins = <
++ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
++ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
++ >;
++ };
++
++ pinctrl_i2c3: i2c3grp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
++ MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
++ >;
++ };
++
++ pinctrl_ipu1: ipu1grp {
++ fsl,pins = <
++ MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10
++ MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x10
++ MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x10
++ MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x10
++ MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04 0x80000000
++ MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x10
++ MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x10
++ MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x10
++ MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x10
++ MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x10
++ MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x10
++ MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x10
++ MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x10
++ MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x10
++ MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x10
++ MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x10
++ MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x10
++ MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x10
++ MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x10
++ MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x10
++ MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x10
++ MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x10
++ MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17 0x10
++ >;
++ };
++
++ pinctrl_pcie: pciegrp {
++ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
-+ MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x80000000
-+ MX6QDL_PAD_KEY_ROW2__GPIO4_IO11 0x80000000
-+ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x80000000
+ >;
+ };
+
-+ pinctrl_uart3_3: uart3grp-3 {
++ pinctrl_pwm3: pwm3grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart1: uart1grp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
++ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart3: uart3grp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
+ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
@@ -240,55 +500,88 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ >;
+ };
+
-+ pinctrl_uart4_2: uart4grp-2 {
++ pinctrl_uart4: uart4grp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+ >;
+ };
++
++ pinctrl_usbotg: usbotggrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
++ >;
++ };
++
++ pinctrl_usdhc2: usdhc2grp {
++ fsl,pins = <
++ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
++ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
++ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
++ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
++ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
++ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
++ >;
++ };
++
++ pinctrl_spdif: spdifgrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x1b0b0
++ >;
++ };
++
++ pinctrl_touchscreen: touchscreengrp {
++ fsl,pins = <
++ MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03 0x80000000
++ >;
++ };
+ };
+};
+
+&pcie {
-+ reset-gpio = <&gpio6 2 0>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pcie>;
++ reset-gpio = <&gpio6 2 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+};
+
+&pwm3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_pwm3_1>;
++ pinctrl-0 = <&pinctrl_pwm3>;
+ status = "okay";
+};
+
+/* GPS */
+&uart1 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart1_1>;
++ pinctrl-0 = <&pinctrl_uart1>;
+ status = "okay";
+};
+
+/* GSM */
+&uart3 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart3_3>;
++ pinctrl-0 = <&pinctrl_uart3>;
+ status = "okay";
+};
+
+/* console */
+&uart4 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_uart4_2>;
++ pinctrl-0 = <&pinctrl_uart4>;
+ status = "okay";
+};
+
+&usbh1 {
++ vbus-supply = <®_usbh1_vbus>;
++ dr_mode = "host";
+ status = "okay";
+};
+
+&usbotg {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usbotg_1>;
-+ disable-over-current;
++ pinctrl-0 = <&pinctrl_usbotg>;
++ vbus-supply = <®_otg_vbus>;
+ dr_mode = "otg";
+ status = "okay";
+};
@@ -296,14 +589,25 @@ Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+/* microSD */
+&usdhc2 {
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_usdhc2_2>;
-+ cd-gpios = <&gpio1 2 0>;
++ pinctrl-0 = <&pinctrl_usdhc2>;
++ cd-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
++ status = "okay";
++};
++
++&spdif {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_spdif>;
++ status = "okay";
++};
++
++&ssi1 {
++ fsl,mode = "i2s-slave";
+ status = "okay";
+};
-Index: linux-3.14-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.14/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.14-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.14/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
diff --git a/patches/linux/3.14/0504-armadeus-add_sx8674_touchscreen_driver.patch b/patches/linux/3.14/0504-armadeus-add_sx8674_touchscreen_driver.patch
new file mode 100644
index 0000000..36be0f4
--- /dev/null
+++ b/patches/linux/3.14/0504-armadeus-add_sx8674_touchscreen_driver.patch
@@ -0,0 +1,516 @@
+Index: linux-3.14/drivers/input/touchscreen/Kconfig
+===================================================================
+--- linux-3.14.orig/drivers/input/touchscreen/Kconfig
++++ linux-3.14/drivers/input/touchscreen/Kconfig
+@@ -944,6 +944,17 @@ config TOUCHSCREEN_TPS6507X
+ To compile this driver as a module, choose M here: the
+ module will be called tps6507x_ts.
+
++config TOUCHSCREEN_SX8674
++ tristate "Semtech SX8674 touchscreen controllers"
++ depends on I2C
++ help
++ Say Y here if you have a Semtech SX8674 touchscreen controller.
++
++ If unsure, say N
++
++ To compile this driver as a module, choose M here: the
++ module will be called sx8674.
++
+ config TOUCHSCREEN_ZFORCE
+ tristate "Neonode zForce infrared touchscreens"
+ depends on I2C
+Index: linux-3.14/drivers/input/touchscreen/Makefile
+===================================================================
+--- linux-3.14.orig/drivers/input/touchscreen/Makefile
++++ linux-3.14/drivers/input/touchscreen/Makefile
+@@ -55,6 +55,7 @@ obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c
+ obj-$(CONFIG_TOUCHSCREEN_ST1232) += st1232.o
+ obj-$(CONFIG_TOUCHSCREEN_STMPE) += stmpe-ts.o
+ obj-$(CONFIG_TOUCHSCREEN_SUR40) += sur40.o
++obj-$(CONFIG_TOUCHSCREEN_SX8674) += sx8674.o
+ obj-$(CONFIG_TOUCHSCREEN_TI_AM335X_TSC) += ti_am335x_tsc.o
+ obj-$(CONFIG_TOUCHSCREEN_TNETV107X) += tnetv107x-ts.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o
+Index: linux-3.14/drivers/input/touchscreen/sx8674.c
+===================================================================
+--- /dev/null
++++ linux-3.14/drivers/input/touchscreen/sx8674.c
+@@ -0,0 +1,477 @@
++/*
++ * drivers/input/touchscreen/sx8674.c
++ *
++ * Copyright (c) 2014 ARMadeus Systems
++ * Sébastien Szymanski <seb...@ar...>
++ *
++ *
++ * Using code from:
++ * - sx865x.c
++ * Copyright (c) 2013 U-MoBo Srl
++ * Pierluigi Passaro <p.p...@u-...>
++ * - sx8650.c
++ * Copyright (c) 2009 Wayne Roberts
++ * - tsc2007.c
++ * Copyright (c) 2008 Kwangwoo Lee
++ * - ads7846.c
++ * Copyright (c) 2005 David Brownell
++ * Copyright (c) 2006 Nokia Corporation
++ * - corgi_ts.c
++ * Copyright (C) 2004-2005 Richard Purdie
++ * - omap_ts.[hc], ads7846.h, ts_osk.c
++ * Copyright (C) 2002 MontaVista Software
++ * Copyright (C) 2004 Texas Instruments
++ * Copyright (C) 2005 Dirk Behme
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/i2c.h>
++#include <linux/init.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/irq.h>
++#include <linux/module.h>
++#include <linux/of_irq.h>
++#include <linux/slab.h>
++
++/* analog channels */
++#define CH_X 0
++#define CH_Y 1
++#define CH_Z1 2
++#define CH_Z2 3
++#define CH_RX 5
++#define CH_RY 6
++
++/* commands */
++#define CMD_READ_REGISTER 0x40
++#define CMD_PENTRG 0xe0
++
++/* register addresses */
++#define I2C_REG_TOUCH0 0x00
++#define I2C_REG_TOUCH1 0x01
++#define I2C_REG_TOUCH2 0x02
++#define I2C_REG_TOUCH3 0x03
++#define I2C_REG_CHANMASK 0x04
++#define I2C_REG_IRQMASK 0x22
++#define I2C_REG_IRQSRC 0x23
++#define I2C_REG_STAT 0x24
++#define I2C_REG_SOFTRESET 0x3f
++
++/* value for I2C_REG_SOFTRESET */
++#define SOFTRESET_VALUE 0xde
++
++/* bits for I2C_REG_IRQSRC */
++#define IRQ_HAPTSHORT (1 << 7)
++#define IRQ_PROXCLOSE (1 << 6)
++#define IRQ_PROXFAR_CONVDONE (1 << 5)
++#define IRQ_PROXCOMPDONE (1 << 4)
++#define IRQ_PENTOUCH_TOUCHCONVDONE (1 << 3)
++#define IRQ_PENRELEASE (1 << 2)
++#define IRQ_TEMPWARNING (1 << 1)
++#define IRQ_TEMPALARM (1 << 0)
++
++/* bits for RegTouch1 */
++#define CONDIRQ 0x20
++#define FILT_NONE 0x00 /* no averaging */
++#define FILT_3SA 0x01 /* 3 sample averaging */
++#define FILT_5SA 0x02 /* 5 sample averaging */
++#define FILT_7SA 0x03 /* 7 samples, sort, then average of 3 middle samples */
++
++/* bits for I2C_REG_CHANMASK */
++#define CONV_X 0x80
++#define CONV_Y 0x40
++#define CONV_Z1 0x20
++#define CONV_Z2 0x10
++#define CONV_AUX 0x08
++#define CONV_RX 0x04
++#define CONV_RY 0x02
++
++/* cordinantes rate: higher nibble of CTRL0 register */
++#define RATE_MANUAL 0x00
++#define RATE_10CPS 0x10
++#define RATE_20CPS 0x20
++#define RATE_40CPS 0x30
++#define RATE_60CPS 0x40
++#define RATE_80CPS 0x50
++#define RATE_100CPS 0x60
++#define RATE_200CPS 0x70
++#define RATE_300CPS 0x80
++#define RATE_400CPS 0x90
++#define RATE_500CPS 0xa0
++#define RATE_1000CPS 0xb0
++#define RATE_2000CPS 0xc0
++#define RATE_3000CPS 0xd0
++#define RATE_4000CPS 0xe0
++#define RATE_5000CPS 0xf0
++
++/* power delay: lower nibble of CTRL0 register */
++#define POWDLY_IMMEDIATE 0x00
++#define POWDLY_1_1US 0x01
++#define POWDLY_2_2US 0x02
++#define POWDLY_4_4US 0x03
++#define POWDLY_8_9US 0x04
++#define POWDLY_17_8US 0x05
++#define POWDLY_35_5US 0x06
++#define POWDLY_71US 0x07
++#define POWDLY_140US 0x08
++#define POWDLY_280US 0x09
++#define POWDLY_570US 0x0a
++#define POWDLY_1_1MS 0x0b
++#define POWDLY_2_3MS 0x0c
++#define POWDLY_4_6MS 0x0d
++#define POWDLY_9MS 0x0e
++#define POWDLY_18MS 0x0f
++
++#define MAX_12BIT ((1 << 12) - 1)
++
++/* when changing the channel mask, also change the read length appropriately */
++#define CHAN_SINGLETOUCH_MASK (CONV_X | CONV_Y | CONV_Z1 | CONV_Z2)
++#define CHAN_MULTITOUCH_MASK (CHAN_SINGLETOUCH_MASK | CONV_RX | CONV_RY)
++#define NUM_SINGLETOUCH_CHANS 4
++#define NUM_MULTITOUCH_CHANS 6
++#define NUM_MAX_CHANS NUM_MULTITOUCH_CHANS
++#define CHAN_READ_LENGTH(chans) (chans << 1)
++
++#define SX_MULTITOUCH 0x01
++#define SX_PROXIMITY_SENSING 0x02
++#define SX_HAPTICS_GENERIC 0x04
++#define SX_HAPTICS_IMMERSION 0x08
++
++struct ts_event {
++ u16 x, y;
++ u16 z1, z2;
++ u16 rx, ry;
++};
++
++struct sx8674 {
++ struct input_dev *input;
++ struct ts_event tc;
++
++ struct i2c_client *client;
++
++ struct workqueue_struct *ts_workq;
++ struct delayed_work pen_event_work;
++
++ u16 features;
++ u16 x_plate_ohms;
++ u16 y_plate_ohms;
++
++ int irq;
++};
++
++static const struct i2c_device_id sx8674_idtable[] = {
++ { "sx8654", SX_PROXIMITY_SENSING | SX_HAPTICS_GENERIC },
++ { "sx8674", SX_MULTITOUCH | SX_PROXIMITY_SENSING | SX_HAPTICS_GENERIC },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(i2c, sx8674_idtable);
++
++static int sx8674_read_values(struct sx8674 *ts)
++{
++ s32 data;
++ u16 vals[NUM_MAX_CHANS+1]; // +1 for last dummy read
++ int length, chan_read_length;
++ int i;
++
++ memset(&(ts->tc), 0, sizeof(ts->tc));
++ /* The protocol and raw data format from i2c interface:
++ * S Addr R A [DataLow] A [DataHigh] A (repeat) NA P
++ * Where DataLow has (channel | [D11-D8]), DataHigh has [D7-D0].
++ */
++ if (ts->features & SX_MULTITOUCH)
++ chan_read_length = CHAN_READ_LENGTH(NUM_MULTITOUCH_CHANS);
++ else
++ chan_read_length = CHAN_READ_LENGTH(NUM_SINGLETOUCH_CHANS);
++
++ length = i2c_master_recv(ts->client, (char *)vals, chan_read_length);
++
++ if (likely(length == chan_read_length)) {
++ length >>= 1;
++ for (i = 0; i < length; i++) {
++ u16 ch;
++ data = swab16(vals[i]);
++ if (unlikely(data & 0x8000)) {
++ dev_err(&ts->client->dev, "hibit @ %d [0x%04x]\n", i, data);
++ return -EAGAIN;
++ }
++ ch = data >> 12;
++ if (ch == CH_X)
++ ts->tc.x = data & 0xfff;
++ else if (ch == CH_Y)
++ ts->tc.y = data & 0xfff;
++ else if (ch == CH_Z1)
++ ts->tc.z1 = data & 0xfff;
++ else if (ch == CH_Z2)
++ ts->tc.z2 = data & 0xfff;
++ else if (ch == CH_RX)
++ ts->tc.rx = data & 0xfff;
++ else if (ch == CH_RY)
++ ts->tc.ry = data & 0xfff;
++ else
++ dev_err(&ts->client->dev, "? CH%d %x\n", ch, data & 0xfff);
++ }
++ } else
++ dev_err(&ts->client->dev, "%d = recv()\n", length);
++
++ dev_dbg(&ts->client->dev, "X:%d Y:%d Z1:%d Z2:%d RX:%d RY:%d\n",
++ ts->tc.x, ts->tc.y, ts->tc.z1, ts->tc.z2, ts->tc.rx, ts->tc.ry);
++ dev_dbg(&ts->client->dev, "X+:%d Y+:%d X-:%d Y-:%d\n",
++ ts->tc.x+ts->tc.rx, ts->tc.y+ts->tc.ry, ts->tc.x-ts->tc.rx, ts->tc.y-ts->tc.ry);
++
++ return !ts->tc.z1; /* return 0 only if pressure not 0 */
++}
++
++static void sx8674_pen_irq_worker(struct work_struct *work)
++{
++ struct sx8674 *ts = container_of(work, struct sx8674, pen_event_work.work);
++ u8 irqsrc;
++
++ dev_dbg(&ts->client->dev, "%s\n", __func__);
++
++ irqsrc = i2c_smbus_read_byte_data(ts->client, CMD_READ_REGISTER | I2C_REG_IRQSRC);
++ dev_dbg(&ts->client->dev, "irqsrc: 0x%x", irqsrc);
++
++ if (irqsrc & IRQ_PENRELEASE) {
++ dev_dbg(&ts->client->dev, "pen release interrupt");
++ input_report_key(ts->input, BTN_TOUCH, 0);
++ input_sync(ts->input);
++ }
++
++ if (irqsrc & IRQ_PENTOUCH_TOUCHCONVDONE) {
++ dev_dbg(&ts->client->dev, "pen touch interrupt");
++
++ sx8674_read_values(ts);
++
++ input_report_abs(ts->input, ABS_X, ts->tc.x);
++ input_report_abs(ts->input, ABS_Y, ts->tc.y);
++ input_report_key(ts->input, BTN_TOUCH, 1);
++ input_sync(ts->input);
++
++ dev_dbg(&ts->client->dev, "point(%4d,%4d), pressure (%4u)\n", ts->tc.x, ts->tc.y, 0);
++ }
++}
++
++static irqreturn_t sx8674_irq(int irq, void *handle)
++{
++ struct sx8674 *ts = handle;
++
++ /* the reading of the samples can be time-consuming if using
++ * a slow i2c, so the work is done in a queue */
++ queue_delayed_work(ts->ts_workq, &ts->pen_event_work, 0);
++
++ return IRQ_HANDLED;
++}
++
++static int get_rmsel(u16 plate_ohms)
++{
++ int rmsel;
++
++ if (plate_ohms < 187)
++ rmsel = 0;
++ else if (plate_ohms < 312)
++ rmsel = 1;
++ else if (plate_ohms < 938)
++ rmsel = 2;
++ else if (plate_ohms < 1875)
++ rmsel = 3;
++ else if (plate_ohms < 4375)
++ rmsel = 4;
++ else if (plate_ohms < 9375)
++ rmsel = 5;
++ else if (plate_ohms < 18780)
++ rmsel = 6;
++ else
++ rmsel = 7;
++
++ return rmsel;
++}
++
++static int sx8674_parse_dt(struct device *dev, struct sx8674 *ts) {
++ struct device_node *node;
++
++ if (!dev || !ts)
++ return -ENOENT;
++
++ node = dev->of_node;
++ if (!node)
++ return -ENOENT;
++
++ ts->irq = irq_of_parse_and_map(node, 0);
++ if (!ts->irq)
++ return -EINVAL;
++
++ if(of_property_read_u16(node, "x-plate-ohms", &ts->x_plate_ohms))
++ return -EINVAL;
++
++ if(of_property_read_u16(node, "y-plate-ohms", &ts->y_plate_ohms))
++ return -EINVAL;
++
++ return 0;
++}
++
++static int sx8674_probe(struct i2c_client *client,
++ const struct i2c_device_id *id)
++{
++ struct sx8674 *ts;
++ struct input_dev *input_dev;
++ int err;
++ u16 rmselx, rmsely;
++
++ if (!i2c_check_functionality(client->adapter,
++ I2C_FUNC_SMBUS_READ_WORD_DATA))
++ return -EIO;
++
++ ts = devm_kzalloc(&client->dev, sizeof(struct sx8674), GFP_KERNEL);
++ input_dev = devm_input_allocate_device(&client->dev);
++ if (!ts || !input_dev)
++ return -ENOMEM;
++
++ err = sx8674_parse_dt(&client->dev, ts);
++ if (err)
++ return err;
++
++ ts->client = client;
++ i2c_set_clientdata(client, ts);
++
++ ts->input = input_dev;
++
++ ts->features = id->driver_data;
++
++ input_dev->name = "SX8674 Touchscreen";
++ input_dev->id.bustype = BUS_I2C;
++ input_dev->dev.parent = &client->dev;
++ input_set_drvdata(input_dev, ts);
++
++ __set_bit(EV_ABS, input_dev->evbit);
++ __set_bit(EV_KEY, input_dev->evbit);
++ __set_bit(BTN_TOUCH, input_dev->keybit);
++ __set_bit(INPUT_PROP_DIRECT, input_dev->propbit);
++
++ input_set_abs_params(input_dev, ABS_X, 0, MAX_12BIT, 0, 0);
++ input_set_abs_params(input_dev, ABS_Y, 0, MAX_12BIT, 0, 0);
++ /* TODO */
++ /*input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_12BIT, 0, 0);*/
++
++ err = i2c_smbus_write_byte_data(client, I2C_REG_SOFTRESET,
++ SOFTRESET_VALUE);
++ if (err < 0) {
++ dev_err(&client->dev, "writing softreset value failed");
++ return -EIO;
++ }
++
++ if (ts->features & SX_MULTITOUCH) {
++ input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, MAX_12BIT, 0, 0);
++ input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, MAX_12BIT, 0, 0);
++ input_set_abs_params(input_dev, ABS_MT_PRESSURE, 0, MAX_12BIT, 0, 0);
++ input_set_abs_params(input_dev, ABS_MT_TRACKING_ID, 0, 1, 0, 0);
++
++ /* set mask to convert X, Y, Z1, Z2, RX, RY for CH_SEQ */
++ err = i2c_smbus_write_byte_data(client, I2C_REG_CHANMASK,
++ CHAN_MULTITOUCH_MASK);
++ if (err < 0) {
++ dev_err(&client->dev, "writing to I2C_REG_CHANMASK failed");
++ return -EIO;
++ }
++
++ if (ts->x_plate_ohms < 100)
++ ts->x_plate_ohms = 100;
++ if (ts->y_plate_ohms < 100)
++ ts->y_plate_ohms = 100;
++ rmselx = get_rmsel(ts->x_plate_ohms);
++ rmsely = get_rmsel(ts->y_plate_ohms);
++
++ err = i2c_smbus_write_byte_data(client, I2C_REG_TOUCH3,
++ (rmsely << 3) | rmselx);
++ if (err < 0) {
++ dev_err(&client->dev, "writing to I2C_REG_TOUCH3 failed");
++ return -EIO;
++ }
++ } else {
++ /* set mask to convert X, Y, Z1, Z2 for CH_SEQ */
++ err = i2c_smbus_write_byte_data(client, I2C_REG_CHANMASK, CHAN_SINGLETOUCH_MASK);
++ if (err < 0) {
++ dev_err(&client->dev, "writing to I2C_REG_CHANMASK failed");
++ return -EIO;
++ }
++ }
++
++ err = i2c_smbus_write_byte_data(client, I2C_REG_IRQMASK, (IRQ_PENTOUCH_TOUCHCONVDONE | IRQ_PENRELEASE));
++ if (err < 0) {
++ dev_err(&client->dev, "writing to I2C_REG_IRQMASK failed");
++ return -EIO;
++ }
++
++ err = i2c_smbus_write_byte_data(client, I2C_REG_TOUCH1, CONDIRQ | FILT_7SA);
++ if (err < 0) {
++ dev_err(&client->dev, "writing to I2C_REG_TOUCH1 failed");
++ return -EIO;
++ }
++
++ err = i2c_smbus_write_byte_data(client, I2C_REG_TOUCH0, RATE_5000CPS | POWDLY_1_1MS);
++ if (err < 0) {
++ dev_err(&client->dev, "writing to I2C_REG_TOUCH0 failed");
++ return -EIO;
++ }
++
++ ts->ts_workq = create_singlethread_workqueue("sx8674");
++ if (ts->ts_workq == NULL) {
++ dev_err(&client->dev, "failed to create workqueue\n");
++ return -ENOENT;
++ }
++
++ INIT_DELAYED_WORK(&ts->pen_event_work, sx8674_pen_irq_worker);
++
++ err = devm_request_threaded_irq(&client->dev, ts->irq,
++ NULL, sx8674_irq,
++ IRQF_ONESHOT | IRQF_TRIGGER_FALLING,
++ client->dev.driver->name, ts);
++ if (err < 0) {
++ dev_err(&client->dev, "irq %d busy?\n", ts->irq);
++ return -EBUSY;
++ }
++
++ err = input_register_device(input_dev);
++ if (err)
++ return -ENONET;
++
++ /* enter pen-trigger mode */
++ err = i2c_smbus_write_byte(client, CMD_PENTRG);
++ if (err < 0) {
++ dev_err(&client->dev, "writing command CMD_PENTRG failed");
++ input_unregister_device(input_dev);
++ return -EIO;
++ }
++
++ return 0;
++}
++
++static int sx8674_remove(struct i2c_client *client)
++{
++ struct sx8674 *ts = i2c_get_clientdata(client);
++
++ input_unregister_device(ts->input);
++
++ cancel_delayed_work_sync(&ts->pen_event_work);
++ destroy_workqueue(ts->ts_workq);
++
++ return 0;
++}
++
++static struct i2c_driver sx8674_driver = {
++ .driver = {
++ .owner = THIS_MODULE,
++ .name = "sx8674"
++ },
++ .id_table = sx8674_idtable,
++ .probe = sx8674_probe,
++ .remove = sx8674_remove,
++};
++
++module_i2c_driver(sx8674_driver)
++
++MODULE_AUTHOR("Sébastien Szymanski <seb...@ar...>");
++MODULE_DESCRIPTION("SX8674 Touchscreen Driver");
++MODULE_LICENSE("GPL");
diff --git a/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/3.14/0505-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 87%
copy from patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/3.14/0505-armadeus-add_mcp7940x_rtc_driver.patch
index 2bbe1db..69d8910 100644
--- a/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
+++ b/patches/linux/3.14/0505-armadeus-add_mcp7940x_rtc_driver.patch
@@ -3,11 +3,11 @@ Add mcp79400 Linux driver
Signed-off-by: Fabien Marteau <fab...@ar...>
---
-Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
+Index: linux-3.14/drivers/rtc/rtc-mcp7940x.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.11.1/drivers/rtc/rtc-mcp7940x.c 2013-10-05 09:29:52.179513345 +0200
-@@ -0,0 +1,513 @@
+--- /dev/null
++++ linux-3.14/drivers/rtc/rtc-mcp7940x.c
+@@ -0,0 +1,492 @@
+/*
+ * RTC client/driver for the Microchip MCP7940x Real-Time Clock over I2C
+ *
@@ -15,7 +15,7 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
+ * which was based on code by Randy Vinson <rv...@mv...>,
+ * which was based on the m41t00.c by Mark Greer <mg...@mv...>.
+ *
-+ * Copyright (C) 2012 Armadeus Systems
++ * Copyright (C) 2014 Armadeus Systems
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
@@ -34,7 +34,6 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
+#include <linux/rtc.h>
+#include <linux/bcd.h>
+#include <linux/slab.h>
-+#include <linux/version.h> /* LINUX_VERSION_CODE */
+
+/* Time of Day */
+#define MCP7940X_REG_TD_SECONDS 0x00
@@ -44,18 +43,20 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
+#define MCP7940X_REG_TD_DATE 0x04
+#define MCP7940X_REG_TD_MONTH 0x05
+#define MCP7940X_REG_TD_YEAR 0x06
++
+/* Controls */
+#define MCP7940X_REG_CONTROL 0x07
+#define MCP7940X_REG_CALIBRATION 0x08
+#define MCP7940X_REG_UNLOCK_ID 0x08
-+/* Alarm 0 */
+
++/* Alarm 0 */
+#define MCP7940X_REG_ALRM0_SECONDS 0x0A
+#define MCP7940X_REG_ALRM0_MINUTES 0x0B
+#define MCP7940X_REG_ALRM0_HOURS 0x0C
+#define MCP7940X_REG_ALRM0_DAY 0x0D
+#define MCP7940X_REG_ALRM0_DATE 0x0E
+#define MCP7940X_REG_ALRM0_MONTH 0x0F
++
+/* Alarm 1 */
+#define MCP7940X_REG_ALRM1_SECONDS 0x11
+#define MCP7940X_REG_ALRM1_MINUTES 0x12
@@ -63,18 +64,19 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
+#define MCP7940X_REG_ALRM1_DAY 0x14
+#define MCP7940X_REG_ALRM1_DATE 0x15
+#define MCP7940X_REG_ALRM1_MONTH 0x16
++
+/* Timestamp 0 */
+#define MCP7940X_REG_TS0_MINUTES 0x18
+#define MCP7940X_REG_TS0_HOURS 0x19
+#define MCP7940X_REG_TS0_DATE 0x1A
+#define MCP7940X_REG_TS0_MONTH 0x1B
++
+/* Timestamp 1 */
+#define MCP7940X_REG_TS1_MINUTES 0x1C
+#define MCP7940X_REG_TS1_HOURS 0x1D
+#define MCP7940X_REG_TS1_DATE 0x1E
+#define MCP7940X_REG_TS1_MONTH 0x1F
+
-+
+/* bits definitions */
+#define MCP7940X_START_BITS 0x80
+#define MCP7940X_24H_BITS 0x40
@@ -396,7 +398,8 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
+ struct mcp7940x *mcp7940x;
+ int ret;
+
-+ mcp7940x = kzalloc(sizeof(struct mcp7940x), GFP_KERNEL);
++ mcp7940x = devm_kzalloc(&client->dev, sizeof(struct mcp7940x),
++ GFP_KERNEL);
+ if (!mcp7940x)
+ return -ENOMEM;
+
@@ -405,7 +408,7 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
+
+ ret = i2c_smbus_read_byte_data(mcp7940x->client, MCP7940X_REG_TD_HOURS);
+ if (ret < 0)
-+ goto out_free;
++ return -EIO;
+
+ /* set rtc to 24h format */
+ if ((ret & MCP7940X_24H_BITS)) {
@@ -413,24 +416,25 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
+ MCP7940X_REG_TD_HOURS,
+ (u8)(ret & ~MCP7940X_24H_BITS));
+ if(ret < 0)
-+ goto out_free;
++ return -EIO;
+ }
+
+ ret = i2c_smbus_read_byte_data(mcp7940x->client, MCP7940X_REG_TD_DAY);
+ if (ret < 0)
-+ goto out_free;
++ return -EIO;
++
+ /* Use external baterie if Vcc fails */
+ if (!(ret & MCP7940X_VBATEN)) {
+ ret = i2c_smbus_write_byte_data(mcp7940x->client,
+ MCP7940X_REG_TD_DAY,
+ (u8)(ret | MCP7940X_VBATEN));
+ if(ret < 0)
-+ goto out_free;
++ return -EIO;
+ }
+
+ ret = i2c_smbus_read_byte_data(mcp7940x->client, MCP7940X_REG_TD_SECONDS);
+ if (ret < 0)
-+ goto out_free;
++ return -EIO;
+
+ /* If time counter not launched, launch it */
+ if (!(ret & MCP7940X_START_BITS)) {
@@ -438,86 +442,94 @@ Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
+ MCP7940X_REG_TD_SECONDS,
+ (u8)(ret | MCP7940X_START_BITS));
+ if(ret < 0)
-+ goto out_free;
-+
++ return -EIO;
+ }
+
+ device_set_wakeup_capable(&client->dev, 1);
-+ mcp7940x->rtc = rtc_device_register(client->name, &client->dev,
-+ &mcp7940x_rtc_ops, THIS_MODULE);
++
++ mcp7940x->rtc = devm_rtc_device_register(&client->dev, client->name,
++ &mcp7940x_rtc_ops, THIS_MODULE);
+ if (IS_ERR(mcp7940x->rtc)) {
-+ ret = PTR_ERR(mcp7940x->rtc);
+ dev_err(&client->dev, "unable to register the class device\n");
-+ goto out_free;
++ return PTR_ERR(mcp7940x->rtc);
+ }
+
-+ return 0;
++ mcp7940x->rtc->uie_unsupported = 1;
+
-+out_free:
-+ kfree(mcp7940x);
-+ return ret;
++ return 0;
+}
+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
-+static int __devexit mcp7940x_remove(struct i2c_client *client)
-+#else
-+static int __exit mcp7940x_remove(struct i2c_client *client)
-+#endif
++static int mcp7940x_remove(struct i2c_client *client)
+{
-+ struct mcp7940x *mcp7940x = i2c_get_clientdata(client);
-+
-+ rtc_device_unregister(mcp7940x->rtc);
-+ kfree(mcp7940x);
+ return 0;
+}
+
+#ifdef CONFIG_PM
-+static int mcp7940x_suspend(struct i2c_client *client, pm_message_t state)
++static int mcp7940x_suspend(struct device *dev)
+{
+ return 0;
+}
+
-+static int mcp7940x_resume(struct i2c_client *client)
++static int mcp7940x_resume(struct device *dev)
+{
+ return 0;
+}
-+#else
-+#define mcp7940x_suspend NULL
-+#define mcp7940x_resume NULL
++
++static const struct dev_pm_ops mcp7940x_pm_ops = {
++ .suspend = mcp7940x_suspend,
++ .resume = mcp7940x_resume,
++};
+#endif
+
+static struct i2c_driver mcp7940x_driver = {
+ .driver = {
-+ .name = "rtc-mcp7940x",
-+ .owner = THIS_MODULE,
-+#if defined(CONFIG_OF)
-+ .of_match_table = mcp7940x_rtc_dt_match,
++ .name = "rtc-mcp7940x",
++ .owner = THIS_MODULE,
++#ifdef CONFIG_PM
++ .pm = &mcp7940x_pm_ops,
+#endif
++ .of_match_table = mcp7940x_rtc_dt_match,
+ },
+ .probe = mcp7940x_probe,
-+ .suspend = mcp7940x_suspend,
-+ .resume = mcp7940x_resume,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
-+ .remove = __devexit_p(mcp7940x_remove),
-+#else
-+ .remove = __exit_p(mcp7940x_remove),
-+#endif
++ .remove = mcp7940x_remove,
+ .id_table = mcp7940x_id,
+};
+
-+static int __init mcp7940x_init(void)
-+{
-+ return i2c_add_driver(&mcp7940x_driver);
-+}
-+
-+static void __exit mcp7940x_exit(void)
-+{
-+ i2c_del_driver(&mcp7940x_driver);
-+}
-+
-+module_init(mcp7940x_init);
-+module_exit(mcp7940x_exit);
++module_i2c_driver(mcp7940x_driver)
+
+MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
+MODULE_DESCRIPTION("Microchip mcp7940x RTC Driver");
+MODULE_LICENSE("GPL");
+Index: linux-3.14/drivers/rtc/Kconfig
+===================================================================
+--- linux-3.14.orig/drivers/rtc/Kconfig
++++ linux-3.14/drivers/rtc/Kconfig
+@@ -539,6 +539,16 @@ config RTC_DRV_S5M
+ This driver can also be built as a module. If so, the module
+ will be called rtc-s5m.
+
++config RTC_DRV_MCP7940X
++ tristate "Microchip MCP7940X"
++ help
++ If you say yes here you get support for Microchip
++ MCP7940x real-time clock chips.
++ The alarm functionality is not supported.
++
++ This driver can also be built as a module. If so, the module
++ will be called rtc-mcp7940x.
++
+ endif # I2C
+
+ comment "SPI RTC drivers"
+Index: linux-3.14/drivers/rtc/Makefile
+===================================================================
+--- linux-3.14.orig/drivers/rtc/Makefile
++++ linux-3.14/drivers/rtc/Makefile
+@@ -70,6 +70,7 @@ obj-$(CONFIG_RTC_DRV_M41T94) += rtc-m41t
+ obj-$(CONFIG_RTC_DRV_M48T35) += rtc-m48t35.o
+ obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o
+ obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o
++obj-$(CONFIG_RTC_DRV_MCP7940X) += rtc-mcp7940x.o
+ obj-$(CONFIG_RTC_DRV_MXC) += rtc-mxc.o
+ obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o
+ obj-$(CONFIG_RTC_DRV_MAX8907) += rtc-max8907.o
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-04-10 16:13:47
|
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 3c5da1522acb95b4f41facde82063b18aa389f57 (commit)
from 4082303298c456a0e7364e21d9c5d6069df74e1f (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 3c5da1522acb95b4f41facde82063b18aa389f57
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 10 18:00:09 2014 +0200
[LINUX] 3.14: apf28: add pm_power_off function
When shutting down the board with the poweroff command, an halt is
actually performed because there is no pm_power_off function defined.
The SoC is then stuck in an infinite loop.
This patch adds a pm_power_off function to shut down the SoC.
-----------------------------------------------------------------------
Summary of changes:
.../0446-armadeus_add_pm_power_off_function.patch | 39 ++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.14/0446-armadeus_add_pm_power_off_function.patch
diff --git a/patches/linux/3.14/0446-armadeus_add_pm_power_off_function.patch b/patches/linux/3.14/0446-armadeus_add_pm_power_off_function.patch
new file mode 100644
index 0000000..ce4a7df
--- /dev/null
+++ b/patches/linux/3.14/0446-armadeus_add_pm_power_off_function.patch
@@ -0,0 +1,39 @@
+Index: linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
+===================================================================
+--- linux-3.14-rc7.orig/arch/arm/mach-mxs/mach-mxs.c
++++ linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
+@@ -242,9 +242,34 @@ static void __init imx28_evk_init(void)
+ mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
+ }
+
++#define BM_POWER_RESET_UNLOCK 0xFFFF0000
++#define BV_POWER_RESET_UNLOCK__KEY 0x3E77
++#define BM_POWER_RESET_PWD 0x00000001
++#define HW_POWER_RESET 0x00000100
++#define BF_POWER_RESET_UNLOCK(v) \
++ (((v) << 16) & BM_POWER_RESET_UNLOCK)
++
++static void apf28_power_off(void)
++{
++ struct device_node *np;
++ void __iomem *power_base;
++
++ np = of_find_node_by_name(NULL, "power");
++ if (!np)
++ return;
++
++ power_base = of_iomap(np, 0);
++ if (!power_base)
++ return;
++
++ __mxs_setl(BF_POWER_RESET_UNLOCK(BV_POWER_RESET_UNLOCK__KEY) |
++ BM_POWER_RESET_PWD, power_base + HW_POWER_RESET);
++}
++
+ static void __init imx28_apf28_init(void)
+ {
+ update_fec_mac_prop(OUI_ARMADEUS);
++ pm_power_off = apf28_power_off;
+ }
+
+ static int apx4devkit_phy_fixup(struct phy_device *phy)
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-04-08 15:14:15
|
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 4082303298c456a0e7364e21d9c5d6069df74e1f (commit)
from 17e21178efce9eaaf8daad54c565f31c398734ce (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 4082303298c456a0e7364e21d9c5d6069df74e1f
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 8 17:14:03 2014 +0200
[UBOOT] 2014.04-rc3: update apf28 patchwork
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf28/apf28-u-boot-2014.04.h | 1 +
.../u-boot/2014.04/501-imx28-update-and-fix.patch | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
index 384840b..8b6facf 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
@@ -10,6 +10,7 @@
#define CONFIG_ENV_VERSION 11
#define CONFIG_IDENT_STRING " apf28 patch 1.5"
#define CONFIG_BOARD_NAME apf28
+#define CONFIG_SYS_GENERIC_BOARD
/*
* SoC configurations
diff --git a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch b/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
index 5c128b4..5245f99 100644
--- a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
+++ b/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
@@ -22,12 +22,12 @@ index c60615a..f533ad0 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
+++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
@@ -3,6 +3,6 @@ SECTION 0x0 BOOTABLE
- LOAD 0x0 OBJTREE/spl/u-boot-spl.bin
+ LOAD 0x0 spl/u-boot-spl.bin
LOAD IVT 0x8000 0x14
CALL HAB 0x8000 0x0
-- LOAD 0x40000100 OBJTREE/u-boot.bin
+- LOAD 0x40000100 u-boot.bin
- LOAD IVT 0x8000 0x40000100
-+ LOAD 0x40000000 OBJTREE/u-boot.bin
++ LOAD 0x40000000 u-boot.bin
+ LOAD IVT 0x8000 0x40000000
CALL HAB 0x8000 0x0
--- a/include/configs/mxs.h
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-04-08 14:50:59
|
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 17e21178efce9eaaf8daad54c565f31c398734ce (commit)
from 47596b76c6e7450cf14186df04fd23886497e6a2 (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 17e21178efce9eaaf8daad54c565f31c398734ce
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 8 16:50:43 2014 +0200
[UBOOT] 2014.04: apf28: add default configuration
-----------------------------------------------------------------------
Summary of changes:
...f28-u-boot-2013.04.h => apf28-u-boot-2014.04.h} | 135 +++++---------------
1 files changed, 35 insertions(+), 100 deletions(-)
copy buildroot/target/device/armadeus/apf28/{apf28-u-boot-2013.04.h => apf28-u-boot-2014.04.h} (75%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
similarity index 75%
copy from buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
copy to buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
index 7ec72c5..384840b 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2014.04.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2013 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2011-2014 Eric Jarrige <eri...@ar...>
*
* SPDX-License-Identifier:Â Â Â Â Â GPL-2.0+
*/
@@ -7,9 +7,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION 11
-#define CONFIG_IDENT_STRING " apf28 patch 1.4"
+#define CONFIG_IDENT_STRING " apf28 patch 1.5"
#define CONFIG_BOARD_NAME apf28
/*
@@ -18,15 +17,10 @@
#define CONFIG_MX28 /* i.MX28 SoC */
#define CONFIG_MACH_TYPE 3845 /* APF28 */
-#include <asm/arch/regs-base.h>
-
/*
* Enable the call to miscellaneous platform dependent initialization.
*/
#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h>*/
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_APBH_DMA
/*
* Board display option
@@ -35,15 +29,8 @@
#define CONFIG_DOS_PARTITION
/*
- * SPL
+ * SPL inherited from <configs/mxs.h>
*/
-#define CONFIG_SPL
-#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs"
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_GPIO_SUPPORT
/* Enable CONFIG_SYS_NO_DCDC_BATT_SOURCE the following if you only have a
* VDD5V source only and no DCDC_BATT source. This includes configurations with
@@ -99,6 +86,8 @@
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_GPIO
+#define CONFIG_CMD_GREPENV
+#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_MTDPARTS
@@ -107,10 +96,13 @@
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
#define CONFIG_CMD_SETEXPR
+#define CONFIG_CMD_SPI
#define CONFIG_CMD_USB
#define CONFIG_CMD_UBI
#define CONFIG_CMD_UBIFS
+#define CONFIG_REGEX /* Enable regular expression support */
+
/*
* Memory configurations
*/
@@ -118,20 +110,21 @@
#define PHYS_SDRAM_1 0x40000000 /* Base address */
#define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MiB RAM */
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */
-#define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */
-#define CONFIG_SYS_MEMTEST_END 0x40400000 /* 4 MB RAM test */
-/* Point initial SP in SRAM so SPL can use it too. */
-
-#define CONFIG_SYS_INIT_RAM_ADDR 0x00002000
-#define CONFIG_SYS_INIT_RAM_SIZE (128 * 1024)
-#define CONFIG_SYS_INIT_SP_OFFSET \
- (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
- (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
#define CONFIG_SYS_TEXT_BASE 0x40000000
+/* Environment */
+#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
+#define CONFIG_ENV_IS_IN_NAND
+
+/* Environment is in NAND */
+#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 128kB */
+#define CONFIG_ENV_SECT_SIZE (128 * 1024)
+#define CONFIG_ENV_RANGE (512 * 1024)
+#define CONFIG_ENV_OFFSET 0x300000
+#define CONFIG_ENV_OFFSET_REDUND \
+ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
+#define CONFIG_ENV_OVERWRITE
+
/*
* FLASH organization
*/
@@ -139,14 +132,6 @@
/* last 2 MiB reservered for 2 copies of U-Boot */
#define CONFIG_SYS_MONITOR_OFFSET 0x00100000 /* offset in NAND */
#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 2 x 1MB */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET 0x00300000 /* NAND offset */
-#define CONFIG_ENV_SIZE 0x00020000 /* 128kB */
-#define CONFIG_ENV_RANGE 0x00080000 /* 512kB */
-#define CONFIG_ENV_OFFSET_REDUND \
- (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 512kB */
#define CONFIG_KERNEL_OFFSET 0x00500000 /* 8MB */
#define CONFIG_ROOTFS_OFFSET 0x00D00000
@@ -165,30 +150,16 @@
/*
* U-Boot general configurations
*/
-#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PROMPT "BIOS> "
-#define CONFIG_SYS_CBSIZE 2048 /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE \
- (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
- /* Print buffer size */
-#define CONFIG_SYS_MAXARGS 16 /* Max number of command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
- /* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING /* Command history etc */
-#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_PREBOOT "run check_flash check_env;"
/*
* Boot Linux
*/
-#define CONFIG_CMDLINE_TAG /* send commandline to Kernel */
-#define CONFIG_SETUP_MEMORY_TAGS /* send memory definition to kernel */
#define CONFIG_INITRD_TAG /* send initrd params */
/* #define CONFIG_REVISION_TAG */
-#define CONFIG_OF_LIBFDT
#define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK
@@ -316,18 +287,12 @@
"unlock_regs=echo unlock_reg not needed anymore\0"
/*
- * Serial Driver
+ * Serial Driver inherited from <configs/mxs.h>
*/
-#define CONFIG_PL011_SERIAL
-#define CONFIG_PL011_CLOCK 24000000
-#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE }
-#define CONFIG_CONS_INDEX 0
-#define CONFIG_BAUDRATE 115200 /* Default baud rate */
/*
- * GPIO
+ * GPIO inherited from <configs/mxs.h>
*/
-#define CONFIG_MXS_GPIO
/*
* NOR
@@ -336,12 +301,6 @@
/*
* NAND
*/
-#define CONFIG_NAND_MXS
-#define CONFIG_APBH_DMA
-#define CONFIG_SYS_NAND_BASE 0x60000000
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-
-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define NAND_MAX_CHIPS 1
#define CONFIG_SYS_DIRECT_FLASH_TFTP
@@ -366,13 +325,8 @@
* Ethernet (on SOC mx28 FEC)
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
-#define CONFIG_ETHPRIME "FEC0"
#define CONFIG_FEC_MXC
-#define CONFIG_FEC_MXC_MULTI
-#define CONFIG_MII
-#define CONFIG_DISCOVER_PHY
-#define CONFIG_FEC_XCV_TYPE RMII
+#define CONFIG_NET_MULTI
#define CONFIG_MX28_FEC_MAC_IN_OCOTP
#define CONFIG_NETCONSOLE 1
#endif
@@ -382,37 +336,23 @@
* Fuses - OCOTP
*/
/* #define CONFIG_IMX_OCOTP */
-#define IMX_OCOTP_BASE MXS_OCOTP_BASE
/*
- * I2C
+ * I2C inherited from <configs/mxs.h>
*/
-#ifdef CONFIG_CMD_I2C
-#define CONFIG_I2C_MXS
-#define CONFIG_HARD_I2C
-#define CONFIG_SYS_I2C_SPEED 400000
-#endif
/*
* SPI
*/
-#ifdef CONFIG_CMD_SPI
-#define CONFIG_HARD_SPI
-#define CONFIG_MXS_SPI
-#define CONFIG_SPI_HALF_DUPLEX
-#define CONFIG_DEFAULT_SPI_BUS 2
-#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
+#ifdef CONFIG_CMD_SPI
+#define CONFIG_DEFAULT_SPI_BUS 2
+#define CONFIG_DEFAULT_SPI_CS 0
+#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
#endif
/*
- * SD/MMC
+ * SD/MMC inherited from <configs/mxs.h>
*/
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MXS_MMC
-#endif
/*
* RTC
@@ -430,17 +370,12 @@
/*
* USB
*/
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MXS
-#define CONFIG_EHCI_MXS_PORT 1
-#define CONFIG_EHCI_IS_TDI
-#define CONFIG_USB_STORAGE
+#ifdef CONFIG_CMD_USB
+#define CONFIG_EHCI_MXS_PORT1
+#define CONFIG_USB_STORAGE
#endif
-/*
- * Clocks
- */
-#define CONFIG_SYS_HZ 1000 /* Ticks per second */
+/* The rest of the configuration is shared */
+#include <configs/mxs.h>
#endif /* __CONFIG_H */
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-04-08 14:05:36
|
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 47596b76c6e7450cf14186df04fd23886497e6a2 (commit)
from 334fdb2001931dc138069c7c08942a80831def77 (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 47596b76c6e7450cf14186df04fd23886497e6a2
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 8 16:04:58 2014 +0200
[UBOOT] 2014.04: add apf28 patchwork
-----------------------------------------------------------------------
Summary of changes:
.../u-boot/2014.04/501-imx28-update-and-fix.patch | 60 ++++++
.../{2013.04 => 2014.04}/502-add-apf28.patch | 216 ++++----------------
2 files changed, 101 insertions(+), 175 deletions(-)
create mode 100644 patches/u-boot/2014.04/501-imx28-update-and-fix.patch
copy patches/u-boot/{2013.04 => 2014.04}/502-add-apf28.patch (81%)
diff --git a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch b/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
new file mode 100644
index 0000000..5c128b4
--- /dev/null
+++ b/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
@@ -0,0 +1,60 @@
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Philippe Reynes <tr...@ya...>
+---
+ arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd | 4 ++--
+ common/memsize.c | 2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
+index c60615a..f533ad0 100644
+--- a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
++++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
+@@ -8,7 +8,7 @@ section (0) {
+ load ivt (entry = 0x0014) > 0x8000;
+ hab call 0x8000;
+
+- load u_boot > 0x40000100;
+- load ivt (entry = 0x40000100) > 0x8000;
++ load u_boot > 0x40000000;
++ load ivt (entry = 0x40000000) > 0x8000;
+ hab call 0x8000;
+ }
+--- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
++++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg
+@@ -3,6 +3,6 @@ SECTION 0x0 BOOTABLE
+ LOAD 0x0 OBJTREE/spl/u-boot-spl.bin
+ LOAD IVT 0x8000 0x14
+ CALL HAB 0x8000 0x0
+- LOAD 0x40000100 OBJTREE/u-boot.bin
+- LOAD IVT 0x8000 0x40000100
++ LOAD 0x40000000 OBJTREE/u-boot.bin
++ LOAD IVT 0x8000 0x40000000
+ CALL HAB 0x8000 0x0
+--- a/include/configs/mxs.h
++++ b/include/configs/mxs.h
+@@ -81,7 +81,9 @@
+ * strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot
+ * binary. In case there was more of this mess, 0x100 bytes are skipped.
+ */
++#ifndef CONFIG_SYS_TEXT_BASE
+ #define CONFIG_SYS_TEXT_BASE 0x40000100
++#endif
+
+ /* U-Boot general configuration */
+ #define CONFIG_SYS_LONGHELP
+diff --git a/common/memsize.c b/common/memsize.c
+index 963e4f3..a9f76bc 100644
+--- a/common/memsize.c
++++ b/common/memsize.c
+@@ -61,6 +61,8 @@ long get_ram_size(long *base, long maxsize)
+ return (0);
+ }
+
++ sync();
++ *addr = save[i];
+ for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
+ addr = base + cnt; /* pointer arith! */
+ val = *addr;
+--
+1.7.2.5
+
diff --git a/patches/u-boot/2013.04/502-add-apf28.patch b/patches/u-boot/2014.04/502-add-apf28.patch
similarity index 81%
copy from patches/u-boot/2013.04/502-add-apf28.patch
copy to patches/u-boot/2014.04/502-add-apf28.patch
index 3bac862..912b16d 100644
--- a/patches/u-boot/2013.04/502-add-apf28.patch
+++ b/patches/u-boot/2014.04/502-add-apf28.patch
@@ -19,87 +19,34 @@ new file mode 100644
index 0000000..029e58d
--- /dev/null
+++ b/board/armadeus/apf28/Makefile
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,13 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd...@de....
+#
-+# See file CREDITS for list of people who contributed to this
-+# project.
-+#
-+# 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., 59 Temple Place, Suite 330, Boston,
-+# MA 02111-1307 USA
++# SPDX-License-Identifier: GPL-2.0+
+#
+
-+include $(TOPDIR)/config.mk
-+
-+LIB = $(obj)lib$(BOARD).o
-+
+ifndef CONFIG_SPL_BUILD
-+COBJS-$(CONFIG_IMX_OCOTP) += cmd_ocotp.o
-+COBJS := $(COBJS-y) mx28_bcb.o apf28.o
++obj-y := mx28_bcb.o apf28.o
++obj-$(CONFIG_IMX_OCOTP) += cmd_ocotp.o
+else
-+COBJS := spl_boot.o
++obj-y := spl_boot.o
+endif
-+
-+SRCS := $(COBJS:.o=.c)
-+OBJS := $(addprefix $(obj),$(COBJS))
-+
-+$(LIB): $(obj).depend $(OBJS)
-+ $(call cmd_link_o_target, $(OBJS))
-+
-+all: $(ALL)
-+
-+#########################################################################
-+
-+# defines $(obj).depend target
-+include $(SRCTREE)/rules.mk
-+
-+sinclude $(obj).depend
-+
-+#########################################################################
diff --git a/board/armadeus/apf28/apf28.c b/board/armadeus/apf28/apf28.c
new file mode 100644
index 0000000..7f75494
--- /dev/null
+++ b/board/armadeus/apf28/apf28.c
-@@ -0,0 +1,176 @@
+@@ -0,0 +1,130 @@
+/*
+ * APF28 motherboard based on DENX M28 module
+ *
-+ * Copyright (C) 2012-2013 Eric Jarrige <eri...@ar...>
++ * Copyright (C) 2012-2014 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
+ * on behalf of DENX Software Engineering GmbH
+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * 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., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
@@ -172,30 +119,16 @@ index 0000000..7f75494
+#endif
+
+#ifdef CONFIG_CMD_NET
-+
-+#define MII_OPMODE_STRAP_OVERRIDE 0x16
-+#define MII_PHY_CTRL1 0x1e
-+#define MII_PHY_CTRL2 0x1f
-+
-+int fecmxc_mii_postcall(int phy)
-+{
-+ miiphy_write("FEC0", phy, MII_BMCR, 0x9000);
-+ miiphy_write("FEC0", phy, MII_OPMODE_STRAP_OVERRIDE, 0x0202);
-+ if (phy == 3)
-+ miiphy_write("FEC0", 3, MII_PHY_CTRL2, 0x8180);
-+ return 0;
-+}
-+
+int board_eth_init(bd_t *bis)
+{
-+#define STR_ENV_ETHADDR "ethaddr"
+ struct mxs_clkctrl_regs *clkctrl_regs =
+ (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
+ struct eth_device *dev;
-+ uchar eth_addr[6];
+ int ret;
+
+ ret = cpu_eth_init(bis);
++ if (ret)
++ return ret;
+
+ /* uses ENET_CLK PAD to drive FEC clock */
+ writel(CLKCTRL_ENET_TIME_SEL_RMII_CLK | CLKCTRL_ENET_CLK_OUT_EN,
@@ -217,21 +150,6 @@ index 0000000..7f75494
+ return -EINVAL;
+ }
+
-+ ret = fecmxc_register_mii_postcall(dev, fecmxc_mii_postcall);
-+ if (ret) {
-+ printf("FEC MXS: Unable to register FEC0 mii postcall\n");
-+ return ret;
-+ }
-+
-+ if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
-+ if (dev) {
-+ eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
-+ } else {
-+ printf("FEC APF28: Couldn't get eth device\n");
-+ ret = -1;
-+ }
-+ }
-+
+ return ret;
+}
+
@@ -250,34 +168,17 @@ index 0000000..7f75494
+ mac[5] += 1;
+}
+#endif
-+
+#endif
diff --git a/board/armadeus/apf28/cmd_ocotp.c b/board/armadeus/apf28/cmd_ocotp.c
new file mode 100644
index 0000000..2efae8d
--- /dev/null
+++ b/board/armadeus/apf28/cmd_ocotp.c
-@@ -0,0 +1,269 @@
+@@ -0,0 +1,253 @@
+/*
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
++ * Copyright (C) 2012-2014 Eric Jarrige <eri...@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., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <linux/types.h>
@@ -289,14 +190,14 @@ index 0000000..2efae8d
+
+#define MXS_OCOTP_MAX_TIMEOUT 1000000
+
-+static struct mx28_ocotp_regs *ocotp_regs =
-+ (struct mx28_ocotp_regs *)IMX_OCOTP_BASE;
++static struct mxs_ocotp_regs *ocotp_regs =
++ (struct mxs_ocotp_regs *)MXS_OCOTP_BASE;
+
+int otp_error(void)
+{
+ u32 otpctrl;
+
-+ if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
++ if (mxs_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
+ MXS_OCOTP_MAX_TIMEOUT)) {
+ printf("OCOTP still busy after timeout\n");
+ return -1;
@@ -333,7 +234,7 @@ index 0000000..2efae8d
+
+ writel(OCOTP_CTRL_RD_BANK_OPEN, &ocotp_regs->hw_ocotp_ctrl_set);
+
-+ if (mx28_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
++ if (mxs_wait_mask_clr(&ocotp_regs->hw_ocotp_ctrl_reg, OCOTP_CTRL_BUSY,
+ MXS_OCOTP_MAX_TIMEOUT)) {
+ printf("OCOTP Busy: Can't open OCOTP bank\n");
+ return val;
@@ -350,10 +251,10 @@ index 0000000..2efae8d
+{
+ u32 hbus, clkseq, vddio;
+ int err = 0;
-+ struct mx28_clkctrl_regs *clkctrl_regs =
-+ (struct mx28_clkctrl_regs *)MXS_CLKCTRL_BASE;
-+ struct mx28_power_regs *power_regs =
-+ (struct mx28_power_regs *)MXS_POWER_BASE;
++ struct mxs_clkctrl_regs *clkctrl_regs =
++ (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
++ struct mxs_power_regs *power_regs =
++ (struct mxs_power_regs *)MXS_POWER_BASE;
+
+ if ((addr < 0) || (addr > 0x27)) {
+ printf("Invalid address! (should be between 0 and 0x27)\n");
@@ -532,35 +433,16 @@ new file mode 100644
index 0000000..2be032c
--- /dev/null
+++ b/board/armadeus/apf28/mx28_bcb.c
-@@ -0,0 +1,559 @@
+@@ -0,0 +1,540 @@
+/*
+ * i.MX28 NANDÂ Boot Control Blocks generator
+ *
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
++ * Copyright (C) 2012-2014 Eric Jarrige <eri...@ar...>
+ *
+ * Based on code from mxsboot:
+ * Freescale i.MX28 image generator
+ *
-+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
-+ * on behalf of DENX Software Engineering GmbH
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * 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., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <asm/io.h>
@@ -946,7 +828,7 @@ index 0000000..2be032c
+ .oobbuf = (u8 *)fcbblock + nand->writesize,
+ .len = nand->writesize,
+ .ooblen = nand->oobsize,
-+ .mode = MTD_OOB_RAW
++ .mode = MTD_OPS_RAW
+ };
+
+ printf("Writing FCB...\n");
@@ -954,7 +836,7 @@ index 0000000..2be032c
+ for (i = 0; i < stride_pages * stride_count;
+ i += stride_pages) {
+ offset = i * nand->writesize;
-+ ret = nand->write_oob(nand, offset, &ops);
++ ret = nand->_write_oob(nand, offset, &ops);
+ }
+ }
+ free(fcbblock);
@@ -983,14 +865,14 @@ index 0000000..2be032c
+ .oobbuf = (u8 *)dbbt + nand->writesize,
+ .len = nand->writesize,
+ .ooblen = nand->oobsize,
-+ .mode = MTD_OOB_RAW
++ .mode = MTD_OPS_RAW
+ };
+
+ printf("Writing DBBT...\n");
+
+ for (; i < 2 * stride_pages * stride_count; i += stride_pages) {
+ offset = i * nand->writesize;
-+ ret = nand->write_oob(nand, offset, &ops);
++ ret = nand->_write_oob(nand, offset, &ops);
+ }
+
+ }
@@ -1097,31 +979,15 @@ new file mode 100644
index 0000000..9854cda
--- /dev/null
+++ b/board/armadeus/apf28/spl_boot.c
-@@ -0,0 +1,206 @@
+@@ -0,0 +1,190 @@
+/*
+ * Freescale i.MX28 Boot setup for the APF28 board
+ *
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
++ * Copyright (C) 2012-2014 Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2011 Marek Vasut <mar...@gm...>
+ * on behalf of DENX Software Engineering GmbH
+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * 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., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
++ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
@@ -1291,7 +1157,7 @@ index 0000000..9854cda
+ *dram_vals++ = apf28_dram_vals[i];
+}
+
-+void board_init_ll(void)
++void board_init_ll(const uint32_t arg, const uint32_t *resptr)
+{
+ struct mxs_clkctrl_regs *clkctrl_regs =
+ (struct mxs_clkctrl_regs *)MXS_CLKCTRL_BASE;
@@ -1301,20 +1167,20 @@ index 0000000..9854cda
+ setbits_le32(&clkctrl_regs->hw_clkctrl_reset,
+ CLKCTRL_RESET_WDOG_POR_DISABLE);
+
-+ mxs_common_spl_init(iomux_setup, ARRAY_SIZE(iomux_setup));
++ mxs_common_spl_init(arg, resptr, iomux_setup, ARRAY_SIZE(iomux_setup));
+}
+
diff --git a/boards.cfg b/boards.cfg
index 1aa7e95..f3c8b40 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -198,6 +198,7 @@ zmx25 arm arm926ejs zmx25 syteco
- mx23_olinuxino arm arm926ejs mx23_olinuxino olimex mxs mx23_olinuxino
- apx4devkit arm arm926ejs apx4devkit bluegiga mxs apx4devkit
- mx23evk arm arm926ejs mx23evk freescale mxs mx23evk
-+apf28 arm arm926ejs - armadeus mxs
- m28evk arm arm926ejs m28evk denx mxs m28evk
- mx28evk arm arm926ejs mx28evk freescale mxs mx28evk:ENV_IS_IN_MMC
- mx28evk_nand arm arm926ejs mx28evk freescale mxs mx28evk:ENV_IS_IN_NAND--
+@@ -210,6 +210,7 @@ Active arm arm926ejs mx27
+ Active arm arm926ejs mx27 logicpd imx27lite magnesium - Heiko Schocher <hs...@de...>
+ Active arm arm926ejs mxs bluegiga apx4devkit apx4devkit - Lauri Hintsala <lau...@bl...>
+ Active arm arm926ejs mxs creative xfi3 xfi3 - Marek Vasut <mar...@gm...>
++Active arm arm926ejs mxs armadeus apf28 apf28 - Eric Jarrige <eri...@ar...>
+ Active arm arm926ejs mxs denx m28evk m28evk - Marek Vasut <mar...@gm...>
+ Active arm arm926ejs mxs freescale mx23evk mx23evk - Otavio Salvador <ot...@os...>
+ Active arm arm926ejs mxs freescale mx28evk mx28evk mx28evk:ENV_IS_IN_MMC Fabio Estevam <fab...@fr...>
1.7.2.5
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-04-08 08:05:37
|
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 334fdb2001931dc138069c7c08942a80831def77 (commit)
via 602b08eed4e7c65e271d556dac5a957e293d2c79 (commit)
from a1f25b5de87298f498294019ab692fa4156d70d4 (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 334fdb2001931dc138069c7c08942a80831def77
Author: Philippe Reynes <tr...@ya...>
Date: Mon Apr 7 21:38:38 2014 +0200
[LINUX] 3.10: move to 3.10.36
commit 602b08eed4e7c65e271d556dac5a957e293d2c79
Author: Philippe Reynes <tr...@ya...>
Date: Mon Apr 7 21:38:37 2014 +0200
[LINUX] 3.12: move to 3.12.16
-----------------------------------------------------------------------
Summary of changes:
...x-3.10.34.config => apf27-linux-3.10.36.config} | 0
...x-3.12.15.config => apf27-linux-3.12.16.config} | 0
...x-3.10.34.config => apf28-linux-3.10.36.config} | 0
...x-3.12.15.config => apf28-linux-3.12.16.config} | 0
...x-3.10.34.config => apf51-linux-3.10.36.config} | 0
...x-3.12.15.config => apf51-linux-3.12.16.config} | 0
patches/linux/{3.10.34 => 3.10.36} | 0
patches/linux/{3.12.15 => 3.12.16} | 0
8 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.34.config => apf27-linux-3.10.36.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.15.config => apf27-linux-3.12.16.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.34.config => apf28-linux-3.10.36.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.15.config => apf28-linux-3.12.16.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.34.config => apf51-linux-3.10.36.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.15.config => apf51-linux-3.12.16.config} (100%)
rename patches/linux/{3.10.34 => 3.10.36} (100%)
rename patches/linux/{3.12.15 => 3.12.16} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.34.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.36.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.34.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.36.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.15.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.16.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.15.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.16.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.34.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.36.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.34.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.36.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.15.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.16.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.15.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.16.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.34.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.36.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.34.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.36.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.15.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.16.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.15.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.16.config
diff --git a/patches/linux/3.10.34 b/patches/linux/3.10.36
similarity index 100%
rename from patches/linux/3.10.34
rename to patches/linux/3.10.36
diff --git a/patches/linux/3.12.15 b/patches/linux/3.12.16
similarity index 100%
rename from patches/linux/3.12.15
rename to patches/linux/3.12.16
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-04-06 19:33:29
|
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 a1f25b5de87298f498294019ab692fa4156d70d4 (commit)
from fa45b9e79c1d65c5b97e87194fd82386ac63e278 (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 a1f25b5de87298f498294019ab692fa4156d70d4
Author: Philippe Reynes <tr...@ya...>
Date: Sat Apr 5 10:40:45 2014 +0200
[LINUX] 3.13: move to 3.13.9
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...nux-3.13.8.config => apf27-linux-3.13.9.config} | 0
...nux-3.13.8.config => apf28-linux-3.13.9.config} | 0
...nux-3.13.8.config => apf51-linux-3.13.9.config} | 0
patches/linux/{3.13.8 => 3.13.9} | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.13.8.config => apf27-linux-3.13.9.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.13.8.config => apf28-linux-3.13.9.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.13.8.config => apf51-linux-3.13.9.config} (100%)
rename patches/linux/{3.13.8 => 3.13.9} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 32497f6..7d28e54 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.8"
+BR2_DEFAULT_KERNEL_VERSION="3.13.9"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.9"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index c7f77bb..3985fc9 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.8"
+BR2_DEFAULT_KERNEL_VERSION="3.13.9"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.9"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index ce6d279..2dd928e 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.8"
+BR2_DEFAULT_KERNEL_VERSION="3.13.9"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.9"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.13.8.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.13.9.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.8.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.13.8.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.13.9.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.13.8.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.13.9.config
diff --git a/patches/linux/3.13.8 b/patches/linux/3.13.9
similarity index 100%
rename from patches/linux/3.13.8
rename to patches/linux/3.13.9
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-04-02 22:26:48
|
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 fa45b9e79c1d65c5b97e87194fd82386ac63e278 (commit)
from ebfde4dcf3a4b21cb74ecd7a936e63e4edb1e6da (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 fa45b9e79c1d65c5b97e87194fd82386ac63e278
Author: Philippe Reynes <tr...@ya...>
Date: Wed Apr 2 19:28:40 2014 +0200
[LINUX] 3.13: move to 3.13.8
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...nux-3.13.7.config => apf27-linux-3.13.8.config} | 0
...nux-3.13.7.config => apf28-linux-3.13.8.config} | 0
...nux-3.13.7.config => apf51-linux-3.13.8.config} | 0
patches/linux/{3.13.7 => 3.13.8} | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.13.7.config => apf27-linux-3.13.8.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.13.7.config => apf28-linux-3.13.8.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.13.7.config => apf51-linux-3.13.8.config} (100%)
rename patches/linux/{3.13.7 => 3.13.8} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 876f943..32497f6 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.7"
+BR2_DEFAULT_KERNEL_VERSION="3.13.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 1f89ac2..c7f77bb 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.7"
+BR2_DEFAULT_KERNEL_VERSION="3.13.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 9399cb4..ce6d279 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.7"
+BR2_DEFAULT_KERNEL_VERSION="3.13.8"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.13.7.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.13.8.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.13.7.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.13.8.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.7.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.13.7.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.13.8.config
diff --git a/patches/linux/3.13.7 b/patches/linux/3.13.8
similarity index 100%
rename from patches/linux/3.13.7
rename to patches/linux/3.13.8
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-04-02 12:04:12
|
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 ebfde4dcf3a4b21cb74ecd7a936e63e4edb1e6da (commit)
via 013cd23c63284929a8171942e5d6fa0b979755b3 (commit)
from 651fd51b6b6690cb7f91df4d49175af8a92ce586 (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 ebfde4dcf3a4b21cb74ecd7a936e63e4edb1e6da
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Apr 2 13:59:57 2014 +0200
[LINUX] apf6: move to 3.14
commit 013cd23c63284929a8171942e5d6fa0b979755b3
Author: Philippe Reynes <tr...@ya...>
Date: Tue Apr 1 17:22:15 2014 +0200
[LINUX] 3.14: move to stable 3.14 (remove 3.14-rc8)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
.../armadeus/apf27/apf27-linux-3.14-rc8.config | 1 -
.../armadeus/apf28/apf28-linux-3.14-rc8.config | 1 -
.../armadeus/apf51/apf51-linux-3.14-rc8.config | 1 -
.../armadeus/apf6/apf6-linux-3.14-rc8.config | 1 -
patches/linux/3.14-rc8 | 1 -
6 files changed, 1 insertions(+), 6 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc8.config
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc8.config
delete mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc8.config
delete mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc8.config
delete mode 120000 patches/linux/3.14-rc8
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 9c96299..2b64c28 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -22,7 +22,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14-rc7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc8.config
deleted file mode 120000
index 22d6c37..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc8.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc8.config
deleted file mode 120000
index 18126c3..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc8.config
deleted file mode 120000
index a6a73f6..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf51-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc8.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc8.config
deleted file mode 120000
index 26da497..0000000
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc8.config
+++ /dev/null
@@ -1 +0,0 @@
-apf6-linux-3.14.config
\ No newline at end of file
diff --git a/patches/linux/3.14-rc8 b/patches/linux/3.14-rc8
deleted file mode 120000
index 3767b4b..0000000
--- a/patches/linux/3.14-rc8
+++ /dev/null
@@ -1 +0,0 @@
-3.14
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-04-02 08:07:25
|
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 651fd51b6b6690cb7f91df4d49175af8a92ce586 (commit)
from 283bddb1f9822417cefb04f0b900fb156831d70c (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 651fd51b6b6690cb7f91df4d49175af8a92ce586
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Apr 2 10:07:57 2014 +0200
[TEST] apf28: fix tty name when kernel is not 2.6.35.3
-----------------------------------------------------------------------
Summary of changes:
target/test/test_rs232.sh | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/target/test/test_rs232.sh b/target/test/test_rs232.sh
index db22eae..a34ffb8 100755
--- a/target/test/test_rs232.sh
+++ b/target/test/test_rs232.sh
@@ -87,7 +87,11 @@ configure_ports_devices()
elif [ "$1" == "APF51" ]; then
SERIAL_DEVICES="/dev/ttymxc"
elif [ "$1" == "APF28" ]; then
- SERIAL_DEVICES="/dev/ttySP"
+ if [ "$LINUX_VERSION" == "2.6.35.3" ]; then
+ SERIAL_DEVICES="/dev/ttySP"
+ else
+ SERIAL_DEVICES="/dev/ttyAPP"
+ fi
else
echo "$1 platform not supported by this test"
exit 0
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2014-04-01 08:46:25
|
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 283bddb1f9822417cefb04f0b900fb156831d70c (commit)
from b43eb89e1839424b28a6573b7241eee25f86dfc8 (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 283bddb1f9822417cefb04f0b900fb156831d70c
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Apr 1 10:45:39 2014 +0200
[BUILDROOT] Optimize and enhance Marble package patch.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2013.11/188-marble-add_package.patch | 295 ++++++++------------
1 files changed, 122 insertions(+), 173 deletions(-)
diff --git a/patches/buildroot/2013.11/188-marble-add_package.patch b/patches/buildroot/2013.11/188-marble-add_package.patch
index e90148f..1994e67 100644
--- a/patches/buildroot/2013.11/188-marble-add_package.patch
+++ b/patches/buildroot/2013.11/188-marble-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2014-02-19 15:09:12.000000000 +0100
-+++ buildroot/package/Config.in 2014-02-20 14:32:01.000000000 +0100
+--- buildroot.orig/package/Config.in 2014-03-31 16:03:47.000000000 +0200
++++ buildroot/package/Config.in 2014-04-01 10:40:37.000000000 +0200
@@ -214,8 +214,9 @@
source "package/sdl_water/Config.in"
@@ -20,8 +20,8 @@ Index: buildroot/package/Config.in
Index: buildroot/package/marble/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/Config.in 2014-02-20 14:29:22.000000000 +0100
-@@ -0,0 +1,145 @@
++++ buildroot/package/marble/Config.in 2014-04-01 10:30:52.000000000 +0200
+@@ -0,0 +1,133 @@
+comment "Marble needs Qt to be installed"
+ depends on !BR2_PACKAGE_QT
+
@@ -33,30 +33,24 @@ Index: buildroot/package/marble/Config.in
+ select BR2_PACKAGE_QT_WEBKIT
+ select BR2_PACKAGE_QT_XML
+ help
-+ Compile & install KDE Marble for
-+ geolocalization applications.
++ Marble is a virtual globe and world atlas.
++ It can also be used as a library for geolocalization applications.
++
++ http://marble.kde.org/
+
+if BR2_PACKAGE_MARBLE
+
+config BR2_PACKAGE_MARBLE_BINARY
-+ bool "Marble binary"
-+ help
-+ Install Marble binary on target
++ bool "Install Marble binary"
+
+config BR2_PACKAGE_MARBLE_AUDIO
-+ bool "Audio files"
-+ help
-+ Install audio files on target
++ bool "Install audio files"
+
+config BR2_PACKAGE_MARBLE_BITMAPS
-+ bool "Bitmaps"
-+ help
-+ Install bitmaps on target
++ bool "Install bitmaps"
+
+config BR2_PACKAGE_MARBLE_FLAGS
-+ bool "Flags"
-+ help
-+ Install flags on target
++ bool "Install country flags"
+
+menu "Maps"
+
@@ -65,67 +59,67 @@ Index: buildroot/package/marble/Config.in
+config BR2_PACKAGE_MARBLE_BLUEMARBLE
+ bool "Bluemarble"
+ help
-+ Install Bluemarble map on target
++ Install Bluemarble map
+
+config BR2_PACKAGE_MARBLE_CITYLIGHTS
+ bool "Citylights"
+ help
-+ Install Citylights map on target
++ Install Citylights map
+
+config BR2_PACKAGE_MARBLE_CLOUDS
+ bool "Clouds"
+ help
-+ Install Clouds map on target
++ Install Clouds map
+
+config BR2_PACKAGE_MARBLE_HILLSHADING
+ bool "Hillshading"
+ help
-+ Install Hillshading map on target
++ Install Hillshading map
+
+config BR2_PACKAGE_MARBLE_OPENSTREETMAP
+ bool "OpenStreetMap"
+ help
-+ Install Openstreetmap map on target
++ Install Openstreetmap map
+
+config BR2_PACKAGE_MARBLE_PLAIN
+ bool "Plain"
+ help
-+ Install Plain map on target
++ Install Plain map
+
+config BR2_PACKAGE_MARBLE_PRECIP_DEC
+ bool "December precipitations"
+ help
-+ Install December precipitation map on target
++ Install December precipitation map
+
+config BR2_PACKAGE_MARBLE_PRECIP_JULY
+ bool "July precipitations"
+ help
-+ Install July precipitation map on target
++ Install July precipitation map
+
+config BR2_PACKAGE_MARBLE_SCHAGEN
+ bool "Schagen 1689"
+ help
-+ Install Schagen 1689 map on target
++ Install Schagen 1689 map
+
+config BR2_PACKAGE_MARBLE_SRTM
+ bool "SRTM"
+ help
-+ Install SRTM map on target
++ Install SRTM map
+
+config BR2_PACKAGE_MARBLE_SRTM2
+ bool "SRTM 2"
+ help
-+ Install SRTM 2 map on target
++ Install SRTM 2 map
+
+config BR2_PACKAGE_MARBLE_TEMP_DEC
+ bool "December temperatures"
+ help
-+ Install December temperature map on target
++ Install December temperature map
+
+config BR2_PACKAGE_MARBLE_TEMP_JULY
+ bool "July temperatures"
+ help
-+ Install July temperature map on target
++ Install July temperature map
+
+endmenu #Earth maps
+
@@ -134,278 +128,233 @@ Index: buildroot/package/marble/Config.in
+config BR2_PACKAGE_MARBLE_CLEMENTINE
+ bool "Clementine"
+ help
-+ Install Clementine map on target
++ Install Clementine map
+
+endmenu #Moon maps
+
+endmenu #Maps
+
+config BR2_PACKAGE_MARBLE_MWDBII
-+ bool "MWDBII files"
++ bool "Install MWDBII files"
+ help
-+ Install MWDBII files on target
++ Vector data files from Microworld II Database
+
+config BR2_PACKAGE_MARBLE_PLACEMARKS
-+ bool "Placemarks"
++ bool "Install placemarks"
+ help
-+ Install placemarks on target
++ Placemarks for remarkable points on maps or geometry placemarks
+
+config BR2_PACKAGE_MARBLE_STARS
-+ bool "Stars"
-+ help
-+ Install star data on target
++ bool "Install stars data"
+
+config BR2_PACKAGE_MARBLE_SVG
-+ bool "SVG files"
-+ help
-+ Install SVG files on target
++ bool "Install SVG files"
+
+config BR2_PACKAGE_MARBLE_WEATHER
-+ bool "Weather data"
-+ help
-+ Install weather data on target
++ bool "Install weather data"
+
+endif #BR2_PACKAGE_MARBLE
+
Index: buildroot/package/marble/marble.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/marble.mk 2014-02-20 13:44:28.000000000 +0100
-@@ -0,0 +1,238 @@
++++ buildroot/package/marble/marble.mk 2014-03-31 17:54:11.000000000 +0200
+@@ -0,0 +1,199 @@
+#############################################################
+#
+# KDE Marble
+#
+#############################################################
-+MARBLE_VERSION = 88ba87c90195dede8594375b2f81c9d926db3924
++MARBLE_VERSION = 0299004157ce00cf901b6113c4ac14fa0c323c00
+MARBLE_SOURCE = marble-$(MARBLE_VERSION)-source.tar.gz
+MARBLE_SITE = git://anongit.kde.org/marble.git
-+MARBLE_SITE_METHOD = git
+
+MARBLE_DEPENDENCIES = qt
+
+MARBLE_CONF_OPT += -DQTONLY=ON
+MARBLE_CONF_OPT += -DTILES_AT_COMPILETIME=OFF
+
-+define MARBLE_CONFIGURE_CMDS
-+ (cd $(@D) && \
-+ rm -f CMakeCache.txt && \
-+ $(HOST_DIR)/usr/bin/cmake $(@D) \
-+ -DCMAKE_TOOLCHAIN_FILE="$(BASE_DIR)/host/usr/share/buildroot/toolchainfile.cmake" \
-+ $(MARBLE_CONF_OPT) \
-+ )
-+endef
-+
-+define MARBLE_BUILD_CMDS
-+ $(MAKE) -C $(@D)
-+endef
-+
+MARBLE_INSTALL_STAGING = YES
+
+define MARBLE_CLEAN_TARGET_INSTALL
-+ rm -rf $(TARGET_DIR)/usr/local/share/marble/data/*
-+ rm -rf $(TARGET_DIR)/usr/local/include/marble
-+ rm -rf $(TARGET_DIR)/usr/local/bin/marble
-+endef
-+
-+define MARBLE_INSTALL_BINARY
-+ cp -rf $(STAGING_DIR)/usr/local/bin/marble $(TARGET_DIR)/usr/local/bin
-+endef
-+
-+define MARBLE_INSTALL_AUDIO_FILES
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/audio $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_BITMAPS
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/bitmaps $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_FLAGS
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/flags $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_BLUEMARBLE_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/bluemarble $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_CITYLIGHTS_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/citylights $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_CLOUDS_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/clouds $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ rm -rf $(TARGET_DIR)/usr/share/marble/data/*
++ rm -rf $(TARGET_DIR)/usr/include/marble
++ rm -rf $(TARGET_DIR)/usr/bin/marble
+endef
-+
-+define MARBLE_INSTALL_HILLSHADING_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/hillshading $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_OPENSTREETMAP_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/openstreetmap $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_PLAIN_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/plain $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_PRECIP_DEC_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/precip-dec $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_PRECIP_JULY_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/precip-july $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_SCHAGEN_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/schagen1689 $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_SRTM_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/srtm $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_SRTM2_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/srtm2 $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_TEMP_DEC_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/temp-dec $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_TEMP_JULY_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/temp-july $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+endef
-+
-+define MARBLE_INSTALL_CLEMENTINE_MAP
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/moon
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/moon/clementine $(TARGET_DIR)/usr/local/share/marble/data/maps/moon
-+endef
-+
-+define MARBLE_INSTALL_MWDBII_FILES
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/mwdbii $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_PLACEMARKS
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/placemarks $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_STARS_DATA
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/stars $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_SVG
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/svg $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+define MARBLE_INSTALL_WEATHER_DATA
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/weather $(TARGET_DIR)/usr/local/share/marble/data
-+endef
-+
-+
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_CLEAN_TARGET_INSTALL
+
+ifeq ($(BR2_PACKAGE_MARBLE_BINARY),y)
++define MARBLE_INSTALL_BINARY
++ cp -rf $(STAGING_DIR)/usr/bin/marble $(TARGET_DIR)/usr/bin
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BINARY
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_AUDIO),y)
++define MARBLE_INSTALL_AUDIO_FILES
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/audio $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_AUDIO_FILES
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_BITMAPS),y)
++define MARBLE_INSTALL_BITMAPS
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/bitmaps $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BITMAPS
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_FLAGS),y)
++define MARBLE_INSTALL_FLAGS
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/flags $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_FLAGS
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_BLUEMARBLE),y)
++define MARBLE_INSTALL_BLUEMARBLE_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/bluemarble $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BLUEMARBLE_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_CITYLIGHTS),y)
++define MARBLE_INSTALL_CITYLIGHTS_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/citylights $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CITYLIGHTS_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_CLOUDS),y)
++define MARBLE_INSTALL_CLOUDS_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/clouds $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CLOUDS_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_HILLSHADING),y)
++define MARBLE_INSTALL_HILLSHADING_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/hillshading $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_HILLSHADING_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_OPENSTREETMAP),y)
++define MARBLE_INSTALL_OPENSTREETMAP_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/openstreetmap $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_OPENSTREETMAP_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PLAIN),y)
++define MARBLE_INSTALL_PLAIN_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/plain $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PLAIN_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PRECIP_DEC),y)
++define MARBLE_INSTALL_PRECIP_DEC_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/precip-dec $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PRECIP_DEC_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PRECIP_JULY),y)
++define MARBLE_INSTALL_PRECIP_JULY_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/precip-july $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PRECIP_JULY_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SCHAGEN),y)
++define MARBLE_INSTALL_SCHAGEN_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/schagen1689 $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SCHAGEN_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SRTM),y)
++define MARBLE_INSTALL_SRTM_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/srtm $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SRTM_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SRTM2),y)
++define MARBLE_INSTALL_SRTM2_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/srtm2 $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SRTM2_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_TEMP_DEC),y)
++define MARBLE_INSTALL_TEMP_DEC_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/temp-dec $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_TEMP_DEC_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_TEMP_JULY),y)
++define MARBLE_INSTALL_TEMP_JULY_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/temp-july $(TARGET_DIR)/usr/share/marble/data/maps/earth
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_TEMP_JULY_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_CLEMENTINE),y)
++define MARBLE_INSTALL_CLEMENTINE_MAP
++ mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/moon
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/moon/clementine $(TARGET_DIR)/usr/share/marble/data/maps/moon
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CLEMENTINE_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_MWDBII),y)
++define MARBLE_INSTALL_MWDBII_FILES
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/mwdbii $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_MWDBII_FILES
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PLACEMARKS),y)
++define MARBLE_INSTALL_PLACEMARKS
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/placemarks $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PLACEMARKS
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_STARS),y)
++define MARBLE_INSTALL_STARS_DATA
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/stars $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_STARS_DATA
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SVG),y)
++define MARBLE_INSTALL_SVG
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/svg $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SVG
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_WEATHER),y)
++define MARBLE_INSTALL_WEATHER_DATA
++ cp -rf $(STAGING_DIR)/usr/share/marble/data/weather $(TARGET_DIR)/usr/share/marble/data
++endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_WEATHER_DATA
+endif
+
hooks/post-receive
--
armadeus
|
