armadeus-commitlog Mailing List for armadeus (Page 43)
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: jscheer <js...@us...> - 2014-07-29 12:42:08
|
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 0308252ab0e971a59a07f377f8212829434953e3 (commit)
from 9244433cb1f280a6d0ac94155b91c849e644bfdc (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 0308252ab0e971a59a07f377f8212829434953e3
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Jul 29 14:41:17 2014 +0200
[BUILDROOT] Fix shiboken configuration directory in config files.
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/219-shiboken-add_package.patch | 70 ++++++++++++++++++--
1 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/patches/buildroot/2013.11/219-shiboken-add_package.patch b/patches/buildroot/2013.11/219-shiboken-add_package.patch
index 0f6b916..b817ad0 100644
--- a/patches/buildroot/2013.11/219-shiboken-add_package.patch
+++ b/patches/buildroot/2013.11/219-shiboken-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-07-28 15:48:16.000000000 +0200
-+++ buildroot/package/Config.in 2014-07-28 17:03:50.000000000 +0200
+--- buildroot.orig/package/Config.in 2014-07-28 17:07:50.000000000 +0200
++++ buildroot/package/Config.in 2014-07-29 12:10:49.000000000 +0200
@@ -434,6 +434,7 @@
source "package/python-setuptools/Config.in"
source "package/python-thrift/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/shiboken/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/Config.in 2014-07-28 17:02:53.000000000 +0200
++++ buildroot/package/shiboken/Config.in 2014-07-28 17:07:50.000000000 +0200
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_SHIBOKEN
+ bool "Shiboken"
@@ -35,8 +35,8 @@ Index: buildroot/package/shiboken/Config.in
Index: buildroot/package/shiboken/shiboken.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken.mk 2014-07-28 16:53:10.000000000 +0200
-@@ -0,0 +1,65 @@
++++ buildroot/package/shiboken/shiboken.mk 2014-07-29 12:11:18.000000000 +0200
+@@ -0,0 +1,73 @@
+#############################################################
+#
+# Shiboken
@@ -51,6 +51,14 @@ Index: buildroot/package/shiboken/shiboken.mk
+
+SHIBOKEN_INSTALL_STAGING = YES
+
++define SHIBOKEN_SET_CONFIG_PATH
++ $(SED) "s:STAGING_DIR:$(STAGING_DIR):" $(@D)/data/ShibokenConfig.cmake.in
++ $(SED) "s:STAGING_DIR:$(STAGING_DIR):g" $(@D)/data/ShibokenConfig-spec.cmake.in
++ $(SED) "s:HOST_DIR:$(HOST_DIR):" $(@D)/data/ShibokenConfig-spec.cmake.in
++endef
++
++SHIBOKEN_POST_PATCH_HOOKS += SHIBOKEN_SET_CONFIG_PATH
++
+define HOST_SHIBOKEN_CONFIGURE_CMDS
+ (mkdir -p $(@D)/build && \
+ cd $(@D)/build && \
@@ -105,7 +113,7 @@ Index: buildroot/package/shiboken/shiboken.mk
Index: buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch 2014-07-28 16:53:10.000000000 +0200
++++ buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch 2014-07-28 17:07:50.000000000 +0200
@@ -0,0 +1,40 @@
+Compile shiboken module with previously generated x86 generator
+
@@ -150,7 +158,7 @@ Index: buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shibok
Index: buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch 2014-07-28 16:53:10.000000000 +0200
++++ buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch 2014-07-28 17:07:50.000000000 +0200
@@ -0,0 +1,56 @@
+Find pthread_cancel method when compiling ApiExtractor and generator
+
@@ -208,3 +216,51 @@ Index: buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patc
+
+ configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
+
+Index: buildroot/package/shiboken/shiboken-1.2.2-fix_shiboken_config_dir.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/shiboken/shiboken-1.2.2-fix_shiboken_config_dir.patch 2014-07-29 12:10:36.000000000 +0200
+@@ -0,0 +1,43 @@
++Fix directory where shiboken searches configuration.
++
++Signed-off-by: Jérémie Scheer <jer...@ar...>
++---
++Index: shiboken-1.2.2/data/ShibokenConfig.cmake.in
++===================================================================
++--- shiboken-1.2.2.orig/data/ShibokenConfig.cmake.in
+++++ shiboken-1.2.2/data/ShibokenConfig.cmake.in
++@@ -2,4 +2,4 @@
++ message(STATUS "Using default python: @PYTHON_SUFFIX@")
++ SET(PYTHON_SUFFIX @PYTHON_SUFFIX@)
++ endif()
++-include(@LIB_INSTALL_DIR@/cmake/Shiboken-@shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake)
+++include(STAGING_DIR/@LIB_INSTALL_DIR@/cmake/Shiboken-@shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake)
++
++Index: shiboken-1.2.2/data/ShibokenConfig-spec.cmake.in
++===================================================================
++--- shiboken-1.2.2.orig/data/ShibokenConfig-spec.cmake.in
+++++ shiboken-1.2.2/data/ShibokenConfig-spec.cmake.in
++@@ -5,7 +5,7 @@
++ # SHIBOKEN_PYTHON_INTERPRETER - Python interpreter (regular or debug) to be used with the bindings.
++ # SHIBOKEN_PYTHON_LIBRARIES - Python libraries (regular or debug) Shiboken is linked against.
++
++-SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken@shiboken_SUFFIX@")
+++SET(SHIBOKEN_INCLUDE_DIR "STAGING_DIR/@CMAKE_INSTALL_PREFIX@/include/shiboken@shiboken_SUFFIX@")
++ if(MSVC)
++ SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@.lib")
++ elseif(CYGWIN)
++@@ -13,7 +13,7 @@
++ elseif(WIN32)
++ SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
++ else()
++- SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+++ SET(SHIBOKEN_LIBRARY "STAGING_DIR/@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
++ endif()
++ SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@")
++ SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@")
++@@ -23,4 +23,4 @@
++ message(STATUS "libshiboken built for @SHIBOKEN_BUILD_TYPE@")
++ @SBK_ADD_PY_DEBUG_DEFINITION@
++
++-set(SHIBOKEN_BINARY "@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@")
+++set(SHIBOKEN_BINARY "HOST_DIR/@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@")
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-29 08:13: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 9244433cb1f280a6d0ac94155b91c849e644bfdc (commit)
from aee181eb574900f6b8bb85c7a34de11e775cafc0 (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 9244433cb1f280a6d0ac94155b91c849e644bfdc
Author: Philippe Reynes <tr...@ya...>
Date: Wed Jul 23 21:16:16 2014 +0200
[LINUX] 3.12: move to 3.12.25
-----------------------------------------------------------------------
Summary of changes:
...x-3.12.24.config => apf27-linux-3.12.25.config} | 0
...x-3.12.24.config => apf28-linux-3.12.25.config} | 0
...x-3.12.24.config => apf51-linux-3.12.25.config} | 0
patches/linux/{3.12.24 => 3.12.25} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.24.config => apf27-linux-3.12.25.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.24.config => apf28-linux-3.12.25.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.24.config => apf51-linux-3.12.25.config} (100%)
rename patches/linux/{3.12.24 => 3.12.25} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.24.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.25.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.24.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.25.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.24.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.25.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.24.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.25.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.24.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.25.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.24.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.25.config
diff --git a/patches/linux/3.12.24 b/patches/linux/3.12.25
similarity index 100%
rename from patches/linux/3.12.24
rename to patches/linux/3.12.25
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-29 08:05:43
|
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 aee181eb574900f6b8bb85c7a34de11e775cafc0 (commit)
via 74d065993d5e8b7b5f241fd3a05088ff1af68959 (commit)
via 4e2d88f4ca1baaf533066a49e23f056d0fd677fb (commit)
from 6c55c3e416588ee5628adc1875c8612b33fd53be (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 aee181eb574900f6b8bb85c7a34de11e775cafc0
Author: Philippe Reynes <tr...@ya...>
Date: Sat Jul 19 11:58:49 2014 +0200
[LINUX] 3.15: move to 3.15.6
commit 74d065993d5e8b7b5f241fd3a05088ff1af68959
Author: Philippe Reynes <tr...@ya...>
Date: Sat Jul 19 11:58:48 2014 +0200
[LINUX] 3.14: move to 3.14.13
commit 4e2d88f4ca1baaf533066a49e23f056d0fd677fb
Author: Philippe Reynes <tr...@ya...>
Date: Sat Jul 19 11:58:47 2014 +0200
[LINUX] 3.10: move to 3.10.49
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.48.config => apf27-linux-3.10.49.config} | 0
...x-3.14.12.config => apf27-linux-3.14.13.config} | 0
...nux-3.15.5.config => apf27-linux-3.15.6.config} | 0
...x-3.10.48.config => apf28-linux-3.10.49.config} | 0
...x-3.14.12.config => apf28-linux-3.14.13.config} | 0
...nux-3.15.5.config => apf28-linux-3.15.6.config} | 0
...x-3.10.48.config => apf51-linux-3.10.49.config} | 0
...x-3.14.12.config => apf51-linux-3.14.13.config} | 0
...nux-3.15.5.config => apf51-linux-3.15.6.config} | 0
patches/linux/{3.10.48 => 3.10.49} | 0
patches/linux/{3.14.12 => 3.14.13} | 0
patches/linux/{3.15.5 => 3.15.6} | 0
15 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.48.config => apf27-linux-3.10.49.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.12.config => apf27-linux-3.14.13.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15.5.config => apf27-linux-3.15.6.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.48.config => apf28-linux-3.10.49.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.12.config => apf28-linux-3.14.13.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.15.5.config => apf28-linux-3.15.6.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.48.config => apf51-linux-3.10.49.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.12.config => apf51-linux-3.14.13.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.15.5.config => apf51-linux-3.15.6.config} (100%)
rename patches/linux/{3.10.48 => 3.10.49} (100%)
rename patches/linux/{3.14.12 => 3.14.13} (100%)
rename patches/linux/{3.15.5 => 3.15.6} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 2a97609..a622f10 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.15.5"
+BR2_DEFAULT_KERNEL_VERSION="3.15.6"
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.15.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.6"
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 041500d..b57549a 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.15.5"
+BR2_DEFAULT_KERNEL_VERSION="3.15.6"
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.15.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.6"
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 f9301ac..88c23a7 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.15.5"
+BR2_DEFAULT_KERNEL_VERSION="3.15.6"
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.15.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.6"
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.48.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.49.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.48.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.49.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.12.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.13.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.12.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.13.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.5.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15.5.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15.6.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.48.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.49.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.48.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.49.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.12.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.13.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.12.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.13.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.5.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.15.5.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.15.6.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.48.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.49.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.48.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.49.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.12.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.13.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.12.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.13.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.5.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.15.5.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.15.6.config
diff --git a/patches/linux/3.10.48 b/patches/linux/3.10.49
similarity index 100%
rename from patches/linux/3.10.48
rename to patches/linux/3.10.49
diff --git a/patches/linux/3.14.12 b/patches/linux/3.14.13
similarity index 100%
rename from patches/linux/3.14.12
rename to patches/linux/3.14.13
diff --git a/patches/linux/3.15.5 b/patches/linux/3.15.6
similarity index 100%
rename from patches/linux/3.15.5
rename to patches/linux/3.15.6
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2014-07-28 15:06:17
|
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 6c55c3e416588ee5628adc1875c8612b33fd53be (commit)
from 7c1a9800752e4320ba556f3e89d5367e7edcbf22 (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 6c55c3e416588ee5628adc1875c8612b33fd53be
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Jul 28 17:05:49 2014 +0200
[BUILDROOT] Fix last commit for Shiboken package by selecting needed Qt's options.
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/219-shiboken-add_package.patch | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/patches/buildroot/2013.11/219-shiboken-add_package.patch b/patches/buildroot/2013.11/219-shiboken-add_package.patch
index ec3e418..0f6b916 100644
--- a/patches/buildroot/2013.11/219-shiboken-add_package.patch
+++ b/patches/buildroot/2013.11/219-shiboken-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-07-16 11:19:11.000000000 +0200
-+++ buildroot/package/Config.in 2014-07-16 14:01:14.000000000 +0200
+--- buildroot.orig/package/Config.in 2014-07-28 15:48:16.000000000 +0200
++++ buildroot/package/Config.in 2014-07-28 17:03:50.000000000 +0200
@@ -434,6 +434,7 @@
source "package/python-setuptools/Config.in"
source "package/python-thrift/Config.in"
@@ -17,12 +17,15 @@ Index: buildroot/package/Config.in
Index: buildroot/package/shiboken/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/Config.in 2014-07-16 13:59:35.000000000 +0200
-@@ -0,0 +1,10 @@
++++ buildroot/package/shiboken/Config.in 2014-07-28 17:02:53.000000000 +0200
+@@ -0,0 +1,13 @@
+config BR2_PACKAGE_SHIBOKEN
+ bool "Shiboken"
+ depends on BR2_PACKAGE_PYTHON
+ select BR2_PACKAGE_QT
++ select BR2_PACKAGE_QT_STL
++ select BR2_PACKAGE_QT_XML
++ select BR2_PACKAGE_QT_XMLPATTERNS
+ select BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_LIBXSLT
+ help
@@ -32,7 +35,7 @@ Index: buildroot/package/shiboken/Config.in
Index: buildroot/package/shiboken/shiboken.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken.mk 2014-07-28 15:20:26.000000000 +0200
++++ buildroot/package/shiboken/shiboken.mk 2014-07-28 16:53:10.000000000 +0200
@@ -0,0 +1,65 @@
+#############################################################
+#
@@ -102,7 +105,7 @@ Index: buildroot/package/shiboken/shiboken.mk
Index: buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch 2014-07-28 15:21:13.000000000 +0200
++++ buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch 2014-07-28 16:53:10.000000000 +0200
@@ -0,0 +1,40 @@
+Compile shiboken module with previously generated x86 generator
+
@@ -147,7 +150,7 @@ Index: buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shibok
Index: buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch 2014-07-28 14:39:46.000000000 +0200
++++ buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch 2014-07-28 16:53:10.000000000 +0200
@@ -0,0 +1,56 @@
+Find pthread_cancel method when compiling ApiExtractor and generator
+
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2014-07-28 13:51:55
|
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 7c1a9800752e4320ba556f3e89d5367e7edcbf22 (commit)
from 1195fd803eb715aeacd780dd56b76016aa83396f (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 7c1a9800752e4320ba556f3e89d5367e7edcbf22
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Jul 28 15:51:09 2014 +0200
[BUILDROOT] Add package Shiboken.
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/219-shiboken-add_package.patch | 207 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
2 files changed, 208 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/219-shiboken-add_package.patch
diff --git a/patches/buildroot/2013.11/219-shiboken-add_package.patch b/patches/buildroot/2013.11/219-shiboken-add_package.patch
new file mode 100644
index 0000000..ec3e418
--- /dev/null
+++ b/patches/buildroot/2013.11/219-shiboken-add_package.patch
@@ -0,0 +1,207 @@
+Add package Shiboken to Buildroot. This package is needed to compile PySide.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2014-07-16 11:19:11.000000000 +0200
++++ buildroot/package/Config.in 2014-07-16 14:01:14.000000000 +0200
+@@ -434,6 +434,7 @@
+ source "package/python-setuptools/Config.in"
+ source "package/python-thrift/Config.in"
+ endmenu
++source "package/shiboken/Config.in"
+ endif
+ source "package/python3/Config.in"
+ source "package/ruby/Config.in"
+Index: buildroot/package/shiboken/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/shiboken/Config.in 2014-07-16 13:59:35.000000000 +0200
+@@ -0,0 +1,10 @@
++config BR2_PACKAGE_SHIBOKEN
++ bool "Shiboken"
++ depends on BR2_PACKAGE_PYTHON
++ select BR2_PACKAGE_QT
++ select BR2_PACKAGE_LIBXML2
++ select BR2_PACKAGE_LIBXSLT
++ help
++ Shiboken generates bindings for C++ libraries using CPython source code.
++
++ https://pypi.python.org/pypi/Shiboken
+Index: buildroot/package/shiboken/shiboken.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/shiboken/shiboken.mk 2014-07-28 15:20:26.000000000 +0200
+@@ -0,0 +1,65 @@
++#############################################################
++#
++# Shiboken
++#
++#############################################################
++SHIBOKEN_VERSION = 1.2.2
++SHIBOKEN_SOURCE = shiboken-$(SHIBOKEN_VERSION).tar.bz2
++SHIBOKEN_SITE = download.qt-project.org/official_releases/pyside
++
++SHIBOKEN_DEPENDENCIES = python qt libxml2 libxslt host-shiboken
++HOST_SHIBOKEN_DEPENDENCIES = python qt libxml2 libxslt
++
++SHIBOKEN_INSTALL_STAGING = YES
++
++define HOST_SHIBOKEN_CONFIGURE_CMDS
++ (mkdir -p $(@D)/build && \
++ cd $(@D)/build && \
++ rm -f CMakeCache.txt && \
++ $(HOST_DIR)/usr/bin/cmake .. \
++ )
++endef
++
++define SHIBOKEN_CONFIGURE_CMDS
++ (mkdir -p $(@D)/build && \
++ cd $(@D)/build && \
++ mkdir -p $(@D)/build/generator && \
++ cp $(HOST_DIR)/usr/bin/shiboken $(@D)/build/generator/shiboken-x86 && \
++ rm -f CMakeCache.txt && \
++ $(SHIBOKEN_CONF_ENV) $(HOST_DIR)/usr/bin/cmake .. \
++ -DCMAKE_TOOLCHAIN_FILE="$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
++ -DCMAKE_INSTALL_PREFIX="/usr" \
++ $(SHIBOKEN_CONF_OPT) \
++ )
++endef
++
++define HOST_SHIBOKEN_BUILD_CMDS
++ (cd $(@D)/build && \
++ $(SHIBOKEN_MAKE) \
++ )
++endef
++
++define SHIBOKEN_BUILD_CMDS
++ (cd $(@D)/build && \
++ $(TARGET_MAKE_ENV) $(SHIBOKEN_MAKE_ENV) $(SHIBOKEN_MAKE) $(SHIBOKEN_MAKE_OPT) \
++ )
++endef
++
++define HOST_SHIBOKEN_INSTALL_CMDS
++ cp $(@D)/build/generator/shiboken $(HOST_DIR)/usr/bin
++endef
++
++define SHIBOKEN_INSTALL_STAGING_CMDS
++ (cd $(@D)/build && \
++ $(TARGET_MAKE_ENV) $(SHIBOKEN_MAKE_ENV) $(SHIBOKEN_MAKE) $(SHIBOKEN_MAKE_OPT) $(SHIBOKEN_INSTALL_STAGING_OPT) \
++ )
++endef
++
++define SHIBOKEN_INSTALL_TARGET_CMDS
++ (cd $(@D)/build && \
++ $(TARGET_MAKE_ENV) $(SHIBOKEN_MAKE_ENV) $(SHIBOKEN_MAKE) $(SHIBOKEN_MAKE_OPT) $(SHIBOKEN_INSTALL_TARGET_OPT) \
++ )
++endef
++
++$(eval $(autotools-package))
++$(eval $(host-autotools-package))
+Index: buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch 2014-07-28 15:21:13.000000000 +0200
+@@ -0,0 +1,40 @@
++Compile shiboken module with previously generated x86 generator
++
++Signed-off-by: Jérémie Scheer <jer...@ar...>
++---
++Index: shiboken-1.2.2/shibokenmodule/CMakeLists.txt
++===================================================================
++--- shiboken-1.2.2.orig/shibokenmodule/CMakeLists.txt
+++++ shiboken-1.2.2/shibokenmodule/CMakeLists.txt
++@@ -8,11 +8,19 @@
++ ${CMAKE_CURRENT_BINARY_DIR}/shiboken/shiboken_module_wrapper.cpp
++ )
++
++-add_custom_command(OUTPUT ${sample_SRC}
++-COMMAND ${shibokengenerator_BINARY_DIR}/shiboken --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
++-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++-COMMENT "Running generator for 'shiboken'..."
++-)
+++if(EXISTS "${shibokengenerator_BINARY_DIR}/shiboken-x86")
+++ add_custom_command(OUTPUT ${sample_SRC}
+++ COMMAND ${shibokengenerator_BINARY_DIR}/shiboken-x86 --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
+++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+++ COMMENT "Running generator for 'shiboken'..."
+++ )
+++else()
+++ add_custom_command(OUTPUT ${sample_SRC}
+++ COMMAND ${shibokengenerator_BINARY_DIR}/shiboken --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
+++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+++ COMMENT "Running generator for 'shiboken'..."
+++ )
+++endif()
++
++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
++ ${CMAKE_SOURCE_DIR}
++@@ -31,4 +39,4 @@
++
++ add_dependencies(shibokenmodule shiboken)
++
++-install(TARGETS shibokenmodule DESTINATION ${PYTHON_SITE_PACKAGES})
++\ No newline at end of file
+++install(TARGETS shibokenmodule DESTINATION ${PYTHON_SITE_PACKAGES})
+Index: buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch 2014-07-28 14:39:46.000000000 +0200
+@@ -0,0 +1,56 @@
++Find pthread_cancel method when compiling ApiExtractor and generator
++
++Signed-off-by: Jérémie Scheer <jer...@ar...>
++---
++Index: shiboken-1.2.2/ApiExtractor/CMakeLists.txt
++===================================================================
++--- shiboken-1.2.2.orig/ApiExtractor/CMakeLists.txt
+++++ shiboken-1.2.2/ApiExtractor/CMakeLists.txt
++@@ -91,7 +91,8 @@
++ )
++
++ add_library(apiextractor STATIC ${apiextractor_SRC} ${apiextractor_RCCS_SRC})
++-target_link_libraries(apiextractor ${APIEXTRACTOR_EXTRA_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTXMLPATTERNS_LIBRARY} ${QT_QTXML_LIBRARY})
+++find_package (Threads)
+++target_link_libraries(apiextractor ${APIEXTRACTOR_EXTRA_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTXMLPATTERNS_LIBRARY} ${QT_QTXML_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
++
++ if (BUILD_TESTS)
++ enable_testing()
++
++Index: shiboken-1.2.2/generator/CMakeLists.txt
++===================================================================
++--- shiboken-1.2.2.orig/generator/CMakeLists.txt
+++++ shiboken-1.2.2/generator/CMakeLists.txt
++@@ -27,10 +27,12 @@
++ add_executable(shiboken ${shiboken_SRC})
++ add_dependencies(shiboken apiextractor)
++ set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
+++find_package (Threads)
++ target_link_libraries(shiboken
++ apiextractor
++ ${QT_QTCORE_LIBRARY}
++- ${QT_QTXML_LIBRARY})
+++ ${QT_QTXML_LIBRARY}
+++ ${CMAKE_THREAD_LIBS_INIT})
++
++ configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
++
++
++Index: shiboken-1.2.2/generator/shiboken/CMakeLists.txt
++===================================================================
++--- shiboken-1.2.2.orig/generator/shiboken/CMakeLists.txt
+++++ shiboken-1.2.2/generator/shiboken/CMakeLists.txt
++@@ -20,10 +20,12 @@
++
++ add_executable(shiboken ${shiboken_SRC})
++ set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
+++find_package (Threads)
++ target_link_libraries(shiboken
++ ${APIEXTRACTOR_LIBRARY}
++ ${QT_QTCORE_LIBRARY}
++- ${QT_QTXML_LIBRARY})
+++ ${QT_QTXML_LIBRARY}
+++ ${CMAKE_THREAD_LIBS_INIT})
++
++ configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
++
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 71ad2d9..b30ebe6 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -89,3 +89,4 @@ rm -rf buildroot/package/xc3sprog/
rm -rf buildroot/package/sam7-pgm-ng/
rm -rf buildroot/package/tk/
rm -rf buildroot/package/libhid/
+rm -rf buildroot/package/shiboken/
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-07-28 10:22:49
|
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 1195fd803eb715aeacd780dd56b76016aa83396f (commit)
from 5f9489ae197d4febd1b7a85cd1942570dfa3110c (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 1195fd803eb715aeacd780dd56b76016aa83396f
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Jul 28 12:22:54 2014 +0200
[LINUX] 3.1{5,6}: apf28: move the usb0 id pin muxing node at the right
place.
-----------------------------------------------------------------------
Summary of changes:
.../3.15/0420-armadeus-Add-apf28dev-dts.patch | 42 ++++++++++----------
.../3.16/0420-armadeus-Add-apf28dev-dts.patch | 42 ++++++++++----------
2 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
index 18d88aa..8639882 100644
--- a/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.15/0420-armadeus-Add-apf28dev-dts.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Fix spidev
Signed-off-by: Julien Boibessot <jul...@ar...>
---
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
---- linux-3.15-rc1.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
-@@ -109,6 +109,15 @@
- };
- };
- };
+--- linux-3.15.5.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+@@ -77,6 +77,15 @@
+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
+ fsl,pull-up = <MXS_PULL_DISABLE>;
+ };
+
+ apf28dev_usb0_id_pins: apf28dev-usb0-id-pins@0 {
+ reg = <0>;
@@ -22,24 +22,24 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
+ fsl,pull-up = <MXS_PULL_ENABLE>;
+ };
- };
- };
-
+ };
+
+ lcdif@80030000 {
@@ -143,7 +152,8 @@
- ahb@80080000 {
- usb0: usb@80080000 {
- pinctrl-names = "default";
+ ahb@80080000 {
+ usb0: usb@80080000 {
+ pinctrl-names = "default";
- pinctrl-0 = <&usb0_otg_apf28dev>;
+ pinctrl-0 = <&usb0_otg_apf28dev
+ &apf28dev_usb0_id_pins>;
- vbus-supply = <®_usb0_vbus>;
- status = "okay";
- };
+ vbus-supply = <®_usb0_vbus>;
+ status = "okay";
+ };
@@ -202,6 +212,7 @@
- label = "User button";
- gpios = <&gpio0 17 0>;
- linux,code = <0x100>;
+ label = "User button";
+ gpios = <&gpio0 17 0>;
+ linux,code = <0x100>;
+ gpio-key,wakeup;
- };
- };
+ };
+ };
};
diff --git a/patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch
index 18d88aa..8639882 100644
--- a/patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.16/0420-armadeus-Add-apf28dev-dts.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Fix spidev
Signed-off-by: Julien Boibessot <jul...@ar...>
---
-Index: linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
---- linux-3.15-rc1.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
-@@ -109,6 +109,15 @@
- };
- };
- };
+--- linux-3.15.5.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+@@ -77,6 +77,15 @@
+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
+ fsl,pull-up = <MXS_PULL_DISABLE>;
+ };
+
+ apf28dev_usb0_id_pins: apf28dev-usb0-id-pins@0 {
+ reg = <0>;
@@ -22,24 +22,24 @@ Index: linux-3.15-rc1/arch/arm/boot/dts/imx28-apf28dev.dts
+ fsl,voltage = <MXS_VOLTAGE_HIGH>;
+ fsl,pull-up = <MXS_PULL_ENABLE>;
+ };
- };
- };
-
+ };
+
+ lcdif@80030000 {
@@ -143,7 +152,8 @@
- ahb@80080000 {
- usb0: usb@80080000 {
- pinctrl-names = "default";
+ ahb@80080000 {
+ usb0: usb@80080000 {
+ pinctrl-names = "default";
- pinctrl-0 = <&usb0_otg_apf28dev>;
+ pinctrl-0 = <&usb0_otg_apf28dev
+ &apf28dev_usb0_id_pins>;
- vbus-supply = <®_usb0_vbus>;
- status = "okay";
- };
+ vbus-supply = <®_usb0_vbus>;
+ status = "okay";
+ };
@@ -202,6 +212,7 @@
- label = "User button";
- gpios = <&gpio0 17 0>;
- linux,code = <0x100>;
+ label = "User button";
+ gpios = <&gpio0 17 0>;
+ linux,code = <0x100>;
+ gpio-key,wakeup;
- };
- };
+ };
+ };
};
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2014-07-24 14:31:06
|
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 5f9489ae197d4febd1b7a85cd1942570dfa3110c (commit)
from 93b67467958ab843fa5c754116b5632414193c9c (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 5f9489ae197d4febd1b7a85cd1942570dfa3110c
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jul 24 16:30:10 2014 +0200
[BUILDROOT]packages: addings imx_usb_loader for i.MX6, i.MX51 and i.MX53
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 1 +
.../package/armadeus/imx_usb_loader/Config.in | 13 ++++++
.../armadeus/imx_usb_loader/imx_usb_loader.mk | 42 ++++++++++++++++++++
3 files changed, 56 insertions(+), 0 deletions(-)
create mode 100644 buildroot/package/armadeus/imx_usb_loader/Config.in
create mode 100644 buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 2dedd75..6ba7f6f 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -5,6 +5,7 @@ source package/armadeus/as_devices/Config.in
source package/armadeus/demos/Config.in
source package/armadeus/fpgaregs/Config.in
source package/armadeus/fpga_firmware/Config.in
+source package/armadeus/imx_usb_loader/Config.in
source package/armadeus/imx28-usb-downloader/Config.in
source package/armadeus/imxregs/Config.in
source package/armadeus/imxssi/Config.in
diff --git a/buildroot/package/armadeus/imx_usb_loader/Config.in b/buildroot/package/armadeus/imx_usb_loader/Config.in
new file mode 100644
index 0000000..7e98bca
--- /dev/null
+++ b/buildroot/package/armadeus/imx_usb_loader/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_IMX_USB_LOADER
+ bool "imx_usb_loader (target)"
+ depends on BR2_PACKAGE_LIBUSB_COMPAT
+ help
+ Target tool to download i.MX51, i.MX53 and i.MX6 binary through USB and
+ serial.
+
+config BR2_PACKAGE_HOST_IMX_USB_LOADER
+ bool "imx_usb_loader (host)"
+ depends on BR2_PACKAGE_LIBUSB_COMPAT
+ help
+ Target tool to download i.MX51, i.MX53 and i.MX6 binary through USB and
+ serial.
diff --git a/buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk b/buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk
new file mode 100644
index 0000000..02c7042
--- /dev/null
+++ b/buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk
@@ -0,0 +1,42 @@
+################################################################################
+#
+# imx_usb_loader from github
+#
+################################################################################
+
+IMX_USB_LOADER_VERSION = 18d858d3c62dde9bd67580a740f07d07930c9b4f
+IMX_USB_LOADER_SITE = https://github.com/boundarydevices/imx_usb_loader.git
+IMX_USB_LOADER_SITE_METHOD = git
+IMX_USB_LOADER_DEPENDENCIES = libusb-compat libusb
+
+IMX_USB_LOADER_BIN_NAME = imx_usb
+IMX_UART_LOADER_BIN_NAME = imx_uart
+
+define IMX_USB_LOADER_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D) imx_usb
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D) imx_uart
+endef
+
+define HOST_IMX_USB_LOADER_BUILD_CMDS
+ $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" USBCFLAGS="-lusb" USBLDFLAGS="-lusb" -C $(@D) imx_usb
+ $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) imx_uart
+endef
+
+define IMX_USB_LOADER_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 $(@D)/$(IMX_USB_LOADER_BIN_NAME) \
+ $(TARGET_DIR)/usr/bin/$(IMX_USB_LOADER_BIN_NAME)
+ $(INSTALL) -m 0755 $(@D)/$(IMX_UART_LOADER_BIN_NAME) \
+ $(TARGET_DIR)/usr/bin/$(IMX_UART_LOADER_BIN_NAME)
+ $(INSTALL) -m 644 $(@D)/*.conf \
+ $(TARGET_DIR)/usr/share/
+endef
+
+define HOST_IMX_USB_LOADER_INSTALL_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/$(IMX_USB_LOADER_BIN_NAME) \
+ $(HOST_DIR)/usr/bin/$(IMX_USB_LOADER_BIN_NAME)
+ $(INSTALL) -m 0755 $(@D)/$(IMX_UART_LOADER_BIN_NAME) \
+ $(HOST_DIR)/usr/bin/$(IMX_UART_LOADER_BIN_NAME)
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-21 21:17:55
|
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 93b67467958ab843fa5c754116b5632414193c9c (commit)
from cfb0a25079842e1c6cdaa6a74580e26fd4ceb7be (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 93b67467958ab843fa5c754116b5632414193c9c
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jul 21 23:17:30 2014 +0200
[UBOOT] 2014.07: Fix apf9328 FPGA behavior
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2014.07/103-apf9328.patch | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/patches/u-boot/2014.07/103-apf9328.patch b/patches/u-boot/2014.07/103-apf9328.patch
index fd7fc54..4e7e1bb 100644
--- a/patches/u-boot/2014.07/103-apf9328.patch
+++ b/patches/u-boot/2014.07/103-apf9328.patch
@@ -115,7 +115,7 @@ new file mode 100644
index 0000000..9782115
--- /dev/null
+++ b/board/armadeus/apf9328/apf9328fpga.c
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2005-2014
+ * Nicolas Colombain <nic...@ar...>
@@ -160,7 +160,8 @@ index 0000000..9782115
+ slave_serial,
+ XILINX_XC3S400_SIZE,
+ (void *)&fpga_fns,
-+ 0}
++ 0,
++ &spartan3_op }
+};
+
+/*
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-07-17 12:01:06
|
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 cfb0a25079842e1c6cdaa6a74580e26fd4ceb7be (commit)
via cfc03ca913379b16c45031642f104800f367c954 (commit)
from 24bba4b707f9f68b9a085bf76b0181a481faea87 (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 cfb0a25079842e1c6cdaa6a74580e26fd4ceb7be
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jul 17 14:00:08 2014 +0200
[LINUX] 3.16: apf6: fix a hard machine hang.
This patch comes from the linux-arm-kernel mailing list:
https://patchwork.kernel.org/patch/4574381/
commit cfc03ca913379b16c45031642f104800f367c954
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Jul 17 13:58:03 2014 +0200
[LINUX] 3.16: apf6: move to linux 3.16-rc5
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...-3.16-rc2.config => apf6-linux-3.16-rc5.config} | 0
patches/linux/{3.16-rc2 => 3.16-rc5} | 0
...-lvds_sel-input-from-upstream-clock-gates.patch | 59 ++++++++++++++++++++
4 files changed, 60 insertions(+), 1 deletions(-)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.16-rc2.config => apf6-linux-3.16-rc5.config} (100%)
rename patches/linux/{3.16-rc2 => 3.16-rc5} (100%)
create mode 100644 patches/linux/3.16/0506-arm-clk-imx6q-parent-lvds_sel-input-from-upstream-clock-gates.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 5e82ee9..c37563b 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.16-rc2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.16-rc5"
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.16-rc2.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc2.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.16-rc5.config
diff --git a/patches/linux/3.16-rc2 b/patches/linux/3.16-rc5
similarity index 100%
rename from patches/linux/3.16-rc2
rename to patches/linux/3.16-rc5
diff --git a/patches/linux/3.16/0506-arm-clk-imx6q-parent-lvds_sel-input-from-upstream-clock-gates.patch b/patches/linux/3.16/0506-arm-clk-imx6q-parent-lvds_sel-input-from-upstream-clock-gates.patch
new file mode 100644
index 0000000..0f8c43c
--- /dev/null
+++ b/patches/linux/3.16/0506-arm-clk-imx6q-parent-lvds_sel-input-from-upstream-clock-gates.patch
@@ -0,0 +1,59 @@
+From patchwork Thu Jul 17 10:20:14 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: arm: clk-imx6q: parent lvds_sel input from upstream clock gates
+From: Lucas Stach <l....@pe...>
+X-Patchwork-Id: 371047
+Message-Id: <140...@pe...>
+To: Shawn Guo <sha...@fr...>, Arnd Bergmann <ar...@ar...>,
+ Olof Johansson <ol...@li...>
+Cc: ke...@pe..., lin...@li...
+Date: Thu, 17 Jul 2014 12:20:14 +0200
+
+The i.MX6 reference manual doesn't make a clear distinction
+between the fixed clock divider and the enable gate for the
+pcie and sata reference clocks. This lead to the lvds mux
+inputs in the imx6q clk driver to be parented from the
+ref clock (which is the divider) instead of the actual gate,
+which in turn prevents the upstream clock to actually be
+enabled when lvds clk out is active.
+
+This fixes a hard machine hang regression in kernel 3.16 for
+boards where only pcie is active but no sata, as with this
+kernel version the imx6-pcie driver is no longer enabling
+the upstream clock directly but only lvds clk out.
+
+Reported-by: Arne Ruhnau <arn...@ta...>
+Signed-off-by: Lucas Stach <l....@pe...>
+Tested-by: Arne Ruhnau <arn...@ta...>
+
+---
+Shawn, this is an urgent fix for 3.16. Can you please
+Ack it so arm-soc people can take this directly?
+---
+ arch/arm/mach-imx/clk-imx6q.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
+index 8e795dea02ec..8556c787e59c 100644
+--- a/arch/arm/mach-imx/clk-imx6q.c
++++ b/arch/arm/mach-imx/clk-imx6q.c
+@@ -70,7 +70,7 @@ static const char *cko_sels[] = { "cko1", "cko2", };
+ static const char *lvds_sels[] = {
+ "dummy", "dummy", "dummy", "dummy", "dummy", "dummy",
+ "pll4_audio", "pll5_video", "pll8_mlb", "enet_ref",
+- "pcie_ref", "sata_ref",
++ "pcie_ref_125m", "sata_ref_100m",
+ };
+
+ enum mx6q_clks {
+@@ -491,7 +491,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
+
+ /* All existing boards with PCIe use LVDS1 */
+ if (IS_ENABLED(CONFIG_PCI_IMX6))
+- clk_set_parent(clk[lvds1_sel], clk[sata_ref]);
++ clk_set_parent(clk[lvds1_sel], clk[sata_ref_100m]);
+
+ /* Set initial power mode */
+ imx6q_set_lpm(WAIT_CLOCKED);
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-07-16 16:04:55
|
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 24bba4b707f9f68b9a085bf76b0181a481faea87 (commit)
from cea7ad94611ad79dbd4407517ec2ff861da03afa (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 24bba4b707f9f68b9a085bf76b0181a481faea87
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Jul 16 17:58:43 2014 +0200
[UBOOT] 2014.07: add preliminary apf6 support.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 10 +
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 262 ++++++++
patches/u-boot/2014.07/503-add-apf6.patch | 649 ++++++++++++++++++++
3 files changed, 921 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
create mode 100644 patches/u-boot/2014.07/503-add-apf6.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 9298fae..5e82ee9 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -59,3 +59,13 @@ BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
new file mode 100644
index 0000000..2691849
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2013 Armadeus Systems
+ *
+ * Configuration settings for the apf6.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+/*
+#define DEBUG
+*/
+
+#define CONFIG_SYS_GENERIC_BOARD
+
+/* SPL */
+#define CONFIG_SPL_MMC_SUPPORT
+
+#include "imx6_spl.h"
+#include "mx6_common.h"
+
+#define CONFIG_MX6
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
+
+#define MACH_TYPE_APF6 4412 /* has to be changed !! */
+#define CONFIG_MACH_TYPE MACH_TYPE_APF6
+
+#include <asm/arch/imx-regs.h>
+#include <asm/imx-common/gpio.h>
+#include <linux/sizes.h>
+
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_INITRD_TAG
+#define CONFIG_REVISION_TAG
+
+/* Size of malloc() pool */
+#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
+
+#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_BOARD_LATE_INIT
+#define CONFIG_MXC_GPIO
+
+#define CONFIG_MXC_UART
+#define CONFIG_MXC_UART_BASE UART4_BASE
+
+/* allow to overwrite serial and ethaddr */
+#define CONFIG_ENV_OVERWRITE
+#define CONFIG_CONS_INDEX 1
+#define CONFIG_BAUDRATE 115200
+
+/* Command definition */
+#include <config_cmd_default.h>
+
+#undef CONFIG_CMD_IMLS
+
+#define CONFIG_CMD_BMODE
+#define CONFIG_CMD_SETEXPR
+
+#define CONFIG_BOOTDELAY 5
+
+#define CONFIG_SYS_MEMTEST_START 0x10000000
+#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
+#define CONFIG_LOADADDR 0x12000000
+#define CONFIG_SYS_TEXT_BASE 0x17800000
+
+/* MMC Configuration */
+#define CONFIG_FSL_ESDHC
+#define CONFIG_FSL_USDHC
+#define CONFIG_SYS_FSL_USDHC_NUM 2
+#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
+
+#define CONFIG_MMC
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_BOUNCE_BUFFER
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_DOS_PARTITION
+
+/* Ethernet Configuration */
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NET
+#define CONFIG_FEC_MXC
+#define CONFIG_MII
+#define IMX_FEC_BASE ENET_BASE_ADDR
+#define CONFIG_FEC_XCV_TYPE RGMII
+#define CONFIG_ETHPRIME "FEC"
+#define CONFIG_FEC_MXC_PHYADDR 1
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_ATHEROS
+
+/* Framebuffer */
+#define CONFIG_VIDEO
+#define CONFIG_VIDEO_IPUV3
+#define CONFIG_CFB_CONSOLE
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
+#define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SCREEN_ALIGN
+#define CONFIG_BMP_16BPP
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
+#define CONFIG_IPUV3_CLK 260000000
+#define CONFIG_IMX_HDMI
+
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "script=boot.scr\0" \
+ "uimage=uImage\0" \
+ "console=ttymxc3\0" \
+ "splashpos=m,m\0" \
+ "fdt_high=0xffffffff\0" \
+ "initrd_high=0xffffffff\0" \
+ "fdt_addr=0x18000000\0" \
+ "boot_fdt=try\0" \
+ "ip_dyn=yes\0" \
+ "mmcdev=0\0" \
+ "mmcpart=1\0" \
+ "mmcroot=/dev/mmcblk0p2 ro\0" \
+ "mmcrootfstype=ext4 rootwait\0" \
+ "update_sd_firmware_filename=u-boot.imx\0" \
+ "update_sd_firmware=" \
+ "if test ${ip_dyn} = yes; then " \
+ "setenv get_cmd dhcp; " \
+ "else " \
+ "setenv get_cmd tftp; " \
+ "fi; " \
+ "if mmc dev ${mmcdev}; then " \
+ "if ${get_cmd} ${update_sd_firmware_filename}; then " \
+ "setexpr fw_sz ${filesize} / 0x200; " \
+ "setexpr fw_sz ${fw_sz} + 1; " \
+ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \
+ "fi; " \
+ "fi\0" \
+ "mmcargs=setenv bootargs console=${console},${baudrate} " \
+ "${optargs} " \
+ "root=${mmcroot} " \
+ "rootfstype=${mmcrootfstype} " \
+ "video=${video}\0" \
+ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \
+ "importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
+ "env import -t $loadaddr $filesize\0" \
+ "loadbootscript=" \
+ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+ "bootscript=echo Running bootscript from mmc ...; " \
+ "source\0" \
+ "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+ "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
+ "mmcboot=echo Booting from mmc ...; " \
+ "run mmcargs; " \
+ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+ "if run loadfdt; then " \
+ "bootz ${loadaddr} - ${fdt_addr}; " \
+ "else " \
+ "if test ${boot_fdt} = try; then " \
+ "bootz ${loadaddr}; " \
+ "else " \
+ "echo WARN: Cannot load the DT; " \
+ "fi; " \
+ "fi; " \
+ "else " \
+ "bootz ${loadaddr}; " \
+ "fi;\0" \
+ "netargs=setenv bootargs console=${console},${baudrate} " \
+ "root=/dev/nfs " \
+ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
+ "netboot=echo Booting from net ...; " \
+ "run netargs; " \
+ "if test ${ip_dyn} = yes; then " \
+ "setenv get_cmd dhcp; " \
+ "else " \
+ "setenv get_cmd tftp; " \
+ "fi; " \
+ "${get_cmd} zImage; " \
+ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+ "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+ "bootz ${loadaddr} - ${fdt_addr}; " \
+ "else " \
+ "if test ${boot_fdt} = try; then " \
+ "bootz ${loadaddr}; " \
+ "else " \
+ "echo WARN: Cannot load the DT; " \
+ "fi; " \
+ "fi; " \
+ "else " \
+ "bootz ${loadaddr}; " \
+ "fi;"
+
+#define CONFIG_BOOTCOMMAND \
+ "mmc dev ${mmcdev};" \
+ "if mmc rescan; then " \
+ "echo SD/MMC found on device ${mmcdev};" \
+ "if run loadbootenv; then " \
+ "run importbootenv;" \
+ "fi;" \
+ "echo Checking if uenvcmd is set ...;" \
+ "if test -n $uenvcmd; then " \
+ "echo Running uenvcmd ...;" \
+ "run uenvcmd;" \
+ "fi;" \
+ "echo Running default loadzimage ...;" \
+ "if run loadzimage; then " \
+ "run mmcboot;" \
+ "fi;" \
+ "fi;"
+
+/* Miscellaneous configurable options */
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_PROMPT "=> "
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_SYS_CBSIZE 256
+
+/* Print Buffer Size */
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_MAXARGS 16
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+
+#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+#define CONFIG_SYS_HZ 1000
+
+#define CONFIG_CMDLINE_EDITING
+
+/* Physical Memory Map */
+#define CONFIG_NR_DRAM_BANKS 1
+#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
+
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
+#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
+
+#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)
+
+/* FLASH and environment organization */
+#define CONFIG_SYS_NO_FLASH
+
+#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_SIZE (8 * 1024)
+
+#define CONFIG_OF_LIBFDT
+#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
+
+#ifndef CONFIG_SYS_DCACHE_OFF
+#define CONFIG_CMD_CACHE
+#endif
+
+#endif /* __CONFIG_H * */
diff --git a/patches/u-boot/2014.07/503-add-apf6.patch b/patches/u-boot/2014.07/503-add-apf6.patch
new file mode 100644
index 0000000..b2349bf
--- /dev/null
+++ b/patches/u-boot/2014.07/503-add-apf6.patch
@@ -0,0 +1,649 @@
+Index: uboot-2014.07/boards.cfg
+===================================================================
+--- uboot-2014.07.orig/boards.cfg
++++ uboot-2014.07/boards.cfg
+@@ -318,6 +318,7 @@ Active arm armv7 mx6
+ Active arm armv7 mx6 - wandboard wandboard_dl wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 Fabio Estevam <fab...@fr...>
+ Active arm armv7 mx6 - wandboard wandboard_quad wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048 Fabio Estevam <fab...@fr...>
+ Active arm armv7 mx6 - wandboard wandboard_solo wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 Fabio Estevam <fab...@fr...>
++Active arm armv7 mx6 armadeus apf6 apf6 apf6:IMX_CONFIG=board/armadeus/apf6/apf6.cfg,MX6QDL,SPL Armadeus Systems <co...@ar...>
+ Active arm armv7 mx6 barco titanium titanium titanium:IMX_CONFIG=board/barco/titanium/imximage.cfg Stefan Roese <sr...@de...>
+ Active arm armv7 mx6 boundary nitrogen6x mx6qsabrelite nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE Eric Nelson <eri...@bo...>
+ Active arm armv7 mx6 boundary nitrogen6x nitrogen6dl nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 Eric Nelson <eri...@bo...>
+Index: uboot-2014.07/board/armadeus/apf6/Makefile
+===================================================================
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/Makefile
+@@ -0,0 +1,8 @@
++#
++# Copyright (C) 2014, ARMadeus Systems <su...@ar...>
++#
++# SPDX-License-Identifier: GPL-2.0+
++#
++
++obj-y := apf6.o
++obj-$(CONFIG_SPL_BUILD) += apf6_spl.o
+Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+===================================================================
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/apf6.c
+@@ -0,0 +1,307 @@
++/*
++ * Copyright (C) 2013 Armadeus systems.
++ *
++ * Author: Nicolas Colombain <nic...@ar...>
++ *
++ * SPDX-License-Identifier: GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/clock.h>
++#include <asm/arch/imx-regs.h>
++#include <asm/arch/iomux.h>
++#include <asm/arch/mx6-pins.h>
++#include <asm/arch/crm_regs.h>
++#include <asm/arch/sys_proto.h>
++#include <asm/gpio.h>
++#include <asm/imx-common/iomux-v3.h>
++#include <asm/imx-common/mxc_i2c.h>
++#include <asm/imx-common/boot_mode.h>
++#include <hwconfig.h>
++#include <linux/ctype.h>
++#include <fdt_support.h>
++#include <fsl_esdhc.h>
++#include <miiphy.h>
++#include <mmc.h>
++#include <mtd_node.h>
++#include <netdev.h>
++#include <fdt_support.h>
++#include <ipu_pixfmt.h>
++#include <mmc.h>
++#include <linux/fb.h>
++
++DECLARE_GLOBAL_DATA_PTR;
++
++#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \
++ PAD_CTL_SRE_FAST | PAD_CTL_HYS)
++
++#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \
++ PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \
++ PAD_CTL_SRE_FAST | PAD_CTL_HYS)
++
++#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
++
++#define USDHC2_CD_GPIO IMX_GPIO_NR(1, 2)
++#define ETH_PHY_RESET IMX_GPIO_NR(1, 24)
++
++static iomux_v3_cfg_t const uart4_pads[] = {
++ IOMUX_PADS(PAD_CSI0_DAT12__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
++ IOMUX_PADS(PAD_CSI0_DAT13__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
++};
++
++static iomux_v3_cfg_t const usdhc2_pads[] = {
++ IOMUX_PADS(PAD_SD2_CLK__SD2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_CMD__SD2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_DAT0__SD2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_DAT1__SD2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_DAT2__SD2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_DAT3__SD2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_GPIO_2__GPIO1_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL)),
++};
++
++static iomux_v3_cfg_t const usdhc3_pads[] = {
++ IOMUX_PADS(PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++};
++
++static iomux_v3_cfg_t const enet_pads[] = {
++ IOMUX_PADS(PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TXC__RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TD0__RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TD1__RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TD2__RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TD3__RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TX_CTL__RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_ENET_REF_CLK__ENET_TX_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ /* AR8035 PHY Reset */
++ IOMUX_PADS(PAD_ENET_RX_ER__GPIO1_IO24 | MUX_PAD_CTRL(NO_PAD_CTRL)),
++};
++
++static void setup_iomux_uart(void)
++{
++ SETUP_IOMUX_PADS(uart4_pads);
++}
++
++static void setup_iomux_enet(void)
++{
++ SETUP_IOMUX_PADS(enet_pads);
++
++ /* Reset AR8035 PHY */
++ gpio_direction_output(ETH_PHY_RESET, 0);
++ udelay(500);
++ gpio_set_value(ETH_PHY_RESET, 1);
++}
++
++static struct fsl_esdhc_cfg usdhc_cfg[2] = {
++ {USDHC2_BASE_ADDR},
++ {USDHC3_BASE_ADDR},
++};
++
++int board_mmc_getcd(struct mmc *mmc)
++{
++ struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
++ int ret = 0;
++
++ switch (cfg->esdhc_base) {
++ case USDHC2_BASE_ADDR:
++ ret = !gpio_get_value(USDHC2_CD_GPIO);
++ break;
++ case USDHC3_BASE_ADDR:
++ ret = 1;
++ break;
++ }
++
++ return ret;
++}
++
++int board_mmc_init(bd_t *bis)
++{
++ s32 status = 0;
++ u32 index = 0;
++
++ for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) {
++ switch (index) {
++ case 1:
++ SETUP_IOMUX_PADS(usdhc3_pads);
++ usdhc_cfg[index].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
++ usdhc_cfg[index].max_bus_width = 8;
++ break;
++ case 0:
++ SETUP_IOMUX_PADS(usdhc2_pads);
++ usdhc_cfg[index].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
++ usdhc_cfg[index].max_bus_width = 4;
++ gpio_direction_input(USDHC2_CD_GPIO);
++ break;
++ default:
++ printf("Warning: you configured more USDHC controllers"
++ "(%d) then supported by the board (%d)\n",
++ index + 1, CONFIG_SYS_FSL_USDHC_NUM);
++ return status;
++ }
++
++ status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
++ }
++
++ return status;
++}
++
++static int mx6_rgmii_rework(struct phy_device *phydev)
++{
++ unsigned short val;
++
++ /* To enable AR8035 ouput a 125MHz clk from CLK_25M */
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7);
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x8016);
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4007);
++
++ val = phy_read(phydev, MDIO_DEVAD_NONE, 0xe);
++ val &= 0xffe3;
++ val |= 0x18;
++ phy_write(phydev, MDIO_DEVAD_NONE, 0xe, val);
++
++ /* introduce tx clock delay */
++ phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x5);
++ val = phy_read(phydev, MDIO_DEVAD_NONE, 0x1e);
++ val |= 0x0100;
++ phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, val);
++
++ return 0;
++}
++
++int board_phy_config(struct phy_device *phydev)
++{
++ mx6_rgmii_rework(phydev);
++
++ if (phydev->drv->config)
++ phydev->drv->config(phydev);
++
++ return 0;
++}
++
++#if defined(CONFIG_VIDEO_IPUV3)
++static struct fb_videomode const hdmi = {
++ .name = "HDMI",
++ .refresh = 60,
++ .xres = 1024,
++ .yres = 768,
++ .pixclock = 15385,
++ .left_margin = 220,
++ .right_margin = 40,
++ .upper_margin = 21,
++ .lower_margin = 7,
++ .hsync_len = 60,
++ .vsync_len = 10,
++ .sync = FB_SYNC_EXT,
++ .vmode = FB_VMODE_NONINTERLACED
++};
++
++int board_video_skip(void)
++{
++ int ret;
++
++ ret = ipuv3_fb_init(&hdmi, 0, IPU_PIX_FMT_RGB24);
++
++ if (ret)
++ printf("HDMI cannot be configured: %d\n", ret);
++
++
++// imx_enable_hdmi_phy();
++
++ return ret;
++}
++
++static void setup_display(void)
++{
++ struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
++ int reg;
++
++ enable_ipu_clock();
++ //imx_setup_hdmi();
++
++ reg = readl(&mxc_ccm->chsccdr);
++ reg |= (CHSCCDR_CLK_SEL_LDB_DI0
++ << MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET);
++ writel(reg, &mxc_ccm->chsccdr);
++}
++#endif /* CONFIG_VIDEO_IPUV3 */
++
++int board_eth_init(bd_t *bis)
++{
++ int ret;
++
++ setup_iomux_enet();
++
++ ret = cpu_eth_init(bis);
++ if (ret)
++ printf("FEC MXC: %s:failed\n", __func__);
++
++ return 0;
++}
++
++int board_early_init_f(void)
++{
++ setup_iomux_uart();
++#if defined(CONFIG_VIDEO_IPUV3)
++ setup_display();
++#endif
++ return 0;
++}
++
++/*
++ * Do not overwrite the console
++ * Use always serial for U-Boot console
++ */
++int overwrite_console(void)
++{
++ return 1;
++}
++
++int board_late_init(void)
++{
++ if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D))
++ setenv("fdt_file", "imx6q-apf6dev.dtb");
++ else if (is_cpu_type(MXC_CPU_MX6DL) || is_cpu_type(MXC_CPU_MX6SOLO))
++ setenv("fdt_file", "imx6dl-apf6dev.dtb");
++
++ return 0;
++}
++
++int dram_init(void)
++{
++ gd->ram_size = imx_ddr_size();
++
++ return 0;
++}
++
++int board_init(void)
++{
++ /* address of boot parameters */
++ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
++
++ return 0;
++}
++
++int checkboard(void)
++{
++ puts("Board: APF6\n");
++
++ return 0;
++}
+Index: uboot-2014.07/board/armadeus/apf6/apf6.cfg
+===================================================================
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/apf6.cfg
+@@ -0,0 +1,21 @@
++/*
++ * Copyright (C) 2014 ARMadeus Systems <su...@ar...>
++ *
++ * SPDX-License-Identifier: GPL-2.0+
++ *
++ */
++
++/* image version */
++IMAGE_VERSION 2
++
++/*
++ * Boot Device : one of
++ * spi, sd (the board has no nand neither onenand)
++ */
++BOOT_FROM sd
++
++#define __ASSEMBLY__
++#include <config.h>
++#include "asm/arch/iomux.h"
++#include "asm/arch/crm_regs.h"
++#include "clocks.cfg"
+Index: uboot-2014.07/board/armadeus/apf6/apf6_spl.c
+===================================================================
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/apf6_spl.c
+@@ -0,0 +1,251 @@
++/*
++ * Copyright (C) 2014 ARMadeus systems <su...@ar...>
++ *
++ * SPDX-License-Identifier: GPL-2.0+
++ */
++
++#include <common.h>
++#include <asm/io.h>
++#include <asm/arch/iomux.h>
++#include <asm/arch/mx6-ddr.h>
++#include <asm/arch/mx6-pins.h>
++#include <asm/arch/sys_proto.h>
++#include <asm/imx-common/boot_mode.h>
++#include <asm/imx-common/iomux-v3.h>
++#include <spl.h>
++
++DECLARE_GLOBAL_DATA_PTR;
++
++/* configure MX6Q/DUAL mmdc DDR io registers */
++struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = {
++ /* SDCLK[0:1], CAS, RAS, Reset: Differential input, 40ohm */
++ .dram_sdclk_0 = 0x00020030,
++ .dram_sdclk_1 = 0x00020030,
++ .dram_cas = 0x00020030,
++ .dram_ras = 0x00020030,
++ .dram_reset = 0x00020030,
++ /* SDCKE[0:1]: 100k pull-up */
++ .dram_sdcke0 = 0x00003000,
++ .dram_sdcke1 = 0x00003000,
++ /* SDBA2: pull-up disabled */
++ .dram_sdba2 = 0x00000000,
++ /* SDODT[0:1]: 100k pull-up, 40 ohm */
++ .dram_sdodt0 = 0x00003030,
++ .dram_sdodt1 = 0x00003030,
++ /* SDQS[0:7]: Differential input, 40 ohm */
++ .dram_sdqs0 = 0x00000030,
++ .dram_sdqs1 = 0x00000030,
++ .dram_sdqs2 = 0x00000030,
++ .dram_sdqs3 = 0x00000030,
++ .dram_sdqs4 = 0x00000030,
++ .dram_sdqs5 = 0x00000030,
++ .dram_sdqs6 = 0x00000030,
++ .dram_sdqs7 = 0x00000030,
++
++ /* DQM[0:7]: Differential input, 40 ohm */
++ .dram_dqm0 = 0x00020030,
++ .dram_dqm1 = 0x00020030,
++ .dram_dqm2 = 0x00020030,
++ .dram_dqm3 = 0x00020030,
++ .dram_dqm4 = 0x00020030,
++ .dram_dqm5 = 0x00020030,
++ .dram_dqm6 = 0x00020030,
++ .dram_dqm7 = 0x00020030,
++};
++
++/* configure MX6Q/DUAL mmdc GRP io registers */
++struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = {
++ /* DDR3 */
++ .grp_ddr_type = 0x000c0000,
++ .grp_ddrmode_ctl = 0x00020000,
++ /* disable DDR pullups */
++ .grp_ddrpke = 0x00000000,
++ /* ADDR[00:16], SDBA[0:1]: 40 ohm */
++ .grp_addds = 0x00000030,
++ /* CS0/CS1/SDBA2/CKE0/CKE1/SDWE: 40 ohm */
++ .grp_ctlds = 0x00000030,
++ /* DATA[00:63]: Differential input, 40 ohm */
++ .grp_ddrmode = 0x00020000,
++ .grp_b0ds = 0x00000030,
++ .grp_b1ds = 0x00000030,
++ .grp_b2ds = 0x00000030,
++ .grp_b3ds = 0x00000030,
++ .grp_b4ds = 0x00000030,
++ .grp_b5ds = 0x00000030,
++ .grp_b6ds = 0x00000030,
++ .grp_b7ds = 0x00000030,
++};
++
++/* configure MX6SOLO/DUALLITE mmdc DDR io registers */
++struct mx6sdl_iomux_ddr_regs mx6sdl_ddr_ioregs = {
++ /* SDCLK[0:1], CAS, RAS, Reset: Differential input, 40ohm */
++ .dram_sdclk_0 = 0x00020030,
++ .dram_sdclk_1 = 0x00020030,
++ .dram_cas = 0x00020030,
++ .dram_ras = 0x00020030,
++ .dram_reset = 0x00020030,
++ /* SDCKE[0:1]: 100k pull-up */
++ .dram_sdcke0 = 0x00003000,
++ .dram_sdcke1 = 0x00003000,
++ /* SDBA2: pull-up disabled */
++ .dram_sdba2 = 0x00000000,
++ /* SDODT[0:1]: 100k pull-up, 40 ohm */
++ .dram_sdodt0 = 0x00003030,
++ .dram_sdodt1 = 0x00003030,
++ /* SDQS[0:7]: Differential input, 40 ohm */
++ .dram_sdqs0 = 0x00000030,
++ .dram_sdqs1 = 0x00000030,
++ .dram_sdqs2 = 0x00000030,
++ .dram_sdqs3 = 0x00000030,
++ .dram_sdqs4 = 0x00000030,
++ .dram_sdqs5 = 0x00000030,
++ .dram_sdqs6 = 0x00000030,
++ .dram_sdqs7 = 0x00000030,
++
++ /* DQM[0:7]: Differential input, 40 ohm */
++ .dram_dqm0 = 0x00020030,
++ .dram_dqm1 = 0x00020030,
++ .dram_dqm2 = 0x00020030,
++ .dram_dqm3 = 0x00020030,
++ .dram_dqm4 = 0x00020030,
++ .dram_dqm5 = 0x00020030,
++ .dram_dqm6 = 0x00020030,
++ .dram_dqm7 = 0x00020030,
++};
++
++/* configure MX6SOLO/DUALLITE mmdc GRP io registers */
++struct mx6sdl_iomux_grp_regs mx6sdl_grp_ioregs = {
++ /* DDR3 */
++ .grp_ddr_type = 0x000c0000,
++ /* SDQS[0:7]: Differential input, 40 ohm */
++ .grp_ddrmode_ctl = 0x00020000,
++ /* disable DDR pullups */
++ .grp_ddrpke = 0x00000000,
++ /* ADDR[00:16], SDBA[0:1]: 40 ohm */
++ .grp_addds = 0x00000030,
++ /* CS0/CS1/SDBA2/CKE0/CKE1/SDWE: 40 ohm */
++ .grp_ctlds = 0x00000030,
++ /* DATA[00:63]: Differential input, 40 ohm */
++ .grp_ddrmode = 0x00020000,
++ .grp_b0ds = 0x00000030,
++ .grp_b1ds = 0x00000030,
++ .grp_b2ds = 0x00000030,
++ .grp_b3ds = 0x00000030,
++ .grp_b4ds = 0x00000030,
++ .grp_b5ds = 0x00000030,
++ .grp_b6ds = 0x00000030,
++ .grp_b7ds = 0x00000030,
++};
++
++/* MT41K128M16JT-125 */
++static struct mx6_ddr3_cfg mt41k128m16jt_125 = {
++ .mem_speed = 1600,
++ .density = 2,
++ .width = 16,
++ .banks = 8,
++ .rowaddr = 14,
++ .coladdr = 10,
++ .pagesz = 2,
++ .trcd = 1375,
++ .trcmin = 4875,
++ .trasmin = 3500,
++};
++
++/* APF6Dev specific calibration */
++static struct mx6_mmdc_calibration apf6dev_mmdc_calib = {
++ /* write leveling calibration determine */
++ .p0_mpwldectrl0 = 0x001C0018,
++ .p0_mpwldectrl1 = 0x001F001C,
++ .p1_mpwldectrl0 = 0x00110022,
++ .p1_mpwldectrl1 = 0x00080018,
++ /* Read DQS Gating calibration */
++ .p0_mpdgctrl0 = 0x42580264,
++ .p0_mpdgctrl1 = 0x02590250,
++ .p1_mpdgctrl0 = 0x425C0260,
++ .p1_mpdgctrl1 = 0x02540240,
++ /* Read Calibration: DQS delay relative to DQ read access */
++ .p0_mprddlctl = 0x3632343A,
++ .p1_mprddlctl = 0x3436303E,
++ /* Write Calibration: DQ/DM delay relative to DQS write access */
++ .p0_mpwrdlctl = 0x38363E3A,
++ .p1_mpwrdlctl = 0x3C303C36,
++};
++
++static void spl_dram_init(int width)
++{
++ struct mx6_ddr3_cfg *mem = &mt41k128m16jt_125;
++ struct mx6_ddr_sysinfo sysinfo = {
++ /* width of data bus:0=16,1=32,2=64 */
++ .dsize = width/32,
++ /* config for full 4GB range so that get_mem_size() works */
++ .cs_density = 32, /* 32Gb per CS */
++ /* single chip select */
++ .ncs = 1,
++ .cs1_mirror = 1,
++ .rtt_wr = 1 /*DDR3_RTT_60_OHM*/, /* RTT_Wr = RZQ/4 */
++#ifdef RTT_NOM_120OHM
++ .rtt_nom = 2 /*DDR3_RTT_120_OHM*/, /* RTT_Nom = RZQ/2 */
++#else
++ .rtt_nom = 1 /*DDR3_RTT_60_OHM*/, /* RTT_Nom = RZQ/4 */
++#endif
++ .walat = 0, /* Write additional latency */
++ .ralat = 5, /* Read additional latency */
++ .mif3_mode = 3, /* Command prediction working mode */
++ .bi_on = 1, /* Bank interleaving enabled */
++ .sde_to_rst = 0x10, /* 14 cycles, 200us (JEDEC default) */
++ .rst_to_cke = 0x23, /* 33 cycles, 500us (JEDEC default) */
++ };
++
++ if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D))
++ mx6dq_dram_iocfg(width, &mx6dq_ddr_ioregs,
++ &mx6dq_grp_ioregs);
++ else
++ mx6sdl_dram_iocfg(width, &mx6sdl_ddr_ioregs,
++ &mx6sdl_grp_ioregs);
++ mx6_dram_cfg(&sysinfo, &apf6dev_mmdc_calib, mem);
++}
++
++/*
++ * called from C runtime startup code (arch/arm/lib/crt0.S:_main)
++ * - we have a stack and a place to store GD, both in SRAM
++ * - no variable global data is available
++ */
++void board_init_f(ulong dummy)
++{
++ /*
++ * Zero out global data:
++ * - this shoudl be done by crt0.S
++ * - failure to zero it will cause i2c_setup to fail
++ */
++ memset((void *)gd, 0, sizeof(struct global_data));
++
++ /* setup AIPS and disable watchdog */
++ arch_cpu_init();
++
++ /* iomux */
++ board_early_init_f();
++
++ /* setup GP timer */
++ timer_init();
++
++ /* UART clocks enabled and gd valid - init serial console */
++ preloader_console_init();
++
++ /* configure MMDC for SDRAM width/size and per-model calibration */
++ if (is_cpu_type(MXC_CPU_MX6SOLO))
++ spl_dram_init(32);
++ else
++ spl_dram_init(64);
++
++ /* Clear the BSS. */
++ memset(__bss_start, 0, __bss_end - __bss_start);
++
++ get_clocks();
++
++ /* load/boot image from boot device */
++ board_init_r(NULL, 0);
++}
++
++void reset_cpu(ulong addr)
++{
++}
+Index: uboot-2014.07/board/armadeus/apf6/clocks.cfg
+===================================================================
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/clocks.cfg
+@@ -0,0 +1,25 @@
++/* set the default clock gate to save power */
++DATA 4, CCM_CCGR0, 0x00C03F3F
++DATA 4, CCM_CCGR1, 0x0030FC03
++DATA 4, CCM_CCGR2, 0x0FFFC000
++DATA 4, CCM_CCGR3, 0x3FF00000
++DATA 4, CCM_CCGR4, 0x00FFF300
++DATA 4, CCM_CCGR5, 0x0F0000C3
++DATA 4, CCM_CCGR6, 0x000003FF
++
++/* enable AXI cache for VDOA/VPU/IPU */
++DATA 4, MX6_IOMUXC_GPR4, 0xF00000CF
++/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
++DATA 4, MX6_IOMUXC_GPR6, 0x007F007F
++DATA 4, MX6_IOMUXC_GPR7, 0x007F007F
++
++/*
++ * Setup CCM_CCOSR register as follows:
++ *
++ * cko1_en = 1 --> CKO1 enabled
++ * cko1_div = 111 --> divide by 8
++ * cko1_sel = 1011 --> ahb_clk_root
++ *
++ * This sets CKO1 at ahb_clk_root/8 = 132/8 = 16.5 MHz
++ */
++DATA 4, CCM_CCOSR, 0x000000fb
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-16 10:09:52
|
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 cea7ad94611ad79dbd4407517ec2ff861da03afa (commit)
from 44db53ece9662c7f1cc59aea0f99a57d284187d2 (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 cea7ad94611ad79dbd4407517ec2ff861da03afa
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 16 12:09:33 2014 +0200
[UBOOT] 2014.07: update after release 2014.07
-----------------------------------------------------------------------
Summary of changes:
.../040-i2c-mxc-fix-mx51-i2c-declaration.patch | 2 +-
patches/u-boot/2014.07/104-apf9328-makefile.patch | 10 +++++-----
...60-arm-support-continuous-mmu-mem-mapping.patch | 15 +++++++++------
patches/u-boot/2014.07/401-apf51.patch | 2 +-
patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch | 11 +----------
patches/u-boot/2014.07/502-add-apf28.patch | 2 +-
6 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch b/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
index 56f9472..50fcc7a 100644
--- a/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
+++ b/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
@@ -26,7 +26,7 @@ index 595019b..a4280b4 100644
defined(CONFIG_MX6)
(void *)I2C1_BASE_ADDR,
(void *)I2C2_BASE_ADDR,
-@@ -539,8 +542,7 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
+@@ -544,8 +547,7 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
CONFIG_SYS_MXC_I2C2_SPEED,
CONFIG_SYS_MXC_I2C2_SLAVE, 1)
#if defined(CONFIG_MX31) || defined(CONFIG_MX35) ||\
diff --git a/patches/u-boot/2014.07/104-apf9328-makefile.patch b/patches/u-boot/2014.07/104-apf9328-makefile.patch
index 4623f49..895c4a7 100644
--- a/patches/u-boot/2014.07/104-apf9328-makefile.patch
+++ b/patches/u-boot/2014.07/104-apf9328-makefile.patch
@@ -12,11 +12,11 @@ diff --git a/boards.cfg b/boards.cfg
index 7c1fc74..8a40643 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -70,6 +70,7 @@ Active arm arm920t at91
- Active arm arm920t at91 eukrea cpuat91 cpuat91 - Eric Benard <er...@eu...>
+@@ -75,6 +75,7 @@ Active arm arm920t at91
Active arm arm920t at91 eukrea cpuat91 cpuat91_ram cpuat91:RAMBOOT Eric Benard <er...@eu...>
- Active arm arm920t imx - - scb9328 - Torsten Koschorrek <kos...@sy...>
+ Active arm arm920t ep93xx cirrus edb93xx edb9315a edb93xx:MK_edb9315a Sergey Kostanbaev <ser...@fa...>
+ Active arm arm920t imx - scb9328 scb9328 - Torsten Koschorrek <kos...@sy...>
+Active arm arm920t imx armadeus apf9328 apf9328 - Eric Jarrige <eri...@ar...>
- Active arm arm920t ks8695 - - cm4008 - Greg Ungerer <gre...@op...>
- Active arm arm920t ks8695 - - cm41xx - -
+ Active arm arm920t ks8695 - cm4008 cm4008 - Greg Ungerer <gre...@op...>
+ Active arm arm920t ks8695 - cm41xx cm41xx - -
Active arm arm920t s3c24x0 mpl vcma9 VCMA9 - David Müller <d.m...@el...>
diff --git a/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch b/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
index aa6389b..f06e82e 100644
--- a/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
+++ b/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
@@ -6,7 +6,7 @@ diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index 939de10..25f0ff1 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
-@@ -34,14 +34,14 @@ static void cp_delay (void)
+@@ -32,14 +32,14 @@ static void cp_delay (void)
asm volatile("" : : : "memory");
}
@@ -22,8 +22,8 @@ index 939de10..25f0ff1 100644
+ page_table[section_index] = value;
}
- void __mmu_page_table_flush(unsigned long start, unsigned long stop)
-@@ -63,11 +63,11 @@ void mmu_set_region_dcache_behaviour(u32
+ __weak void mmu_page_table_flush(unsigned long start, unsigned long stop)
+@@ -58,11 +58,11 @@ void mmu_set_region_dcache_behaviour(u32
debug("%s: start=%x, size=%x, option=%d\n", __func__, start, size,
option);
for (upto = start; upto < end; upto++)
@@ -37,7 +37,7 @@ index 939de10..25f0ff1 100644
{
bd_t *bd = gd->bd;
int i;
-@@ -77,9 +77,9 @@ __weak void dram_bank_mmu_setup(int bank
+@@ -72,9 +72,9 @@ __weak void dram_bank_mmu_setup(int bank
i < (bd->bi_dram[bank].start + bd->bi_dram[bank].size) >> 20;
i++) {
#if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH)
@@ -49,7 +49,7 @@ index 939de10..25f0ff1 100644
#endif
}
}
-@@ -89,14 +89,22 @@ static inline void mmu_setup(void)
+@@ -84,14 +84,22 @@ static inline void mmu_setup(void)
{
int i;
u32 reg;
@@ -77,13 +77,16 @@ index 939de10..25f0ff1 100644
diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
-@@ -27,9 +27,9 @@ static inline void invalidate_l2_cache(v
+@@ -27,12 +27,12 @@ static inline void invalidate_l2_cache(v
void l2_cache_enable(void);
void l2_cache_disable(void);
-void set_section_dcache(int section, enum dcache_option option);
+void set_section_dcache(int section, int section_index, enum dcache_option option);
+ void arm_init_before_mmu(void);
+ void arm_init_domains(void);
+ void cpu_cache_initialization(void);
-void dram_bank_mmu_setup(int bank);
+void dram_bank_mmu_setup(int bank, int page_offset);
diff --git a/patches/u-boot/2014.07/401-apf51.patch b/patches/u-boot/2014.07/401-apf51.patch
index f82c571..b6201ea 100644
--- a/patches/u-boot/2014.07/401-apf51.patch
+++ b/patches/u-boot/2014.07/401-apf51.patch
@@ -989,7 +989,7 @@ diff --git a/boards.cfg b/boards.cfg
index 9df6212..1aa7e95 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -295,6 +295,7 @@ Active arm armv7 exyno
+@@ -302,6 +302,7 @@ Active arm armv7 exyno
Active arm armv7 exynos samsung universal_c210 s5pc210_universal - Przemyslaw Marczak <p.m...@sa...>
Active arm armv7 highbank - highbank highbank - Rob Herring <ro...@ke...>
Active arm armv7 keystone ti k2hk_evm k2hk_evm - Vitaly Andrianov <vi...@ti...>
diff --git a/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch b/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
index 2799da4..a9c4aa2 100644
--- a/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
+++ b/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
@@ -12,7 +12,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
-@@ -72,7 +72,7 @@ u-boot-with-nand-spl.imx: spl/u-boot-nan
+@@ -73,7 +73,7 @@ u-boot-with-nand-spl.imx: spl/u-boot-nan
$(call if_changed,pad_cat)
quiet_cmd_u-boot-nand-spl_imx = GEN $@
@@ -359,12 +359,3 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
#define NFC_V3_IPC_INT (1 << 31)
#if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1)
---- a/arch/arm/include/asm/arch-mx5/spl.h
-+++ b/arch/arm/include/asm/arch-mx5/spl.h
-@@ -9,5 +9,6 @@
-
- #define BOOT_DEVICE_NONE 0
- #define BOOT_DEVICE_NAND 1
-+#define BOOT_DEVICE_RAM 2
-
- #endif /* __ASM_ARCH_SPL_H__ */
diff --git a/patches/u-boot/2014.07/502-add-apf28.patch b/patches/u-boot/2014.07/502-add-apf28.patch
index 3e77dd1..74da664 100644
--- a/patches/u-boot/2014.07/502-add-apf28.patch
+++ b/patches/u-boot/2014.07/502-add-apf28.patch
@@ -1174,7 +1174,7 @@ diff --git a/boards.cfg b/boards.cfg
index 1aa7e95..f3c8b40 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -205,6 +205,7 @@ Active arm arm926ejs mx27
+@@ -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...>
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-14 15:04: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 44db53ece9662c7f1cc59aea0f99a57d284187d2 (commit)
from 011dd42738c3f937d14934842de457f6075e4dc2 (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 44db53ece9662c7f1cc59aea0f99a57d284187d2
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jul 14 17:03:50 2014 +0200
[UBOOT] 2014.07: update patchwork (preliminary)
-----------------------------------------------------------------------
Summary of changes:
...-restore-command-env-param-compatitbility.patch | 2 +-
.../040-i2c-mxc-fix-mx51-i2c-declaration.patch} | 4 ++--
.../u-boot/{2013.04 => 2014.07}/102-mx1-i2c.patch | 0
.../u-boot/{2014.04 => 2014.07}/103-apf9328.patch | 6 +++---
.../104-apf9328-makefile.patch | 12 ++++++------
.../{2014.04 => 2014.07}/106-mx1-pllclk.patch | 0
.../107-mx1-pllclk-debug.patch | 0
.../u-boot/{2014.04 => 2014.07}/108-DM9000.patch | 0
.../{2014.04 => 2014.07}/111-mx1-timer.patch | 0
.../300-imx27-fix_dcache_boot_issue.patch | 2 +-
.../302-apf27-support-boot-from-RAM.patch | 0
.../311-imx-nand-lock-unlock.patch | 0
.../u-boot/{2014.04 => 2014.07}/320-spartan.patch | 6 +++---
.../340-apf27-misc-commands.patch | 0
.../350-nand_large_file_download.patch | 0
...60-arm-support-continuous-mmu-mem-mapping.patch | 0
.../u-boot/{2014.04 => 2014.07}/400-imx51.patch | 0
.../u-boot/{2014.04 => 2014.07}/401-apf51.patch | 18 +++++++++---------
.../u-boot/{2014.04 => 2014.07}/410-imx-iim.patch | 4 ++--
.../420-apf51-nand-spl-NG.patch | 2 +-
.../501-imx28-update-and-fix.patch | 2 +-
.../{2014.04 => 2014.07}/502-add-apf28.patch | 14 +++++++-------
22 files changed, 36 insertions(+), 36 deletions(-)
copy patches/u-boot/{2013.04 => 2014.07}/001-restore-command-env-param-compatitbility.patch (87%)
copy patches/u-boot/{2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch => 2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch} (91%)
copy patches/u-boot/{2013.04 => 2014.07}/102-mx1-i2c.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/103-apf9328.patch (99%)
copy patches/u-boot/{2014.04 => 2014.07}/104-apf9328-makefile.patch (59%)
copy patches/u-boot/{2014.04 => 2014.07}/106-mx1-pllclk.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/107-mx1-pllclk-debug.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/108-DM9000.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/111-mx1-timer.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/300-imx27-fix_dcache_boot_issue.patch (94%)
copy patches/u-boot/{2014.04 => 2014.07}/302-apf27-support-boot-from-RAM.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/311-imx-nand-lock-unlock.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/320-spartan.patch (91%)
copy patches/u-boot/{2014.04 => 2014.07}/340-apf27-misc-commands.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/350-nand_large_file_download.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/360-arm-support-continuous-mmu-mem-mapping.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/400-imx51.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/401-apf51.patch (95%)
copy patches/u-boot/{2014.04 => 2014.07}/410-imx-iim.patch (99%)
copy patches/u-boot/{2014.04 => 2014.07}/420-apf51-nand-spl-NG.patch (99%)
copy patches/u-boot/{2014.04 => 2014.07}/501-imx28-update-and-fix.patch (99%)
copy patches/u-boot/{2014.04 => 2014.07}/502-add-apf28.patch (96%)
diff --git a/patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch b/patches/u-boot/2014.07/001-restore-command-env-param-compatitbility.patch
similarity index 87%
copy from patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch
copy to patches/u-boot/2014.07/001-restore-command-env-param-compatitbility.patch
index 6aee8c0..d1700d0 100644
--- a/patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch
+++ b/patches/u-boot/2014.07/001-restore-command-env-param-compatitbility.patch
@@ -4,7 +4,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
---
--- uboot-custom/common/cmd_nvedit.c
+++ uboot-custom/common/cmd_nvedit.c
-@@ -724,7 +724,7 @@ static int do_env_default(cmd_tbl_t *cmd
+@@ -749,7 +749,7 @@ static int do_env_default(cmd_tbl_t *cmd
}
}
debug("Final value for argc=%d\n", argc);
diff --git a/patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch b/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
similarity index 91%
copy from patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch
copy to patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
index ab992ec..56f9472 100644
--- a/patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch
+++ b/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
@@ -13,7 +13,7 @@ diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 595019b..a4280b4 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
-@@ -425,8 +425,11 @@ static void * const i2c_bases[] = {
+@@ -421,8 +421,11 @@ static void * const i2c_bases[] = {
#elif defined(CONFIG_MX27)
(void *)IMX_I2C1_BASE,
(void *)IMX_I2C2_BASE
@@ -26,7 +26,7 @@ index 595019b..a4280b4 100644
defined(CONFIG_MX6)
(void *)I2C1_BASE_ADDR,
(void *)I2C2_BASE_ADDR,
-@@ -541,8 +544,7 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
+@@ -539,8 +542,7 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
CONFIG_SYS_MXC_I2C2_SPEED,
CONFIG_SYS_MXC_I2C2_SLAVE, 1)
#if defined(CONFIG_MX31) || defined(CONFIG_MX35) ||\
diff --git a/patches/u-boot/2013.04/102-mx1-i2c.patch b/patches/u-boot/2014.07/102-mx1-i2c.patch
similarity index 100%
copy from patches/u-boot/2013.04/102-mx1-i2c.patch
copy to patches/u-boot/2014.07/102-mx1-i2c.patch
diff --git a/patches/u-boot/2014.04/103-apf9328.patch b/patches/u-boot/2014.07/103-apf9328.patch
similarity index 99%
copy from patches/u-boot/2014.04/103-apf9328.patch
copy to patches/u-boot/2014.07/103-apf9328.patch
index d26ca65..fd7fc54 100644
--- a/patches/u-boot/2014.04/103-apf9328.patch
+++ b/patches/u-boot/2014.07/103-apf9328.patch
@@ -143,7 +143,7 @@ index 0000000..9782115
+ * Spartan3 code is used to download our Spartan 3 :) code is compatible.
+ * Just take care about the file size
+*/
-+Xilinx_Spartan3_Slave_Serial_fns fpga_fns = {
++xilinx_spartan3_slave_serial_fns fpga_fns = {
+ fpga_pre_fn,
+ fpga_pgm_fn,
+ fpga_clk_fn,
@@ -155,8 +155,8 @@ index 0000000..9782115
+ fpga_abort_fn,
+};
+
-+Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
-+ {Xilinx_Spartan3,
++xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
++ {xilinx_spartan3,
+ slave_serial,
+ XILINX_XC3S400_SIZE,
+ (void *)&fpga_fns,
diff --git a/patches/u-boot/2014.04/104-apf9328-makefile.patch b/patches/u-boot/2014.07/104-apf9328-makefile.patch
similarity index 59%
copy from patches/u-boot/2014.04/104-apf9328-makefile.patch
copy to patches/u-boot/2014.07/104-apf9328-makefile.patch
index 0fd4a25..4623f49 100644
--- a/patches/u-boot/2014.04/104-apf9328-makefile.patch
+++ b/patches/u-boot/2014.07/104-apf9328-makefile.patch
@@ -13,10 +13,10 @@ index 7c1fc74..8a40643 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -70,6 +70,7 @@ Active arm arm920t at91
- Active arm arm920t at91 eukrea cpuat91 cpuat91 - Eric Benard <er...@eu...>
- Active arm arm920t at91 eukrea cpuat91 cpuat91_ram cpuat91:RAMBOOT Eric Benard <er...@eu...>
- Active arm arm920t imx - - scb9328 - Torsten Koschorrek <kos...@sy...>
+ Active arm arm920t at91 eukrea cpuat91 cpuat91 - Eric Benard <er...@eu...>
+ Active arm arm920t at91 eukrea cpuat91 cpuat91_ram cpuat91:RAMBOOT Eric Benard <er...@eu...>
+ Active arm arm920t imx - - scb9328 - Torsten Koschorrek <kos...@sy...>
+Active arm arm920t imx armadeus apf9328 apf9328 - Eric Jarrige <eri...@ar...>
- Active arm arm920t ks8695 - - cm4008 - Greg Ungerer <gre...@op...>
- Active arm arm920t ks8695 - - cm41xx - -
- Active arm arm920t s3c24x0 mpl vcma9 VCMA9 - David Müller <d.m...@el...>
+ Active arm arm920t ks8695 - - cm4008 - Greg Ungerer <gre...@op...>
+ Active arm arm920t ks8695 - - cm41xx - -
+ Active arm arm920t s3c24x0 mpl vcma9 VCMA9 - David Müller <d.m...@el...>
diff --git a/patches/u-boot/2014.04/106-mx1-pllclk.patch b/patches/u-boot/2014.07/106-mx1-pllclk.patch
similarity index 100%
copy from patches/u-boot/2014.04/106-mx1-pllclk.patch
copy to patches/u-boot/2014.07/106-mx1-pllclk.patch
diff --git a/patches/u-boot/2014.04/107-mx1-pllclk-debug.patch b/patches/u-boot/2014.07/107-mx1-pllclk-debug.patch
similarity index 100%
copy from patches/u-boot/2014.04/107-mx1-pllclk-debug.patch
copy to patches/u-boot/2014.07/107-mx1-pllclk-debug.patch
diff --git a/patches/u-boot/2014.04/108-DM9000.patch b/patches/u-boot/2014.07/108-DM9000.patch
similarity index 100%
copy from patches/u-boot/2014.04/108-DM9000.patch
copy to patches/u-boot/2014.07/108-DM9000.patch
diff --git a/patches/u-boot/2014.04/111-mx1-timer.patch b/patches/u-boot/2014.07/111-mx1-timer.patch
similarity index 100%
copy from patches/u-boot/2014.04/111-mx1-timer.patch
copy to patches/u-boot/2014.07/111-mx1-timer.patch
diff --git a/patches/u-boot/2014.04/300-imx27-fix_dcache_boot_issue.patch b/patches/u-boot/2014.07/300-imx27-fix_dcache_boot_issue.patch
similarity index 94%
copy from patches/u-boot/2014.04/300-imx27-fix_dcache_boot_issue.patch
copy to patches/u-boot/2014.07/300-imx27-fix_dcache_boot_issue.patch
index 4556f6f..058b2b3 100644
--- a/patches/u-boot/2014.04/300-imx27-fix_dcache_boot_issue.patch
+++ b/patches/u-boot/2014.07/300-imx27-fix_dcache_boot_issue.patch
@@ -6,7 +6,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
---
--- uboot-custom/arch/arm/cpu/arm926ejs/start.S
+++ uboot-custom/arch/arm/cpu/arm926ejs/start.S
-@@ -166,11 +166,12 @@ cpu_init_crit:
+@@ -78,11 +78,12 @@ cpu_init_crit:
*/
mov r0, #0
flush_dcache:
diff --git a/patches/u-boot/2014.04/302-apf27-support-boot-from-RAM.patch b/patches/u-boot/2014.07/302-apf27-support-boot-from-RAM.patch
similarity index 100%
copy from patches/u-boot/2014.04/302-apf27-support-boot-from-RAM.patch
copy to patches/u-boot/2014.07/302-apf27-support-boot-from-RAM.patch
diff --git a/patches/u-boot/2014.04/311-imx-nand-lock-unlock.patch b/patches/u-boot/2014.07/311-imx-nand-lock-unlock.patch
similarity index 100%
copy from patches/u-boot/2014.04/311-imx-nand-lock-unlock.patch
copy to patches/u-boot/2014.07/311-imx-nand-lock-unlock.patch
diff --git a/patches/u-boot/2014.04/320-spartan.patch b/patches/u-boot/2014.07/320-spartan.patch
similarity index 91%
copy from patches/u-boot/2014.04/320-spartan.patch
copy to patches/u-boot/2014.07/320-spartan.patch
index f8cc590..50909a2 100644
--- a/patches/u-boot/2014.04/320-spartan.patch
+++ b/patches/u-boot/2014.07/320-spartan.patch
@@ -11,7 +11,7 @@ diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index 1633a70..9ca0522 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
-@@ -171,8 +171,14 @@ static int Spartan3_sp_load(Xilinx_desc
+@@ -172,8 +172,14 @@ static int Spartan3_sp_load(Xilinx_desc
(*fn->clk) (true, true, cookie); /* Assert the clock pin */
/* Load the data */
@@ -28,7 +28,7 @@ index 1633a70..9ca0522 100644
/* XXX - Check the error bit? */
(*fn->wdata) (data[bytecount++], true, cookie); /* write the data */
-@@ -271,7 +277,12 @@ static int Spartan3_sp_dump(Xilinx_desc
+@@ -272,7 +278,12 @@ static int Spartan3_sp_dump(Xilinx_desc
/* dump the data */
while (bytecount < bsize) {
@@ -42,7 +42,7 @@ index 1633a70..9ca0522 100644
(*fn->clk) (false, true, cookie); /* Deassert the clock pin */
(*fn->clk) (true, true, cookie); /* Assert the clock pin */
-@@ -375,6 +386,12 @@ static int Spartan3_ss_load(Xilinx_desc
+@@ -376,6 +387,12 @@ static int Spartan3_ss_load(Xilinx_desc
(*fn->bwr) (data, bsize, true, cookie);
else {
while (bytecount < bsize) {
diff --git a/patches/u-boot/2014.04/340-apf27-misc-commands.patch b/patches/u-boot/2014.07/340-apf27-misc-commands.patch
similarity index 100%
copy from patches/u-boot/2014.04/340-apf27-misc-commands.patch
copy to patches/u-boot/2014.07/340-apf27-misc-commands.patch
diff --git a/patches/u-boot/2014.04/350-nand_large_file_download.patch b/patches/u-boot/2014.07/350-nand_large_file_download.patch
similarity index 100%
copy from patches/u-boot/2014.04/350-nand_large_file_download.patch
copy to patches/u-boot/2014.07/350-nand_large_file_download.patch
diff --git a/patches/u-boot/2014.04/360-arm-support-continuous-mmu-mem-mapping.patch b/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
similarity index 100%
copy from patches/u-boot/2014.04/360-arm-support-continuous-mmu-mem-mapping.patch
copy to patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
diff --git a/patches/u-boot/2014.04/400-imx51.patch b/patches/u-boot/2014.07/400-imx51.patch
similarity index 100%
copy from patches/u-boot/2014.04/400-imx51.patch
copy to patches/u-boot/2014.07/400-imx51.patch
diff --git a/patches/u-boot/2014.04/401-apf51.patch b/patches/u-boot/2014.07/401-apf51.patch
similarity index 95%
copy from patches/u-boot/2014.04/401-apf51.patch
copy to patches/u-boot/2014.07/401-apf51.patch
index 0aaf17f..f82c571 100644
--- a/patches/u-boot/2014.04/401-apf51.patch
+++ b/patches/u-boot/2014.07/401-apf51.patch
@@ -757,7 +757,7 @@ index 0000000..665928e
+ * Spartan2 code is used to download our Spartan 6 :) code is compatible.
+ * Just take care about the file size
+*/
-+Xilinx_Spartan3_Slave_Parallel_fns fpga_fns = {
++xilinx_spartan3_slave_parallel_fns fpga_fns = {
+ fpga_pre_fn,
+ fpga_pgm_fn,
+ fpga_init_fn,
@@ -773,8 +773,8 @@ index 0000000..665928e
+ fpga_post_fn,
+};
+
-+Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
-+ {Xilinx_Spartan3,
++xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
++ {xilinx_spartan3,
+ slave_parallel,
+ 3713568l / 8,
+ (void *)&fpga_fns,
@@ -990,12 +990,12 @@ index 9df6212..1aa7e95 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -295,6 +295,7 @@ Active arm armv7 exyno
- Active arm armv7 exynos samsung trats2 trats2 - Piotr Wilczek <p.w...@sa...>
- Active arm armv7 exynos samsung universal_c210 s5pc210_universal - Przemyslaw Marczak <p.m...@sa...>
- Active arm armv7 highbank - highbank highbank - Rob Herring <rob...@ca...>
+ Active arm armv7 exynos samsung universal_c210 s5pc210_universal - Przemyslaw Marczak <p.m...@sa...>
+ Active arm armv7 highbank - highbank highbank - Rob Herring <ro...@ke...>
+ Active arm armv7 keystone ti k2hk_evm k2hk_evm - Vitaly Andrianov <vi...@ti...>
+Active arm armv7 mx5 armadeus apf51 apf51 apf51:IMX_CONFIG=board/armadeus/apf51/imximage.cfg Eric Jarrige <eri...@ar...>
- Active arm armv7 mx5 denx m53evk m53evk m53evk:IMX_CONFIG=board/denx/m53evk/imximage.cfg Marek Vasut <mar...@gm...>
- Active arm armv7 mx5 esg ima3-mx53 ima3-mx53 ima3-mx53:IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg -
- Active arm armv7 mx5 freescale mx51evk mx51evk mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg Stefano Babic <sb...@de...>
+ Active arm armv7 mx5 denx m53evk m53evk m53evk:IMX_CONFIG=board/denx/m53evk/imximage.cfg Marek Vasut <mar...@gm...>
+ Active arm armv7 mx5 esg ima3-mx53 ima3-mx53 ima3-mx53:IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg -
+ Active arm armv7 mx5 freescale mx51evk mx51evk mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg Stefano Babic <sb...@de...>
1.7.2.5
diff --git a/patches/u-boot/2014.04/410-imx-iim.patch b/patches/u-boot/2014.07/410-imx-iim.patch
similarity index 99%
copy from patches/u-boot/2014.04/410-imx-iim.patch
copy to patches/u-boot/2014.07/410-imx-iim.patch
index 0c3a15d..13b5c1e 100644
--- a/patches/u-boot/2014.04/410-imx-iim.patch
+++ b/patches/u-boot/2014.07/410-imx-iim.patch
@@ -69,14 +69,14 @@ diff --git a/common/Makefile b/common/Makefile
index 973f05a..f368b24 100644
--- a/common/Makefile
+++ b/common/Makefile
-@@ -94,6 +94,7 @@ ifdef CONFIG_FPGA
+@@ -113,6 +113,7 @@ ifdef CONFIG_FPGA
obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o
obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o
obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o
+obj-$(CONFIG_CMD_IIM) += cmd_iim.o
obj-$(CONFIG_CMD_I2C) += cmd_i2c.o
+ obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o
obj-$(CONFIG_CMD_HASH) += cmd_hash.o
- obj-$(CONFIG_CMD_IDE) += cmd_ide.o
diff --git a/common/cmd_iim.c b/common/cmd_iim.c
new file mode 100644
index 0000000..d47ccf5
diff --git a/patches/u-boot/2014.04/420-apf51-nand-spl-NG.patch b/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
similarity index 99%
copy from patches/u-boot/2014.04/420-apf51-nand-spl-NG.patch
copy to patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
index d6b45a8..2799da4 100644
--- a/patches/u-boot/2014.04/420-apf51-nand-spl-NG.patch
+++ b/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
@@ -12,7 +12,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
-@@ -75,7 +75,7 @@ u-boot-with-nand-spl.imx: spl/u-boot-nan
+@@ -72,7 +72,7 @@ u-boot-with-nand-spl.imx: spl/u-boot-nan
$(call if_changed,pad_cat)
quiet_cmd_u-boot-nand-spl_imx = GEN $@
diff --git a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch b/patches/u-boot/2014.07/501-imx28-update-and-fix.patch
similarity index 99%
copy from patches/u-boot/2014.04/501-imx28-update-and-fix.patch
copy to patches/u-boot/2014.07/501-imx28-update-and-fix.patch
index aaae42b..4cd72c8 100644
--- a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
+++ b/patches/u-boot/2014.07/501-imx28-update-and-fix.patch
@@ -32,7 +32,7 @@ index c60615a..f533ad0 100644
CALL HAB 0x8000 0x0
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
-@@ -88,7 +88,9 @@
+@@ -89,7 +89,9 @@
* As for the SPL, we must avoid the first 4 KiB as well, but we load the
* IVT and CST to 0x8000, so we don't need to waste the subsequent 4 KiB.
*/
diff --git a/patches/u-boot/2014.04/502-add-apf28.patch b/patches/u-boot/2014.07/502-add-apf28.patch
similarity index 96%
copy from patches/u-boot/2014.04/502-add-apf28.patch
copy to patches/u-boot/2014.07/502-add-apf28.patch
index 912b16d..3e77dd1 100644
--- a/patches/u-boot/2014.04/502-add-apf28.patch
+++ b/patches/u-boot/2014.07/502-add-apf28.patch
@@ -1174,13 +1174,13 @@ diff --git a/boards.cfg b/boards.cfg
index 1aa7e95..f3c8b40 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -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...>
+@@ -205,6 +205,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...>
+ 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-07-13 20:25: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 011dd42738c3f937d14934842de457f6075e4dc2 (commit)
via 91dcf9f39ee8e184810a65a8ceb4e825f4f3851a (commit)
via 54711da834a7782d635d771dcac3f1e83a19fe54 (commit)
from bf7f490627eaa0c18fe9c748657d39988f4bd6dc (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 011dd42738c3f937d14934842de457f6075e4dc2
Author: Philippe Reynes <tr...@ya...>
Date: Thu Jul 10 21:12:26 2014 +0200
[LINUX] 3.15: move to 3.15.5
commit 91dcf9f39ee8e184810a65a8ceb4e825f4f3851a
Author: Philippe Reynes <tr...@ya...>
Date: Thu Jul 10 21:12:25 2014 +0200
[LINUX] 3.14: move to 3.14.12
commit 54711da834a7782d635d771dcac3f1e83a19fe54
Author: Philippe Reynes <tr...@ya...>
Date: Thu Jul 10 21:12:24 2014 +0200
[LINUX] 3.10: move to 3.10.48
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.47.config => apf27-linux-3.10.48.config} | 0
...x-3.14.11.config => apf27-linux-3.14.12.config} | 0
...nux-3.15.4.config => apf27-linux-3.15.5.config} | 0
...x-3.10.47.config => apf28-linux-3.10.48.config} | 0
...x-3.14.11.config => apf28-linux-3.14.12.config} | 0
...nux-3.15.4.config => apf28-linux-3.15.5.config} | 0
...x-3.10.47.config => apf51-linux-3.10.48.config} | 0
...x-3.14.11.config => apf51-linux-3.14.12.config} | 0
...nux-3.15.4.config => apf51-linux-3.15.5.config} | 0
patches/linux/{3.10.47 => 3.10.48} | 0
patches/linux/{3.14.11 => 3.14.12} | 0
patches/linux/{3.15.4 => 3.15.5} | 0
15 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.47.config => apf27-linux-3.10.48.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.11.config => apf27-linux-3.14.12.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15.4.config => apf27-linux-3.15.5.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.47.config => apf28-linux-3.10.48.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.11.config => apf28-linux-3.14.12.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.15.4.config => apf28-linux-3.15.5.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.47.config => apf51-linux-3.10.48.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.11.config => apf51-linux-3.14.12.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.15.4.config => apf51-linux-3.15.5.config} (100%)
rename patches/linux/{3.10.47 => 3.10.48} (100%)
rename patches/linux/{3.14.11 => 3.14.12} (100%)
rename patches/linux/{3.15.4 => 3.15.5} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 6d65d19..2a97609 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.15.4"
+BR2_DEFAULT_KERNEL_VERSION="3.15.5"
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.15.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.5"
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 21fc1b2..041500d 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.15.4"
+BR2_DEFAULT_KERNEL_VERSION="3.15.5"
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.15.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.5"
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 f762b98..f9301ac 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.15.4"
+BR2_DEFAULT_KERNEL_VERSION="3.15.5"
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.15.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.5"
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.47.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.48.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.47.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.48.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.11.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.12.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.11.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.12.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15.4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15.5.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.47.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.48.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.47.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.48.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.11.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.12.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.11.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.12.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.15.4.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.15.5.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.47.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.48.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.47.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.48.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.11.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.12.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.11.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.12.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.15.4.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.15.5.config
diff --git a/patches/linux/3.10.47 b/patches/linux/3.10.48
similarity index 100%
rename from patches/linux/3.10.47
rename to patches/linux/3.10.48
diff --git a/patches/linux/3.14.11 b/patches/linux/3.14.12
similarity index 100%
rename from patches/linux/3.14.11
rename to patches/linux/3.14.12
diff --git a/patches/linux/3.15.4 b/patches/linux/3.15.5
similarity index 100%
rename from patches/linux/3.15.4
rename to patches/linux/3.15.5
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-13 17:37:51
|
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 bf7f490627eaa0c18fe9c748657d39988f4bd6dc (commit)
via 536db58d2ba5be2715135351800e4b6a46aef585 (commit)
via 633fe721c3dae4ad4bd2199d106b1c31123fc3cc (commit)
via d429e58b2f007de5419fedc93494f84f7c888181 (commit)
via 6721f79863d2cd474cc9393e3198c2ab00a3f88e (commit)
via 395e445f31a0a2d2892e10414986a5eeba3dd1c1 (commit)
from fcefe327cc689194af66174e0495809f87561370 (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 bf7f490627eaa0c18fe9c748657d39988f4bd6dc
Author: Philippe Reynes <tr...@ya...>
Date: Wed Jul 9 21:32:32 2014 +0200
[LINUX] 3.15: disable usb
When usb is enable, the boot fails with an error:
[ 0.983719] Internal error: : 808 [#1] PREEMPT ARM
[ 0.988534] Modules linked in:
[ 0.991643] CPU: 0 PID: 1 Comm: swapper Not tainted 3.15.4 #1
[ 0.997415] task: c382aaa0 ti: c3832000 task.ti: c3832000
[ 1.002873] PC is at hw_phymode_configure+0xd4/0x134
[ 1.007877] LR is at ci_hdrc_probe+0x2fc/0x610
...
commit 536db58d2ba5be2715135351800e4b6a46aef585
Author: Philippe Reynes <tr...@ya...>
Date: Wed Jul 9 21:32:31 2014 +0200
[LINUX] 3.15: move to 3.15.4
commit 633fe721c3dae4ad4bd2199d106b1c31123fc3cc
Author: Philippe Reynes <tr...@ya...>
Date: Wed Jul 9 21:32:30 2014 +0200
[LINUX] 3.14: move to 3.14.11
commit d429e58b2f007de5419fedc93494f84f7c888181
Author: Philippe Reynes <tr...@ya...>
Date: Wed Jul 9 21:32:29 2014 +0200
[LINUX] 3.12: move to 3.12.24
commit 6721f79863d2cd474cc9393e3198c2ab00a3f88e
Author: Philippe Reynes <tr...@ya...>
Date: Wed Jul 9 21:32:28 2014 +0200
[LINUX] 3.10: move to 3.10.47
commit 395e445f31a0a2d2892e10414986a5eeba3dd1c1
Author: Philippe Reynes <tr...@ya...>
Date: Wed Jul 9 21:32:27 2014 +0200
[LINUX] pod_gpio: fix compilation by adding module.h
Without the include of <linux/module.h>, the
compilation fails with the followiging error :
CC [M] drivers/armadeus/fpga/virtual_components/pod_gpio/pod_gpio.o
drivers/armadeus/fpga/virtual_components/pod_gpio/pod_gpio.c:411:15:
erreur: expected declaration specifiers or â...â before string constant
drivers/armadeus/fpga/virtual_components/pod_gpio/pod_gpio.c:412:20:
erreur: expected declaration specifiers or â...â before string constant
drivers/armadeus/fpga/virtual_components/pod_gpio/pod_gpio.c:413:16:
erreur: expected declaration specifiers or â...â before string constant
make[7]: ***
[drivers/armadeus/fpga/virtual_components/pod_gpio/pod_gpio.o] Erreur 1
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 +-
buildroot/configs/apf28mainline_defconfig | 4 +-
buildroot/configs/apf51mainline_defconfig | 4 +-
...x-3.10.45.config => apf27-linux-3.10.47.config} | 0
...x-3.12.23.config => apf27-linux-3.12.24.config} | 0
...ux-3.14.9.config => apf27-linux-3.14.11.config} | 0
...nux-3.15.2.config => apf27-linux-3.15.4.config} | 0
.../device/armadeus/apf27/apf27-linux-3.15.config | 22 +-------------------
...x-3.10.45.config => apf28-linux-3.10.47.config} | 0
...x-3.12.23.config => apf28-linux-3.12.24.config} | 0
...ux-3.14.9.config => apf28-linux-3.14.11.config} | 0
...nux-3.15.2.config => apf28-linux-3.15.4.config} | 0
...x-3.10.45.config => apf51-linux-3.10.47.config} | 0
...x-3.12.23.config => apf51-linux-3.12.24.config} | 0
...ux-3.14.9.config => apf51-linux-3.14.11.config} | 0
...nux-3.15.2.config => apf51-linux-3.15.4.config} | 0
patches/linux/{3.10.45 => 3.10.47} | 0
patches/linux/{3.12.23 => 3.12.24} | 0
patches/linux/{3.14.9 => 3.14.11} | 0
patches/linux/{3.15.2 => 3.15.4} | 0
.../fpga/virtual_components/pod_gpio/pod_gpio.c | 1 +
21 files changed, 8 insertions(+), 27 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.45.config => apf27-linux-3.10.47.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.23.config => apf27-linux-3.12.24.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.9.config => apf27-linux-3.14.11.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15.2.config => apf27-linux-3.15.4.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.45.config => apf28-linux-3.10.47.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.23.config => apf28-linux-3.12.24.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.9.config => apf28-linux-3.14.11.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.15.2.config => apf28-linux-3.15.4.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.45.config => apf51-linux-3.10.47.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.23.config => apf51-linux-3.12.24.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.9.config => apf51-linux-3.14.11.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.15.2.config => apf51-linux-3.15.4.config} (100%)
rename patches/linux/{3.10.45 => 3.10.47} (100%)
rename patches/linux/{3.12.23 => 3.12.24} (100%)
rename patches/linux/{3.14.9 => 3.14.11} (100%)
rename patches/linux/{3.15.2 => 3.15.4} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 842e2b4..6d65d19 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.15.2"
+BR2_DEFAULT_KERNEL_VERSION="3.15.4"
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.15.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.4"
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 b4c20ee..21fc1b2 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.15.2"
+BR2_DEFAULT_KERNEL_VERSION="3.15.4"
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.15.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.4"
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 4d50bc2..f762b98 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.15.2"
+BR2_DEFAULT_KERNEL_VERSION="3.15.4"
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.15.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.4"
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.45.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.47.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.45.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.47.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.23.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.24.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.23.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.24.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.9.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.9.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.11.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15.2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15.4.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
index c2efccb..19f6555 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
@@ -169,27 +169,7 @@ CONFIG_SND_PCM_OSS=m
# CONFIG_SND_USB is not set
CONFIG_SND_SOC=m
CONFIG_SND_IMX_SOC=m
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_DEBUG=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_FTDI_SIO=y
-CONFIG_USB_SERIAL_PL2303=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_FSL_USB2=y
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_HID=m
+# CONFIG_USB_SUPPORT is not set
CONFIG_MMC=y
CONFIG_MMC_MXC=y
CONFIG_NEW_LEDS=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.45.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.47.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.45.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.47.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.23.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.24.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.23.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.24.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.9.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.9.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.11.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.15.2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.15.4.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.45.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.47.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.45.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.47.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.23.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.24.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.23.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.24.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.9.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.9.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.11.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.15.2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.15.4.config
diff --git a/patches/linux/3.10.45 b/patches/linux/3.10.47
similarity index 100%
rename from patches/linux/3.10.45
rename to patches/linux/3.10.47
diff --git a/patches/linux/3.12.23 b/patches/linux/3.12.24
similarity index 100%
rename from patches/linux/3.12.23
rename to patches/linux/3.12.24
diff --git a/patches/linux/3.14.9 b/patches/linux/3.14.11
similarity index 100%
rename from patches/linux/3.14.9
rename to patches/linux/3.14.11
diff --git a/patches/linux/3.15.2 b/patches/linux/3.15.4
similarity index 100%
rename from patches/linux/3.15.2
rename to patches/linux/3.15.4
diff --git a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
index e8160f9..cb72091 100644
--- a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
+++ b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <linux/module.h>
#include <linux/version.h>
#include <linux/gpio.h>
#include <linux/io.h>
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-07-03 21:03:43
|
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 fcefe327cc689194af66174e0495809f87561370 (commit)
via bf47bbd25a0ed5b31254426e4023acd9e0d953ff (commit)
via 7aff2ec2a1eb9c48c8ec4e46fc025ccdf2e1d966 (commit)
via 001dd88b7a34fe4d885c369afa7f1c52a6e6f413 (commit)
from 515ee81c57f110b6c792216f6d09fb6a488478ea (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 fcefe327cc689194af66174e0495809f87561370
Author: Philippe Reynes <tr...@ya...>
Date: Sun Jun 29 15:52:21 2014 +0200
[LINUX] 3.15: move to 3.15.2
commit bf47bbd25a0ed5b31254426e4023acd9e0d953ff
Author: Philippe Reynes <tr...@ya...>
Date: Sun Jun 29 15:52:20 2014 +0200
[LINUX] 3.14: move to 3.14.9
commit 7aff2ec2a1eb9c48c8ec4e46fc025ccdf2e1d966
Author: Philippe Reynes <tr...@ya...>
Date: Sun Jun 29 15:52:19 2014 +0200
[LINUX] 3.12: move to 3.12.23
commit 001dd88b7a34fe4d885c369afa7f1c52a6e6f413
Author: Philippe Reynes <tr...@ya...>
Date: Sun Jun 29 15:52:18 2014 +0200
[LINUX] 3.10: move to 3.10.45
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.42.config => apf27-linux-3.10.45.config} | 0
...x-3.12.21.config => apf27-linux-3.12.23.config} | 0
...nux-3.14.8.config => apf27-linux-3.14.9.config} | 0
...nux-3.15.1.config => apf27-linux-3.15.2.config} | 0
...x-3.10.42.config => apf28-linux-3.10.45.config} | 0
...x-3.12.21.config => apf28-linux-3.12.23.config} | 0
...nux-3.14.8.config => apf28-linux-3.14.9.config} | 0
.../armadeus/apf28/apf28-linux-3.15.2.config | 1 +
...x-3.10.42.config => apf51-linux-3.10.45.config} | 0
...x-3.12.21.config => apf51-linux-3.12.23.config} | 0
...nux-3.14.8.config => apf51-linux-3.14.9.config} | 0
.../armadeus/apf51/apf51-linux-3.15.2.config | 1 +
patches/linux/{3.10.42 => 3.10.45} | 0
patches/linux/{3.12.21 => 3.12.23} | 0
patches/linux/{3.14.8 => 3.14.9} | 0
patches/linux/{3.15.1 => 3.15.2} | 0
19 files changed, 8 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.42.config => apf27-linux-3.10.45.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.21.config => apf27-linux-3.12.23.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.8.config => apf27-linux-3.14.9.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.15.1.config => apf27-linux-3.15.2.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.42.config => apf28-linux-3.10.45.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.21.config => apf28-linux-3.12.23.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.8.config => apf28-linux-3.14.9.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.15.2.config
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.42.config => apf51-linux-3.10.45.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.21.config => apf51-linux-3.12.23.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.8.config => apf51-linux-3.14.9.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.15.2.config
rename patches/linux/{3.10.42 => 3.10.45} (100%)
rename patches/linux/{3.12.21 => 3.12.23} (100%)
rename patches/linux/{3.14.8 => 3.14.9} (100%)
rename patches/linux/{3.15.1 => 3.15.2} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 6ca9777..842e2b4 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.8"
+BR2_DEFAULT_KERNEL_VERSION="3.15.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.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.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 6c01c12..b4c20ee 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.8"
+BR2_DEFAULT_KERNEL_VERSION="3.15.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.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.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 dd5647b..4d50bc2 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.8"
+BR2_DEFAULT_KERNEL_VERSION="3.15.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.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.15.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.10.42.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.45.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.42.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.45.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.21.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.23.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.21.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.23.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.8.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.9.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.15.1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.15.2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.42.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.45.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.42.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.45.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.21.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.23.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.21.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.23.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.8.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.8.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.9.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.2.config
new file mode 120000
index 0000000..3ba4223
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.15.2.config
@@ -0,0 +1 @@
+apf28-linux-3.15.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.42.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.45.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.42.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.45.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.21.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.23.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.21.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.23.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.8.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.9.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.2.config
new file mode 120000
index 0000000..4865fee
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.15.2.config
@@ -0,0 +1 @@
+apf51-linux-3.15.config
\ No newline at end of file
diff --git a/patches/linux/3.10.42 b/patches/linux/3.10.45
similarity index 100%
rename from patches/linux/3.10.42
rename to patches/linux/3.10.45
diff --git a/patches/linux/3.12.21 b/patches/linux/3.12.23
similarity index 100%
rename from patches/linux/3.12.21
rename to patches/linux/3.12.23
diff --git a/patches/linux/3.14.8 b/patches/linux/3.14.9
similarity index 100%
rename from patches/linux/3.14.8
rename to patches/linux/3.14.9
diff --git a/patches/linux/3.15.1 b/patches/linux/3.15.2
similarity index 100%
rename from patches/linux/3.15.1
rename to patches/linux/3.15.2
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-07-02 11:50:23
|
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 515ee81c57f110b6c792216f6d09fb6a488478ea (commit)
from f3cba399c549ce001b8ad2e3b44b6d35e74ff095 (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 515ee81c57f110b6c792216f6d09fb6a488478ea
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 2 13:49:59 2014 +0200
[BUILDROOT] cleanup imx28-usb-downloader package and allows target build also
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/imx28-usb-downloader/Config.in | 7 +++-
.../imx28-usb-downloader/imx28-usb-downloader.mk | 41 ++++++-------------
2 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/buildroot/package/armadeus/imx28-usb-downloader/Config.in b/buildroot/package/armadeus/imx28-usb-downloader/Config.in
index 9ddb009..d2279a2 100644
--- a/buildroot/package/armadeus/imx28-usb-downloader/Config.in
+++ b/buildroot/package/armadeus/imx28-usb-downloader/Config.in
@@ -1,4 +1,9 @@
+config BR2_PACKAGE_IMX28_USB_DOWNLOADER
+ bool "imx28-usb-downloader (target)"
+ help
+ Target tool to download i.MX28 binary through USB.
+
config BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER
- bool "imx28-usb-downloader"
+ bool "imx28-usb-downloader (host)"
help
Host tool to download i.MX28 binary through USB.
diff --git a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
index 177c0d6..74cd854 100644
--- a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
+++ b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
@@ -1,48 +1,33 @@
-#############################################################
+################################################################################
#
# gnet-imx28-usb-downloader
#
-#############################################################
+################################################################################
+
IMX28_USB_DOWNLOADER_VERSION = 0.1
-IMX28_USB_DOWNLOADER_BIN_NAME = gnet-imx28-usb-downloader
IMX28_USB_DOWNLOADER_SITE = $(TOPDIR)/../target/packages/gnet-imx28-usb-downloader/
-ifeq ($(generic-package), )
-IMX28_USB_DOWNLOADER_SITE_METHOD = copy
-else
-HOST_IMX28_USB_DOWNLOADER_SITE = $(TOPDIR)/../target/packages/gnet-imx28-usb-downloader/
IMX28_USB_DOWNLOADER_SITE_METHOD = local
-endif
-
IMX28_USB_DOWNLOADER_DEPENDENCIES = libusb-compat
-HOST_IMX28_USB_DOWNLOADER_DEPENDENCIES = host-libusb-compat
-
-define HOST_IMX28_USB_DOWNLOADER_BUILD_CMDS
- $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) all
-endef
-
-define HOST_IMX28_USB_DOWNLOADER_INSTALL_CMDS
- $(INSTALL) -D -m 0755 $(@D)/$(IMX28_USB_DOWNLOADER_BIN_NAME) \
- $(HOST_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
-endef
-define HOST_IMX28_USB_DOWNLOADER_CLEAN_CMDS
- rm -rf $(HOST_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
-endef
+IMX28_USB_DOWNLOADER_BIN_NAME = gnet-imx28-usb-downloader
define IMX28_USB_DOWNLOADER_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" -C $(@D) all
endef
+define HOST_IMX28_USB_DOWNLOADER_BUILD_CMDS
+ $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) all
+endef
+
define IMX28_USB_DOWNLOADER_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/$(IMX28_USB_DOWNLOADER_BIN_NAME) \
$(TARGET_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
endef
-ifeq ($(generic-package), )
-$(eval $(call GENTARGETS,))
-$(eval $(call GENTARGETS,host))
-else
+define HOST_IMX28_USB_DOWNLOADER_INSTALL_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/$(IMX28_USB_DOWNLOADER_BIN_NAME) \
+ $(HOST_DIR)/usr/bin/$(IMX28_USB_DOWNLOADER_BIN_NAME)
+endef
+
$(eval $(generic-package))
$(eval $(host-generic-package))
-endif
-
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-07-01 09:41:46
|
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 f3cba399c549ce001b8ad2e3b44b6d35e74ff095 (commit)
from 4761cd26463cf8a3e0cad0b6e8b8f96c26a33d61 (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 f3cba399c549ce001b8ad2e3b44b6d35e74ff095
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 21:50:52 2014 +0200
[LINUX] Fixes build of wishbone irq_mngr driver on recent kernels
-----------------------------------------------------------------------
Summary of changes:
.../fpga/virtual_components/irq_mngr/main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
index d57af34..dfc3c8b 100644
--- a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
@@ -1,7 +1,7 @@
/*
* Driver for the IRQ manager (OpenCore/Wishbone based) IP
*
- * (C) Copyright 2008-2013 Armadeus Systems
+ * (C) Copyright 2008-2014 Armadeus Systems
* Author: Julien Boibessot <jul...@ar...>
*
* Inspired of linux/arch/arm/mach-imx/irq.c
@@ -50,7 +50,7 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
# include <mach/fpga.h> /* To remove when MX1 platform is merged */
#else
-# include <linux/../../arch/arm/mach-imx/fpga.h>
+# include <linux/armadeus_fpga.h>
#endif
#endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-06-30 15:53:03
|
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 4761cd26463cf8a3e0cad0b6e8b8f96c26a33d61 (commit)
from 4ab4be142c38300d05430ec72f304e19a108ebbf (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 4761cd26463cf8a3e0cad0b6e8b8f96c26a33d61
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 17:51:58 2014 +0200
[LINUX] 3.13: re-add as1531 hwmon driver (only for 3.13 until it really works)
-----------------------------------------------------------------------
Summary of changes:
.../0363-armadeus-hwmon-add-as1531-adc.patch} | 44 ++++++++++++--------
1 files changed, 27 insertions(+), 17 deletions(-)
copy patches/linux/{3.0/363-armadeus-ADC-Adding_AS1531_adc_driver.patch => 3.13/0363-armadeus-hwmon-add-as1531-adc.patch} (89%)
diff --git a/patches/linux/3.0/363-armadeus-ADC-Adding_AS1531_adc_driver.patch b/patches/linux/3.13/0363-armadeus-hwmon-add-as1531-adc.patch
similarity index 89%
copy from patches/linux/3.0/363-armadeus-ADC-Adding_AS1531_adc_driver.patch
copy to patches/linux/3.13/0363-armadeus-hwmon-add-as1531-adc.patch
index 409dcd5..d87e831 100644
--- a/patches/linux/3.0/363-armadeus-ADC-Adding_AS1531_adc_driver.patch
+++ b/patches/linux/3.13/0363-armadeus-hwmon-add-as1531-adc.patch
@@ -3,11 +3,11 @@ Driver for Austria-Microsystem Analog to Digital Converter.
Signed-off-by: Fabien Marteau <fab...@ar...>
-Index: linux-3.0.10/drivers/hwmon/as1531.c
+Index: linux-3.13.11/drivers/hwmon/as1531.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.10/drivers/hwmon/as1531.c 2011-12-02 09:18:31.000000000 +0100
-@@ -0,0 +1,298 @@
++++ linux-3.13.11/drivers/hwmon/as1531.c 2014-06-30 17:20:58.142454610 +0200
+@@ -0,0 +1,308 @@
+/*
+ * as1531.c
+ *
@@ -215,9 +215,16 @@ Index: linux-3.0.10/drivers/hwmon/as1531.c
+ SENSOR_ATTR(in7_input, S_IRUGO, as1531_read, NULL, 7),
+};
+
-+/*----------------------------------------------------------------------*/
++#ifdef CONFIG_OF
++static struct of_device_id as1531_of_match[] __initdata = {
++ { .compatible = "armadeus,as1231", },
++ { /* sentinel */ }
++};
++
++MODULE_DEVICE_TABLE(of, as1531_of_match);
++#endif
+
-+static int __devinit as1531_probe(struct spi_device *spi)
++static int as1531_probe(struct spi_device *spi)
+{
+ struct as1531 *adc;
+ int status;
@@ -260,7 +267,7 @@ Index: linux-3.0.10/drivers/hwmon/as1531.c
+ return status;
+}
+
-+static int __devexit as1531_remove(struct spi_device *spi)
++static int as1531_remove(struct spi_device *spi)
+{
+ struct as1531 *adc = dev_get_drvdata(&spi->dev);
+ int i;
@@ -283,9 +290,12 @@ Index: linux-3.0.10/drivers/hwmon/as1531.c
+ .driver = {
+ .name = "as1531",
+ .owner = THIS_MODULE,
++#if defined(CONFIG_OF)
++ .of_match_table = as1531_of_match,
++#endif
+ },
+ .probe = as1531_probe,
-+ .remove = __devexit_p(as1531_remove),
++ .remove = as1531_remove,
+};
+
+/* Init module */
@@ -306,11 +316,11 @@ Index: linux-3.0.10/drivers/hwmon/as1531.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
+MODULE_DESCRIPTION("Driver for AS1531 ADC");
-Index: linux-3.0.10/drivers/hwmon/Kconfig
+Index: linux-3.13.11/drivers/hwmon/Kconfig
===================================================================
---- linux-3.0.10.orig/drivers/hwmon/Kconfig 2011-12-02 09:18:11.000000000 +0100
-+++ linux-3.0.10/drivers/hwmon/Kconfig 2011-12-02 09:18:31.000000000 +0100
-@@ -104,6 +104,14 @@
+--- linux-3.13.11.orig/drivers/hwmon/Kconfig 2014-04-23 01:49:33.000000000 +0200
++++ linux-3.13.11/drivers/hwmon/Kconfig 2014-06-30 15:57:08.889515912 +0200
+@@ -127,6 +127,14 @@
This driver can also be built as a module. If so, the module
will be called adcxx.
@@ -325,11 +335,11 @@ Index: linux-3.0.10/drivers/hwmon/Kconfig
config SENSORS_ADM1021
tristate "Analog Devices ADM1021 and compatibles"
depends on I2C
-Index: linux-3.0.10/drivers/hwmon/Makefile
+Index: linux-3.13.11/drivers/hwmon/Makefile
===================================================================
---- linux-3.0.10.orig/drivers/hwmon/Makefile 2011-12-02 09:18:11.000000000 +0100
-+++ linux-3.0.10/drivers/hwmon/Makefile 2011-12-02 09:18:31.000000000 +0100
-@@ -24,6 +24,7 @@
+--- linux-3.13.11.orig/drivers/hwmon/Makefile 2014-04-23 01:49:33.000000000 +0200
++++ linux-3.13.11/drivers/hwmon/Makefile 2014-06-30 15:57:08.889515912 +0200
+@@ -26,6 +26,7 @@
obj-$(CONFIG_SENSORS_AD7414) += ad7414.o
obj-$(CONFIG_SENSORS_AD7418) += ad7418.o
obj-$(CONFIG_SENSORS_ADCXX) += adcxx.o
@@ -337,10 +347,10 @@ Index: linux-3.0.10/drivers/hwmon/Makefile
obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o
obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o
obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o
-Index: linux-3.0.10/Documentation/hwmon/as1531
+Index: linux-3.13.11/Documentation/hwmon/as1531
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.10/Documentation/hwmon/as1531 2011-12-02 09:18:31.000000000 +0100
++++ linux-3.13.11/Documentation/hwmon/as1531 2014-06-30 15:57:08.889515912 +0200
@@ -0,0 +1,15 @@
+Kernel driver as1531
+====================
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-06-30 13:17: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 4ab4be142c38300d05430ec72f304e19a108ebbf (commit)
via ab9a5e1138e54ffe3151977b5c69ae5942a4d8e6 (commit)
via 219d60dea235cf880d2ff83d4baab8d1258b3703 (commit)
via 2970e1522bff101fd1183a579240e0953fccb2ff (commit)
via bd2e965b84280a46d7ebbd67fd5656c8184f5b9b (commit)
from ba19fa24d1c81638abb27840d2f8144fa2315511 (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 4ab4be142c38300d05430ec72f304e19a108ebbf
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 15:16:15 2014 +0200
[ASDEVICES] Cleanup BR package makefile
commit ab9a5e1138e54ffe3151977b5c69ae5942a4d8e6
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 15:06:03 2014 +0200
[BUILDROOT] Fixes fpgaregs executable rights, wiped out by a previous cleanup commit
commit 219d60dea235cf880d2ff83d4baab8d1258b3703
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 11:39:46 2014 +0200
[LINUX] 3.15: fixes 0445-armadeus-dts-add-apf27-USB-support.patch
commit 2970e1522bff101fd1183a579240e0953fccb2ff
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 11:36:15 2014 +0200
[LINUX] Make pod_gpio and apf27-fpga-loader drivers build again on recent Linux kernels
commit bd2e965b84280a46d7ebbd67fd5656c8184f5b9b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 11:33:34 2014 +0200
[LINUX] 3.1x: APF27/51: move Armadeus specific FPGA mapping include to include/linux/armadeus_fpga.h
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 12 +--
buildroot/package/armadeus/fpgaregs/fpgaregs.mk | 2 +-
.../device/armadeus/apf27/apf27-linux-3.10.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.11.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.12.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.13.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.14.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.15.config | 2 +-
.../linux/3.10/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.11/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.12/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.13/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.14/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.15/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 26 -------
.../0445-armadeus-dts-add-apf27-USB-support.patch | 71 +++++++++++++++++
.../linux/3.16/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 26 -------
.../fpga/dev_tools/loader/apf27-fpga-loader.c | 2 +-
.../fpga/virtual_components/pod_gpio/pod_gpio.c | 80 ++++++++++++--------
25 files changed, 193 insertions(+), 306 deletions(-)
delete mode 100644 patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.11/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.12/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.13/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.15/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
create mode 100644 patches/linux/3.15/0445-armadeus-dts-add-apf27-USB-support.patch
delete mode 100644 patches/linux/3.16/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 5c66025..f6a3c6b 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
#
-# as_devices library
+# as_devices
#
-#############################################################
+################################################################################
AS_DEVICES_VERSION = 0.17
AS_DEVICES_SITE = $(TOPDIR)/../target/packages/as_devices
@@ -78,7 +78,6 @@ endif
define AS_DEVICES_INSTALL_TARGET_CMDS
$(MAKE) INSTALL_DIR=$(TARGET_DIR) \
- STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" \
-C $(@D) install-exe
$(AS_DEVICES_INSTALL_TEST)
$(AS_DEVICES_INSTALL_CPP_LIB)
@@ -86,11 +85,6 @@ define AS_DEVICES_INSTALL_TARGET_CMDS
$(AS_DEVICES_INSTALL_PYTHON)
endef
-# Clean
-define AS_DEVICES_CLEAN_CMDS
- $(MAKE) -C $(@D) clean
-endef
-
ifeq ($(generic-package), )
$(eval $(call GENTARGETS))
else
diff --git a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
index faeb44b..b2f7310 100644
--- a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
+++ b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
@@ -25,7 +25,7 @@ define FPGAREGS_BUILD_CMDS
endef
define FPGAREGS_INSTALL_TARGET_CMDS
- $(INSTALL) -m 644 $(@D)/$(FPGAREGS_BINARY) $(TARGET_DIR)/usr/bin/fpgaregs
+ $(INSTALL) -m 755 $(@D)/$(FPGAREGS_BINARY) $(TARGET_DIR)/usr/bin/fpgaregs
endef
$(eval $(generic-package))
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
index d09275d..f76a50b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
@@ -203,7 +203,7 @@ CONFIG_IIO=m
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.config
index d09275d..f76a50b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.config
@@ -203,7 +203,7 @@ CONFIG_IIO=m
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
index d6ed683..bf9abcb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
@@ -208,7 +208,7 @@ CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
index e05962f..c2efccb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
@@ -217,7 +217,7 @@ CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config
index e05962f..c2efccb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config
@@ -217,7 +217,7 @@ CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
index e05962f..c2efccb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
@@ -217,7 +217,7 @@ CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.11/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.11/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.11/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.11/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.11/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.11/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.11/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.12/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.12/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.12/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.12/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.12/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.12/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.12/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.13/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.13/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.13/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.13/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.13/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.13/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.13/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.15/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.15/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.15/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.15/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.15/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.15/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b811fbe..0000000
--- a/patches/linux/3.15/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
diff --git a/patches/linux/3.15/0445-armadeus-dts-add-apf27-USB-support.patch b/patches/linux/3.15/0445-armadeus-dts-add-apf27-USB-support.patch
new file mode 100644
index 0000000..b2fae52
--- /dev/null
+++ b/patches/linux/3.15/0445-armadeus-dts-add-apf27-USB-support.patch
@@ -0,0 +1,71 @@
+Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27.dts
+===================================================================
+--- linux-3.15.1.orig/arch/arm/boot/dts/imx27-apf27.dts 2014-06-26 16:24:44.014143620 +0200
++++ linux-3.15.1/arch/arm/boot/dts/imx27-apf27.dts 2014-06-26 16:45:43.828390693 +0200
+@@ -33,6 +33,17 @@
+ clock-frequency = <0>;
+ };
+ };
++
++ regulators {
++ compatible = "simple-bus";
++
++ reg_usbotg_vbus: usbotg_vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usbotg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ };
++ };
+ };
+
+ &iomuxc {
+@@ -66,6 +77,23 @@
+ MX27_PAD_UART1_RXD__UART1_RXD 0x0
+ >;
+ };
++
++ pinctrl_usbotg: usbotg {
++ fsl,pins = <
++ MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x0
++ MX27_PAD_USBOTG_STP__USBOTG_STP 0x0
++ MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x0
++ MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x0
++ MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x0
++ MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x0
++ MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x0
++ MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x0
++ MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x0
++ MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x0
++ MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x0
++ MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0
++ >;
++ };
+ };
+ };
+
+@@ -75,6 +103,24 @@
+ status = "okay";
+ };
+
++&usbmisc {
++ status = "okay";
++};
++
++&usbotg {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg>;
++ phy_type = "ulpi";
++ dr_mode = "otg";
++ vbus-supply = <®_usbotg_vbus>;
++ disable-over-current;
++ status = "okay";
++};
++
++&usbphy0 {
++ status = "okay";
++};
++
+ &fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_fec1>;
diff --git a/patches/linux/3.16/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.16/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.16/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.16/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.16/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.16/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b811fbe..0000000
--- a/patches/linux/3.16/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
diff --git a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
index ca62f1b..6cb3ae4 100644
--- a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
@@ -38,7 +38,7 @@
#include <linux/gpio.h>
#endif
#if LINUX_VERSION_CODE > KERNEL_VERSION(3,7,20)
-#include <linux/../../arch/arm/mach-imx/fpga.h>
+#include <linux/armadeus_fpga.h>
#else
#include <mach/fpga.h>
#endif
diff --git a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
index 61797fd..e8160f9 100644
--- a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
+++ b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
@@ -19,20 +19,34 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <linux/version.h>
#include <linux/gpio.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
-#include <mach/hardware.h>
-#include <mach/irqs.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+# include <mach/hardware.h>
+# include <mach/irqs.h>
+# ifndef CONFIG_MACH_APF9328
+# include <mach/fpga.h> /* To remove when MX1 platform is merged */
+# endif
+# define irq_get_chip(x) get_irq_chip(x)
+# define irq_set_type(x) set_type(x)
+# define irq_set_chip(x) set_irq_chip(x)
+# define irq_set_handler(x) set_irq_handler(x)
+# define irq_set_chip_and_handler(x) set_irq_chip_and_handler(x)
+#else
+# include <linux/armadeus_fpga.h>
+#endif
#include <asm/irq.h>
#include <asm/io.h> /* readb() & Co */
#include <asm/mach/irq.h>
+#define DRIVER_NAME "pod_gpio"
+#define IRQ_GPIO_POD(x) IRQ_FPGA(x+16)
-#include "pod_gpio.h"
-
+/* IP registers map: */
#define GPIO_ID 0x00
#define GPIO_CONFIG 0x02
#define GPIO_VALUE 0x04
@@ -61,7 +75,7 @@ static void cg_write_reg(const struct pod_gpio_chip *cg_chip, int reg,
static void pod_gpio_ack_irq(struct irq_data *data)
{
- struct irq_chip *chip = get_irq_chip(data->irq);
+ struct irq_chip *chip = irq_get_chip(data->irq);
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip, interrupt_chip);
@@ -71,7 +85,7 @@ static void pod_gpio_ack_irq(struct irq_data *data)
static void pod_gpio_mask_irq(struct irq_data *data)
{
- struct irq_chip *chip = get_irq_chip(data->irq);
+ struct irq_chip *chip = irq_get_chip(data->irq);
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip, interrupt_chip);
@@ -85,7 +99,7 @@ static void pod_gpio_mask_irq(struct irq_data *data)
static void pod_gpio_unmask_irq(struct irq_data *data)
{
- struct irq_chip *chip = get_irq_chip(data->irq);
+ struct irq_chip *chip = irq_get_chip(data->irq);
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip, interrupt_chip);
@@ -98,24 +112,26 @@ static void pod_gpio_unmask_irq(struct irq_data *data)
(1 << (data->irq - IRQ_GPIO_POD(0))));
}
-static int pod_gpio_irq_type(unsigned int _irq, unsigned int type)
+/* static int pod_gpio_irq_type(unsigned int _irq, unsigned int type) old kernels ? */
+static int pod_gpio_irq_type(struct irq_data *data, unsigned int type)
{
- struct irq_chip *chip = get_irq_chip(_irq);
+ /* unsigned int irq = _irq; old kernels ? */
+ unsigned int irq = data->irq;
+ struct irq_chip *chip = irq_get_chip(irq);
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip,
interrupt_chip);
u16 edge_config;
-
edge_config = cg_read_reg(cg_chip, GPIO_INTERRUPT_EDGE_TYPE);
/* Only falling and rising edge are supporter by pod_gpio */
if (type == IRQ_TYPE_EDGE_RISING) {
cg_write_reg(cg_chip, GPIO_INTERRUPT_EDGE_TYPE, edge_config |
- (1 << (_irq - IRQ_GPIO_POD(0))));
+ (1 << (irq - IRQ_GPIO_POD(0))));
} else if (type == IRQ_TYPE_EDGE_FALLING) {
cg_write_reg(cg_chip, GPIO_INTERRUPT_EDGE_TYPE, edge_config &
- ~(1 << (_irq - IRQ_GPIO_POD(0))));
+ ~(1 << (irq - IRQ_GPIO_POD(0))));
} else {
dev_err(&cg_chip->pdev->dev,
"The selected edge type is not supported by the driver.\n");
@@ -132,14 +148,15 @@ static irqreturn_t pod_gpio_interrupt(int irq, void *data)
u16 pending_interrupts;
irq = IRQ_GPIO_POD(0);
- desc = irq_to_desc(irq);
+// desc = irq_to_desc(irq);
pending_interrupts = cg_read_reg(cg_chip, GPIO_INTERRUPT_STATUS);
while (pending_interrupts) {
if (pending_interrupts & 1) {
/* Get irq handle */
- desc_handle_irq(irq, desc);
+// desc_handle_irq(irq, desc);
+ generic_handle_irq(irq);
}
irq++;
desc++;
@@ -198,7 +215,7 @@ static int pod_gpio_direction_out(struct gpio_chip *chip,
container_of(chip, struct pod_gpio_chip, chip);
u16 io_config;
- pod_gpio_set(cg_chip, gpio_num, val); /* set output value before */
+ pod_gpio_set(chip, gpio_num, val); /* set output value before */
io_config = cg_read_reg(cg_chip, GPIO_CONFIG) & ~(1 << gpio_num);
cg_write_reg(cg_chip, GPIO_CONFIG, io_config);
@@ -207,7 +224,6 @@ static int pod_gpio_direction_out(struct gpio_chip *chip,
static int pod_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
{
-
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip, chip);
@@ -232,7 +248,7 @@ static int pod_gpio_probe(struct platform_device *pdev)
}
if (!request_mem_region(resource_memory->start,
- resource_size(resource_memory), pod_gpio_DRIVER_NAME)) {
+ resource_size(resource_memory), DRIVER_NAME)) {
dev_err(&pdev->dev, "Can't request memory region %x to %x\n",
resource_memory->start, resource_memory->start +
resource_memory->end);
@@ -240,7 +256,7 @@ static int pod_gpio_probe(struct platform_device *pdev)
goto exit;
}
- /*Allocate memory for pod_gpio chip*/
+ /* Allocate memory for pod_gpio chip */
cg_chip = kzalloc(sizeof(struct pod_gpio_chip), GFP_KERNEL);
if (!cg_chip) {
err = -ENOMEM;
@@ -251,8 +267,8 @@ static int pod_gpio_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, cg_chip);
- /*Chip configuration*/
- cg_chip->chip.label = pod_gpio_DRIVER_NAME;
+ /* Chip configuration */
+ cg_chip->chip.label = DRIVER_NAME;
cg_chip->chip.owner = THIS_MODULE;
cg_chip->chip.ngpio = 16;
cg_chip->chip.base = -1;
@@ -264,17 +280,17 @@ static int pod_gpio_probe(struct platform_device *pdev)
cg_chip->irq_base = IRQ_GPIO_POD(0);
cg_chip->pdev = pdev;
- /*Interrupt chip configuration*/
- cg_chip->interrupt_chip.name = pod_gpio_DRIVER_NAME;
+ /* Interrupt chip configuration */
+ cg_chip->interrupt_chip.name = DRIVER_NAME;
cg_chip->interrupt_chip.irq_ack = pod_gpio_ack_irq;
cg_chip->interrupt_chip.irq_mask = pod_gpio_mask_irq;
cg_chip->interrupt_chip.irq_unmask = pod_gpio_unmask_irq;
- cg_chip->interrupt_chip.set_type = pod_gpio_irq_type;
+ cg_chip->interrupt_chip.irq_set_type = pod_gpio_irq_type;
- /* Add virtual interrupts from GPIO*/
- for (irq = IRQ_GPIO_POD(0) ; irq < IRQ_GPIO_POD(16) ; irq++) {
- set_irq_chip_data(irq, cg_chip);
- set_irq_chip_and_handler(irq, &cg_chip->interrupt_chip,
+ /* Add virtual interrupts from GPIO */
+ for (irq = IRQ_GPIO_POD(0); irq < IRQ_GPIO_POD(16); irq++) {
+ irq_set_chip_data(irq, cg_chip);
+ irq_set_chip_and_handler(irq, &cg_chip->interrupt_chip,
handle_edge_irq);
set_irq_flags(irq, IRQF_VALID);
}
@@ -287,7 +303,7 @@ static int pod_gpio_probe(struct platform_device *pdev)
goto free_chip;
}
- /*Check if ID is correct*/
+ /* Check if ID is correct */
id = cg_read_reg(cg_chip, GPIO_ID);
if (pdev->id != id) {
dev_err(&pdev->dev,
@@ -303,7 +319,7 @@ static int pod_gpio_probe(struct platform_device *pdev)
/* Disable all interrupts */
cg_write_reg(cg_chip, GPIO_ENABLE_INTERRUPT, 0x00);
- /* Add the GPIO chip*/
+ /* Add the GPIO chip */
err = gpiochip_add(&cg_chip->chip);
if (err) {
dev_err(&pdev->dev, "Can't add the gpio chip\n");
@@ -358,8 +374,8 @@ static int pod_gpio_remove(struct platform_device *pdev)
resource_size(resource_memory));
for (irq = IRQ_GPIO_POD(0) ; irq < IRQ_GPIO_POD(16) ; irq++) {
- set_irq_chip(irq, NULL);
- set_irq_handler(irq, NULL);
+ irq_set_chip(irq, NULL);
+ irq_set_handler(irq, NULL);
set_irq_flags(irq, 0);
}
@@ -372,7 +388,7 @@ static int pod_gpio_remove(struct platform_device *pdev)
static struct platform_driver pod_gpio_drv = {
.driver = {
- .name = pod_gpio_DRIVER_NAME,
+ .name = DRIVER_NAME,
.owner = THIS_MODULE,
},
.probe = pod_gpio_probe,
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-06-29 21:05:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ba19fa24d1c81638abb27840d2f8144fa2315511 (commit)
from 22f6eb050e41e0d8de86f18f5b8b8bd1932a937f (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 ba19fa24d1c81638abb27840d2f8144fa2315511
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jun 29 23:04:58 2014 +0200
[BUILD] Fixes build informations when BR2_HOST_DIR is not set to default value
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 85b440c..bc67917 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,7 @@ ARMADEUS_BASE_DIR:=$(shell pwd)
endif
BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
+BASE_DIR := $(ARMADEUS_BASE_DIR)/buildroot/output
ifneq ($(BUILDROOT_DL_DIR),)
# To be removed with BR 2014.02
@@ -71,6 +72,11 @@ BUILDROOT_OUTPUT_DIR:=$(BUILDROOT_DIR)/output
BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/build
BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/toolchain
BUILDROOT_BUILD_DIR:=$(BUILDROOT_OUTPUT_DIR)/build
+ifneq ($(BR2_HOST_DIR),)
+BUILDROOT_HOST_DIR:=$(shell echo $(BR2_HOST_DIR))
+else
+BUILDROOT_HOST_DIR:=$(BUILDROOT_DIR)/output/host
+endif
ARMADEUS_BINARIES:=$(BUILDROOT_OUTPUT_DIR)/images
ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_OUTPUT_DIR)/target
ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.tar
@@ -83,7 +89,7 @@ ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAM
ARMADEUS_LINUX_CONFIG:=$(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE))
ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
-ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_OUTPUT_DIR)/host/usr/bin
+ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_HOST_DIR)/usr/bin
ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)-gcc -dumpversion)
else
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-06-26 13:15:45
|
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 22f6eb050e41e0d8de86f18f5b8b8bd1932a937f (commit)
from feeb9861cb9de3f5a08ce68ab951fe6f6ad065a8 (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 22f6eb050e41e0d8de86f18f5b8b8bd1932a937f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 26 15:15:24 2014 +0200
[LINUX] 3.15+: APF27: finally fixes patches needed/not needed to have LCD working on APF27Dev
-----------------------------------------------------------------------
Summary of changes:
...re_to_setup_PWM_Contrast_Control_Register.patch | 33 -------------
...re_to_setup_PWM_Contrast_Control_Register.tofix | 49 --------------------
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 4 +-
...re_to_setup_PWM_Contrast_Control_Register.patch | 33 -------------
...re_to_setup_PWM_Contrast_Control_Register.tofix | 49 --------------------
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 4 +-
6 files changed, 2 insertions(+), 170 deletions(-)
delete mode 100644 patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
delete mode 100644 patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
delete mode 100644 patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
delete mode 100644 patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
diff --git a/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
deleted file mode 100644
index 1f4a21e..0000000
--- a/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch adds feature to setup PWM Contrast Control Register.
-This register is used to control the signal output at the contrast pin,
-which controls contrast of the LCD panel.
-
-Signed-off-by: Alexander Shiyan <shc...@ma...>
-
-Modified by JB for 3.15.
-
-Index: linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-===================================================================
---- linux-3.15.1.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:54:06.385625557 +0200
-+++ linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:56:48.894431399 +0200
-@@ -22,6 +22,7 @@
- default value for the contrast control register.
- If that property is ommited, the register is zeroed.
- - fsl,lscr1: LCDC Sharp Configuration Register value.
-+- fsl,pwmr: LCDC PWM Contrast Control Register value.
-
- Example:
-
-Index: linux-3.15.1/drivers/video/fbdev/imxfb.c
-===================================================================
---- linux-3.15.1.orig/drivers/video/fbdev/imxfb.c 2014-06-26 11:57:23.886604919 +0200
-+++ linux-3.15.1/drivers/video/fbdev/imxfb.c 2014-06-26 11:59:49.143325212 +0200
-@@ -676,6 +676,8 @@
- of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
-
- of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
-+
-+ of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
- }
-
- return 0;
diff --git a/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix b/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
deleted file mode 100644
index e5e6601..0000000
--- a/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
+++ /dev/null
@@ -1,49 +0,0 @@
-This patch adds feature to setup PWM Contrast Control Register.
-This register is used to control the signal output at the contrast pin,
-which controls contrast of the LCD panel.
-
-Signed-off-by: Alexander Shiyan <shc...@ma...>
----
- Documentation/devicetree/bindings/video/fsl,imx-fb.txt | 1 +
- drivers/video/imxfb.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-Index: linux-3.11-rc3/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-===================================================================
---- linux-3.11-rc3.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-+++ linux-3.11-rc3/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-@@ -18,6 +18,7 @@ Optional properties:
- - fsl,dmacr: DMA Control Register value. This is optional. By default, the
- register is not modified as recommended by the datasheet.
- - fsl,lscr1: LCDC Sharp Configuration Register value.
-+- fsl,pwmr: LCDC PWM Contrast Control Register value.
-
- Example:
-
-Index: linux-3.11-rc3/drivers/video/imxfb.c
-===================================================================
---- linux-3.11-rc3.orig/drivers/video/imxfb.c
-+++ linux-3.11-rc3/drivers/video/imxfb.c
-@@ -814,8 +814,8 @@ static int imxfb_init_fbinfo(struct plat
-
- fbi->lscr1 = IMXFB_LSCR1_DEFAULT;
- of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
--
- of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
-+ of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
-
- /* These two function pointers could be used by some specific
- * platforms. */
-Index: linux-3.11-rc3/drivers/video/Kconfig
-===================================================================
---- linux-3.11-rc3.orig/drivers/video/Kconfig
-+++ linux-3.11-rc3/drivers/video/Kconfig
-@@ -363,7 +363,7 @@ config FB_SA1100
-
- config FB_IMX
- tristate "Freescale i.MX1/21/25/27 LCD support"
-- depends on FB && IMX_HAVE_PLATFORM_IMX_FB
-+ depends on FB
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
diff --git a/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
index f248815..92123bb 100644
--- a/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
+++ b/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
@@ -1,7 +1,5 @@
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
-Depends on 0211
-
Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
===================================================================
--- linux-3.15.1.orig/arch/arm/boot/dts/imx27-apf27dev.dts 2014-06-26 12:08:04.865783373 +0200
@@ -10,7 +8,7 @@ Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
&fb {
display = <&display>;
-+ fsl,pwmr = <0x00a90580>;
++ fsl,lpccr = <0x00a90580>;
fsl,dmacr = <0x00020010>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_imxfb1>;
diff --git a/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
deleted file mode 100644
index 1f4a21e..0000000
--- a/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This patch adds feature to setup PWM Contrast Control Register.
-This register is used to control the signal output at the contrast pin,
-which controls contrast of the LCD panel.
-
-Signed-off-by: Alexander Shiyan <shc...@ma...>
-
-Modified by JB for 3.15.
-
-Index: linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-===================================================================
---- linux-3.15.1.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:54:06.385625557 +0200
-+++ linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:56:48.894431399 +0200
-@@ -22,6 +22,7 @@
- default value for the contrast control register.
- If that property is ommited, the register is zeroed.
- - fsl,lscr1: LCDC Sharp Configuration Register value.
-+- fsl,pwmr: LCDC PWM Contrast Control Register value.
-
- Example:
-
-Index: linux-3.15.1/drivers/video/fbdev/imxfb.c
-===================================================================
---- linux-3.15.1.orig/drivers/video/fbdev/imxfb.c 2014-06-26 11:57:23.886604919 +0200
-+++ linux-3.15.1/drivers/video/fbdev/imxfb.c 2014-06-26 11:59:49.143325212 +0200
-@@ -676,6 +676,8 @@
- of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
-
- of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
-+
-+ of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
- }
-
- return 0;
diff --git a/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix b/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
deleted file mode 100644
index e5e6601..0000000
--- a/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
+++ /dev/null
@@ -1,49 +0,0 @@
-This patch adds feature to setup PWM Contrast Control Register.
-This register is used to control the signal output at the contrast pin,
-which controls contrast of the LCD panel.
-
-Signed-off-by: Alexander Shiyan <shc...@ma...>
----
- Documentation/devicetree/bindings/video/fsl,imx-fb.txt | 1 +
- drivers/video/imxfb.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-Index: linux-3.11-rc3/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-===================================================================
---- linux-3.11-rc3.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-+++ linux-3.11-rc3/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-@@ -18,6 +18,7 @@ Optional properties:
- - fsl,dmacr: DMA Control Register value. This is optional. By default, the
- register is not modified as recommended by the datasheet.
- - fsl,lscr1: LCDC Sharp Configuration Register value.
-+- fsl,pwmr: LCDC PWM Contrast Control Register value.
-
- Example:
-
-Index: linux-3.11-rc3/drivers/video/imxfb.c
-===================================================================
---- linux-3.11-rc3.orig/drivers/video/imxfb.c
-+++ linux-3.11-rc3/drivers/video/imxfb.c
-@@ -814,8 +814,8 @@ static int imxfb_init_fbinfo(struct plat
-
- fbi->lscr1 = IMXFB_LSCR1_DEFAULT;
- of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
--
- of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
-+ of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
-
- /* These two function pointers could be used by some specific
- * platforms. */
-Index: linux-3.11-rc3/drivers/video/Kconfig
-===================================================================
---- linux-3.11-rc3.orig/drivers/video/Kconfig
-+++ linux-3.11-rc3/drivers/video/Kconfig
-@@ -363,7 +363,7 @@ config FB_SA1100
-
- config FB_IMX
- tristate "Freescale i.MX1/21/25/27 LCD support"
-- depends on FB && IMX_HAVE_PLATFORM_IMX_FB
-+ depends on FB
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
diff --git a/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
index f248815..92123bb 100644
--- a/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
+++ b/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
@@ -1,7 +1,5 @@
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
-Depends on 0211
-
Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
===================================================================
--- linux-3.15.1.orig/arch/arm/boot/dts/imx27-apf27dev.dts 2014-06-26 12:08:04.865783373 +0200
@@ -10,7 +8,7 @@ Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
&fb {
display = <&display>;
-+ fsl,pwmr = <0x00a90580>;
++ fsl,lpccr = <0x00a90580>;
fsl,dmacr = <0x00020010>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_imxfb1>;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-06-26 10:31:22
|
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 feeb9861cb9de3f5a08ce68ab951fe6f6ad065a8 (commit)
from 40fb780f31f1b2802872f84840f3f3568c0c194e (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 feeb9861cb9de3f5a08ce68ab951fe6f6ad065a8
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 26 12:27:11 2014 +0200
[LINUX] APF27: 3.15+: Makes LCD work again on APF27Dev and move Linux 3.15 support to 3.15.1 while we are at it.
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.15.1.config | 1 +
patches/linux/3.15.1 | 1 +
...re_to_setup_PWM_Contrast_Control_Register.patch | 33 ++++++++++++++++++++
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 16 +++++++++
...re_to_setup_PWM_Contrast_Control_Register.patch | 33 ++++++++++++++++++++
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 16 +++++++++
6 files changed, 100 insertions(+), 0 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.15.1.config
create mode 120000 patches/linux/3.15.1
create mode 100644 patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
create mode 100644 patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
create mode 100644 patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
create mode 100644 patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.1.config
new file mode 120000
index 0000000..badcea0
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.1.config
@@ -0,0 +1 @@
+apf27-linux-3.15.config
\ No newline at end of file
diff --git a/patches/linux/3.15.1 b/patches/linux/3.15.1
new file mode 120000
index 0000000..230693c
--- /dev/null
+++ b/patches/linux/3.15.1
@@ -0,0 +1 @@
+3.15
\ No newline at end of file
diff --git a/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
new file mode 100644
index 0000000..1f4a21e
--- /dev/null
+++ b/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
@@ -0,0 +1,33 @@
+This patch adds feature to setup PWM Contrast Control Register.
+This register is used to control the signal output at the contrast pin,
+which controls contrast of the LCD panel.
+
+Signed-off-by: Alexander Shiyan <shc...@ma...>
+
+Modified by JB for 3.15.
+
+Index: linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
+===================================================================
+--- linux-3.15.1.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:54:06.385625557 +0200
++++ linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:56:48.894431399 +0200
+@@ -22,6 +22,7 @@
+ default value for the contrast control register.
+ If that property is ommited, the register is zeroed.
+ - fsl,lscr1: LCDC Sharp Configuration Register value.
++- fsl,pwmr: LCDC PWM Contrast Control Register value.
+
+ Example:
+
+Index: linux-3.15.1/drivers/video/fbdev/imxfb.c
+===================================================================
+--- linux-3.15.1.orig/drivers/video/fbdev/imxfb.c 2014-06-26 11:57:23.886604919 +0200
++++ linux-3.15.1/drivers/video/fbdev/imxfb.c 2014-06-26 11:59:49.143325212 +0200
+@@ -676,6 +676,8 @@
+ of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
+
+ of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
++
++ of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
+ }
+
+ return 0;
diff --git a/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
new file mode 100644
index 0000000..f248815
--- /dev/null
+++ b/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
@@ -0,0 +1,16 @@
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+
+Depends on 0211
+
+Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.15.1.orig/arch/arm/boot/dts/imx27-apf27dev.dts 2014-06-26 12:08:04.865783373 +0200
++++ linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts 2014-06-26 12:09:25.118181329 +0200
+@@ -94,6 +94,7 @@
+
+ &fb {
+ display = <&display>;
++ fsl,pwmr = <0x00a90580>;
+ fsl,dmacr = <0x00020010>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_imxfb1>;
diff --git a/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
new file mode 100644
index 0000000..1f4a21e
--- /dev/null
+++ b/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
@@ -0,0 +1,33 @@
+This patch adds feature to setup PWM Contrast Control Register.
+This register is used to control the signal output at the contrast pin,
+which controls contrast of the LCD panel.
+
+Signed-off-by: Alexander Shiyan <shc...@ma...>
+
+Modified by JB for 3.15.
+
+Index: linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
+===================================================================
+--- linux-3.15.1.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:54:06.385625557 +0200
++++ linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:56:48.894431399 +0200
+@@ -22,6 +22,7 @@
+ default value for the contrast control register.
+ If that property is ommited, the register is zeroed.
+ - fsl,lscr1: LCDC Sharp Configuration Register value.
++- fsl,pwmr: LCDC PWM Contrast Control Register value.
+
+ Example:
+
+Index: linux-3.15.1/drivers/video/fbdev/imxfb.c
+===================================================================
+--- linux-3.15.1.orig/drivers/video/fbdev/imxfb.c 2014-06-26 11:57:23.886604919 +0200
++++ linux-3.15.1/drivers/video/fbdev/imxfb.c 2014-06-26 11:59:49.143325212 +0200
+@@ -676,6 +676,8 @@
+ of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
+
+ of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
++
++ of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
+ }
+
+ return 0;
diff --git a/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
new file mode 100644
index 0000000..f248815
--- /dev/null
+++ b/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
@@ -0,0 +1,16 @@
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+
+Depends on 0211
+
+Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.15.1.orig/arch/arm/boot/dts/imx27-apf27dev.dts 2014-06-26 12:08:04.865783373 +0200
++++ linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts 2014-06-26 12:09:25.118181329 +0200
+@@ -94,6 +94,7 @@
+
+ &fb {
+ display = <&display>;
++ fsl,pwmr = <0x00a90580>;
+ fsl,dmacr = <0x00020010>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_imxfb1>;
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2014-06-25 15:31: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 40fb780f31f1b2802872f84840f3f3568c0c194e (commit)
from 93f06f07c6434caf6fed5fa7848267f5978ff05f (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 40fb780f31f1b2802872f84840f3f3568c0c194e
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Jun 25 17:30:48 2014 +0200
[AS_DEVICES] Don't display C wrappers for Python in documentation.
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/Doxyfile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target/packages/as_devices/Doxyfile b/target/packages/as_devices/Doxyfile
index 497649c..c196134 100644
--- a/target/packages/as_devices/Doxyfile
+++ b/target/packages/as_devices/Doxyfile
@@ -656,7 +656,7 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
-EXCLUDE =
+EXCLUDE = ./python/src
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-06-25 15:09:58
|
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 93f06f07c6434caf6fed5fa7848267f5978ff05f (commit)
from 64eef336b2ac2776ee2af5456574eaad6d4fde64 (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 93f06f07c6434caf6fed5fa7848267f5978ff05f
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 25 17:09:30 2014 +0200
[LINUX] APF27/51/28: Update Linux 3.14 support to 3.14.8
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...nux-3.14.6.config => apf27-linux-3.14.8.config} | 0
...nux-3.14.6.config => apf28-linux-3.14.8.config} | 0
...nux-3.14.6.config => apf51-linux-3.14.8.config} | 0
.../device/armadeus/apf6/apf6-linux-3.14.8.config | 1 +
patches/linux/{3.14.6 => 3.14.8} | 0
8 files changed, 7 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.6.config => apf27-linux-3.14.8.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.6.config => apf28-linux-3.14.8.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.6.config => apf51-linux-3.14.8.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-3.14.8.config
rename patches/linux/{3.14.6 => 3.14.8} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 97c0d95..6ca9777 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.6"
+BR2_DEFAULT_KERNEL_VERSION="3.14.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.14.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.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 eed6cc7..6c01c12 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.6"
+BR2_DEFAULT_KERNEL_VERSION="3.14.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.14.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.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 e29426e..dd5647b 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.6"
+BR2_DEFAULT_KERNEL_VERSION="3.14.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.14.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.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.14.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.6.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.8.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.6.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.8.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.6.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.6.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.8.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.8.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.8.config
new file mode 120000
index 0000000..26da497
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.8.config
@@ -0,0 +1 @@
+apf6-linux-3.14.config
\ No newline at end of file
diff --git a/patches/linux/3.14.6 b/patches/linux/3.14.8
similarity index 100%
rename from patches/linux/3.14.6
rename to patches/linux/3.14.8
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-06-25 09:21:45
|
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 64eef336b2ac2776ee2af5456574eaad6d4fde64 (commit)
from 16f3bee792ed6af559b21b1855b12112c3e02b36 (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 64eef336b2ac2776ee2af5456574eaad6d4fde64
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 25 11:21:28 2014 +0200
[ASDEVICES] Lindent python C wrappers sources... again...
-----------------------------------------------------------------------
Summary of changes:
.../packages/as_devices/python/src/Apf27Pwm_wrap.c | 333 ++++++------
.../packages/as_devices/python/src/Apf27Pwm_wrap.h | 46 +-
target/packages/as_devices/python/src/AsAdc_wrap.c | 158 +++---
target/packages/as_devices/python/src/AsAdc_wrap.h | 6 +-
target/packages/as_devices/python/src/AsDac_wrap.c | 163 +++---
target/packages/as_devices/python/src/AsDac_wrap.h | 6 +-
.../packages/as_devices/python/src/AsGpio_wrap.c | 484 ++++++++---------
.../packages/as_devices/python/src/AsGpio_wrap.h | 22 +-
target/packages/as_devices/python/src/AsI2c_wrap.c | 563 ++++++++++----------
target/packages/as_devices/python/src/AsI2c_wrap.h | 22 +-
target/packages/as_devices/python/src/AsSpi_wrap.c | 515 +++++++++----------
target/packages/as_devices/python/src/AsSpi_wrap.h | 22 +-
12 files changed, 1091 insertions(+), 1249 deletions(-)
diff --git a/target/packages/as_devices/python/src/Apf27Pwm_wrap.c b/target/packages/as_devices/python/src/Apf27Pwm_wrap.c
index fbd5cf2..a0be203 100644
--- a/target/packages/as_devices/python/src/Apf27Pwm_wrap.c
+++ b/target/packages/as_devices/python/src/Apf27Pwm_wrap.c
@@ -5,247 +5,226 @@
* @param aPwmNumber The pwm number used
* @return PyObject
*/
-static PyObject * init(PyObject *self, PyObject *args)
+static PyObject *init(PyObject * self, PyObject * args)
{
- int aPwmNumber;
- int ret=1;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
-
- ret = as_apf27_pwm_init(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Initialization error. Is kernel module loaded ?");
- return NULL;
- }
-
- return Py_BuildValue("i",ret);
+ int aPwmNumber;
+ int ret = 1;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
+
+ ret = as_apf27_pwm_init(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError,
+ "Initialization error. Is kernel module loaded ?");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** Set frequency
* @param aPwmNumber the pwm number used
* @param aFrequency frequency to set in Hz
*/
-static PyObject * setFrequency(PyObject *self, PyObject *args)
+static PyObject *setFrequency(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
- int aFrequency;
-
- int ret=0;
-
- /* Get arguments */
- if(!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aFrequency))
- {
- return NULL;
- }
-
- ret = as_apf27_pwm_setFrequency(aPwmNumber, aFrequency);
- if(ret<0)
- {
- PyErr_SetString(PyExc_Exception,"Can't set frequency");
- return NULL;
- }
-
- return Py_BuildValue("i",ret);
+ /* parameters */
+ int aPwmNumber;
+ int aFrequency;
+
+ int ret = 0;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aFrequency)) {
+ return NULL;
+ }
+
+ ret = as_apf27_pwm_setFrequency(aPwmNumber, aFrequency);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't set frequency");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** Get Frequency
* @param aPwmNumber the pwm number used
*/
-static PyObject * getFrequency(PyObject *self, PyObject *args)
+static PyObject *getFrequency(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_getFrequency(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't get frequency");
- return NULL;
- }
+ ret = as_apf27_pwm_getFrequency(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't get frequency");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
-static PyObject * setPeriod(PyObject *self, PyObject *args)
+static PyObject *setPeriod(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
- int aPeriod;
-
- int ret=0;
-
- /* Get arguments */
- if(!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aPeriod))
- {
- return NULL;
- }
-
- ret = as_apf27_pwm_setPeriod(aPwmNumber, aPeriod);
- if(ret<0)
- {
- PyErr_SetString(PyExc_Exception,"Can't set period");
- return NULL;
- }
-
- return Py_BuildValue("i",ret);
+ /* parameters */
+ int aPwmNumber;
+ int aPeriod;
+
+ int ret = 0;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aPeriod)) {
+ return NULL;
+ }
+
+ ret = as_apf27_pwm_setPeriod(aPwmNumber, aPeriod);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't set period");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * getPeriod(PyObject *self, PyObject *args)
+static PyObject *getPeriod(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_getPeriod(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't get period");
- return NULL;
- }
+ ret = as_apf27_pwm_getPeriod(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't get period");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
-static PyObject * setDuty(PyObject *self, PyObject *args)
+static PyObject *setDuty(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
- int aDuty;
-
- int ret=0;
-
- /* Get arguments */
- if(!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aDuty))
- {
- return NULL;
- }
-
- ret = as_apf27_pwm_setDuty(aPwmNumber, aDuty);
- if(ret<0)
- {
- PyErr_SetString(PyExc_Exception,"Can't set duty");
- return NULL;
- }
-
- return Py_BuildValue("i",ret);
+ /* parameters */
+ int aPwmNumber;
+ int aDuty;
+
+ int ret = 0;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aDuty)) {
+ return NULL;
+ }
+
+ ret = as_apf27_pwm_setDuty(aPwmNumber, aDuty);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't set duty");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * getDuty(PyObject *self, PyObject *args)
+static PyObject *getDuty(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_getDuty(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't get duty");
- return NULL;
- }
+ ret = as_apf27_pwm_getDuty(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't get duty");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
-static PyObject * activate(PyObject *self, PyObject *args)
+static PyObject *activate(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
- int aEnable;
+ /* parameters */
+ int aPwmNumber;
+ int aEnable;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ii", &aPwmNumber,&aEnable))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ii", &aPwmNumber, &aEnable))
+ return NULL;
- ret = as_apf27_pwm_activate(aPwmNumber,aEnable);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't activate pwm");
- return NULL;
- }
+ ret = as_apf27_pwm_activate(aPwmNumber, aEnable);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't activate pwm");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
-static PyObject * getState(PyObject *self, PyObject *args)
+static PyObject *getState(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_getState(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't get state");
- return NULL;
- }
+ ret = as_apf27_pwm_getState(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't get state");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
-static PyObject * pwm_close(PyObject *self, PyObject *args)
+static PyObject *pwm_close(PyObject * self, PyObject * args)
{
- /* parameters */
- int aPwmNumber;
+ /* parameters */
+ int aPwmNumber;
- int ret=1;
+ int ret = 1;
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
- return NULL;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aPwmNumber))
+ return NULL;
- ret = as_apf27_pwm_close(aPwmNumber);
- if(ret < 0)
- {
- PyErr_SetString(PyExc_Exception,
- "Can't close");
- return NULL;
- }
+ ret = as_apf27_pwm_close(aPwmNumber);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_Exception, "Can't close");
+ return NULL;
+ }
- return Py_BuildValue("i",ret);
+ return Py_BuildValue("i", ret);
}
void initApf27Pwm_wrap()
{
- PyObject *m;
-
- m = Py_InitModule("Apf27Pwm_wrap", Apf27Pwm_wrap_Methods);
- if (m == NULL)
- return;
+ PyObject *m;
+ m = Py_InitModule("Apf27Pwm_wrap", Apf27Pwm_wrap_Methods);
+ if (m == NULL)
+ return;
}
-
diff --git a/target/packages/as_devices/python/src/Apf27Pwm_wrap.h b/target/packages/as_devices/python/src/Apf27Pwm_wrap.h
index e63787b..2716b8a 100644
--- a/target/packages/as_devices/python/src/Apf27Pwm_wrap.h
+++ b/target/packages/as_devices/python/src/Apf27Pwm_wrap.h
@@ -6,42 +6,40 @@
#include <Python.h>
-
/* init module */
void initApf27Pwm();
/*********************/
/* Functions wrapped */
/*********************/
-static PyObject * init(PyObject *self, PyObject *args);
+static PyObject *init(PyObject * self, PyObject * args);
-static PyObject * setFrequency(PyObject *self, PyObject *args);
-static PyObject * getFrequency(PyObject *self, PyObject *args);
+static PyObject *setFrequency(PyObject * self, PyObject * args);
+static PyObject *getFrequency(PyObject * self, PyObject * args);
-static PyObject * setPeriod(PyObject *self, PyObject *args);
-static PyObject * getPeriod(PyObject *self, PyObject *args);
+static PyObject *setPeriod(PyObject * self, PyObject * args);
+static PyObject *getPeriod(PyObject * self, PyObject * args);
-static PyObject * setDuty(PyObject *self, PyObject *args);
-static PyObject * getDuty(PyObject *self, PyObject *args);
+static PyObject *setDuty(PyObject * self, PyObject * args);
+static PyObject *getDuty(PyObject * self, PyObject * args);
-static PyObject * activate(PyObject *self, PyObject *args);
-static PyObject * getState(PyObject *self, PyObject *args);
+static PyObject *activate(PyObject * self, PyObject * args);
+static PyObject *getState(PyObject * self, PyObject * args);
-static PyObject * pwm_close(PyObject *self, PyObject *args);
+static PyObject *pwm_close(PyObject * self, PyObject * args);
/* Methods definition */
static PyMethodDef Apf27Pwm_wrap_Methods[] = {
- {"init", init , METH_VARARGS, "Initialize pwm"},
- {"setFrequency", setFrequency , METH_VARARGS, "Set frequency in Hz"},
- {"getFrequency", getFrequency , METH_VARARGS, "Get frequency in Hz"},
- {"setPeriod" , setPeriod , METH_VARARGS, "Set period in us"},
- {"getPeriod" , getPeriod , METH_VARARGS, "Get period in us"},
- {"setDuty" , setDuty , METH_VARARGS, "Set duty in 1/1000"},
- {"getDuty" , getDuty , METH_VARARGS, "Get duty in 1/1000"},
- {"activate" , activate , METH_VARARGS, "Activate or desactivate pwm"},
- {"getState" , getState , METH_VARARGS, "Get state of pwm (activated or not"},
- {"pwm_close" , pwm_close , METH_VARARGS, "Close pwm"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"init", init, METH_VARARGS, "Initialize pwm"},
+ {"setFrequency", setFrequency, METH_VARARGS, "Set frequency in Hz"},
+ {"getFrequency", getFrequency, METH_VARARGS, "Get frequency in Hz"},
+ {"setPeriod", setPeriod, METH_VARARGS, "Set period in us"},
+ {"getPeriod", getPeriod, METH_VARARGS, "Get period in us"},
+ {"setDuty", setDuty, METH_VARARGS, "Set duty in 1/1000"},
+ {"getDuty", getDuty, METH_VARARGS, "Get duty in 1/1000"},
+ {"activate", activate, METH_VARARGS, "Activate or desactivate pwm"},
+ {"getState", getState, METH_VARARGS,
+ "Get state of pwm (activated or not"},
+ {"pwm_close", pwm_close, METH_VARARGS, "Close pwm"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
-
-
diff --git a/target/packages/as_devices/python/src/AsAdc_wrap.c b/target/packages/as_devices/python/src/AsAdc_wrap.c
index 6179052..8c34c77 100644
--- a/target/packages/as_devices/python/src/AsAdc_wrap.c
+++ b/target/packages/as_devices/python/src/AsAdc_wrap.c
@@ -18,110 +18,98 @@
** License along with this library; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
#include "AsAdc_wrap.h"
#include "as_adc.h"
-
/* Methods definitions */
static PyMethodDef AsAdc_wrap_methods[] = {
- {"adc_open", adc_open, METH_VARARGS, "Initialize adc"},
- {"getValueInMillivolts", getValueInMillivolts, METH_VARARGS, "Get Channel value in millivolts"},
- {"adc_close", adc_close, METH_VARARGS, "Close adc"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"adc_open", adc_open, METH_VARARGS, "Initialize adc"},
+ {"getValueInMillivolts", getValueInMillivolts, METH_VARARGS,
+ "Get Channel value in millivolts"},
+ {"adc_close", adc_close, METH_VARARGS, "Close adc"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
/* Init module */
-void initAsAdc_wrap() /* called on first import */
-{ /* name matter if called dynamically */
- (void) Py_InitModule("AsAdc_wrap", AsAdc_wrap_methods); /* mod name, table ptr */
+void initAsAdc_wrap()
+{ /* called on first import *//* name matter if called dynamically */
+ (void)Py_InitModule("AsAdc_wrap", AsAdc_wrap_methods); /* mod name, table ptr */
}
/** @brief Initialize pin port access
* @return PyObject
*/
-static PyObject * adc_open(PyObject *self, PyObject *args)
+static PyObject *adc_open(PyObject * self, PyObject * args)
{
- /* parameters */
- char *aAdcType;
- int aDeviceNum;
- int aVref;
-
- struct as_adc_device *dev;
- PyObject *ret;
- char buff[300];
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "sii", &aAdcType, &aDeviceNum, &aVref))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- dev = as_adc_open(aAdcType, aDeviceNum, aVref);
- if (dev == NULL)
- {
- snprintf(buff, 300,
- "Initialization error for ADC type %s bus %d. Is kernel module loaded ?",
- aAdcType, aDeviceNum);
- PyErr_SetString(PyExc_IOError,buff);
- return NULL;
- }
-
- ret = Py_BuildValue("l", (long)dev);
-
- return ret;
+ /* parameters */
+ char *aAdcType;
+ int aDeviceNum;
+ int aVref;
+
+ struct as_adc_device *dev;
+ PyObject *ret;
+ char buff[300];
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "sii", &aAdcType, &aDeviceNum, &aVref)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ dev = as_adc_open(aAdcType, aDeviceNum, aVref);
+ if (dev == NULL) {
+ snprintf(buff, 300,
+ "Initialization error for ADC type %s bus %d. Is kernel module loaded ?",
+ aAdcType, aDeviceNum);
+ PyErr_SetString(PyExc_IOError, buff);
+ return NULL;
+ }
+
+ ret = Py_BuildValue("l", (long)dev);
+
+ return ret;
}
-static PyObject * getValueInMillivolts(PyObject *self, PyObject *args)
+static PyObject *getValueInMillivolts(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_adc_device *aFdev;
- int aChannel;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aChannel))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_adc_get_value_in_millivolts(aFdev, aChannel);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin direction");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_adc_device *aFdev;
+ int aChannel;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aChannel)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_adc_get_value_in_millivolts(aFdev, aChannel);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin direction");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * adc_close(PyObject *self, PyObject *args)
+static PyObject *adc_close(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_adc_device *aFdev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_adc_close(aFdev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't close port");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
-}
+ /* parameters */
+ struct as_adc_device *aFdev;
+
+ int ret;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ ret = as_adc_close(aFdev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't close port");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
+}
diff --git a/target/packages/as_devices/python/src/AsAdc_wrap.h b/target/packages/as_devices/python/src/AsAdc_wrap.h
index bae6011..2d0b9c9 100644
--- a/target/packages/as_devices/python/src/AsAdc_wrap.h
+++ b/target/packages/as_devices/python/src/AsAdc_wrap.h
@@ -33,6 +33,6 @@ void initAsAdc_wrap();
/*********************/
/* Functions wrapped */
/*********************/
-static PyObject * adc_open(PyObject *self, PyObject *args);
-static PyObject * getValueInMillivolts(PyObject *self, PyObject *args);
-static PyObject * adc_close(PyObject *self, PyObject *args);
+static PyObject *adc_open(PyObject * self, PyObject * args);
+static PyObject *getValueInMillivolts(PyObject * self, PyObject * args);
+static PyObject *adc_close(PyObject * self, PyObject * args);
diff --git a/target/packages/as_devices/python/src/AsDac_wrap.c b/target/packages/as_devices/python/src/AsDac_wrap.c
index 7f76582..ef5fcc5 100644
--- a/target/packages/as_devices/python/src/AsDac_wrap.c
+++ b/target/packages/as_devices/python/src/AsDac_wrap.c
@@ -18,112 +18,101 @@
** License along with this library; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
#include "AsDac_wrap.h"
#include "as_dac.h"
/* Methods definitions */
static PyMethodDef AsDac_wrap_methods[] = {
- {"dac_open", dac_open, METH_VARARGS, "Initialize dac"},
- {"dac_setValueInMillivolts", dac_setValueInMillivolts, METH_VARARGS, "Set Channel value in millivolts"},
- {"dac_close", dac_close, METH_VARARGS, "Close dac"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"dac_open", dac_open, METH_VARARGS, "Initialize dac"},
+ {"dac_setValueInMillivolts", dac_setValueInMillivolts, METH_VARARGS,
+ "Set Channel value in millivolts"},
+ {"dac_close", dac_close, METH_VARARGS, "Close dac"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
/* Init module */
-void initAsDac_wrap() /* called on first import */
-{ /* name matter if called dynamically */
- (void) Py_InitModule("AsDac_wrap", AsDac_wrap_methods); /* mod name, table ptr */
+void initAsDac_wrap()
+{ /* called on first import *//* name matter if called dynamically */
+ (void)Py_InitModule("AsDac_wrap", AsDac_wrap_methods); /* mod name, table ptr */
}
/** @brief Initialize pin port access
* @return PyObject
*/
-static PyObject * dac_open(PyObject *self, PyObject *args)
+static PyObject *dac_open(PyObject * self, PyObject * args)
{
- /* parameters */
- char *aDacType;
- int aBusNumber;
- int aAddress;
- int aVref;
-
- struct as_dac_device *dev;
- PyObject *ret;
- char buff[300];
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "siii", &aDacType,
- &aBusNumber, &aAddress, &aVref))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- dev = as_dac_open(aDacType, aBusNumber, aAddress, aVref);
- if (dev == NULL)
- {
- snprintf(buff, 300,
- "Initialization error for DAC type %s bus %d. Is kernel module loaded ?",
- aDacType, aBusNumber);
- PyErr_SetString(PyExc_IOError,buff);
- return NULL;
- }
-
- ret = Py_BuildValue("l", (long)dev);
-
- return ret;
+ /* parameters */
+ char *aDacType;
+ int aBusNumber;
+ int aAddress;
+ int aVref;
+
+ struct as_dac_device *dev;
+ PyObject *ret;
+ char buff[300];
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "siii", &aDacType,
+ &aBusNumber, &aAddress, &aVref)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ dev = as_dac_open(aDacType, aBusNumber, aAddress, aVref);
+ if (dev == NULL) {
+ snprintf(buff, 300,
+ "Initialization error for DAC type %s bus %d. Is kernel module loaded ?",
+ aDacType, aBusNumber);
+ PyErr_SetString(PyExc_IOError, buff);
+ return NULL;
+ }
+
+ ret = Py_BuildValue("l", (long)dev);
+
+ return ret;
}
-static PyObject * dac_setValueInMillivolts(PyObject *self, PyObject *args)
+static PyObject *dac_setValueInMillivolts(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_dac_device *aDev;
- int aChannel;
- int aValue;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aChannel, &aValue))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_dac_set_value_in_millivolts(aDev, aChannel, aValue);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin direction");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_dac_device *aDev;
+ int aChannel;
+ int aValue;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aChannel, &aValue)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_dac_set_value_in_millivolts(aDev, aChannel, aValue);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin direction");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * dac_close(PyObject *self, PyObject *args)
+static PyObject *dac_close(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_dac_device *aDev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aDev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_dac_close(aDev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't close port");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
-}
+ /* parameters */
+ struct as_dac_device *aDev;
+
+ int ret;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aDev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ ret = as_dac_close(aDev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't close port");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
+}
diff --git a/target/packages/as_devices/python/src/AsDac_wrap.h b/target/packages/as_devices/python/src/AsDac_wrap.h
index e51014a..1a795f5 100644
--- a/target/packages/as_devices/python/src/AsDac_wrap.h
+++ b/target/packages/as_devices/python/src/AsDac_wrap.h
@@ -33,6 +33,6 @@ void initAsDac_wrap();
/*********************/
/* Functions wrapped */
/*********************/
-static PyObject * dac_open(PyObject *self, PyObject *args);
-static PyObject * dac_setValueInMillivolts(PyObject *self, PyObject *args);
-static PyObject * dac_close(PyObject *self, PyObject *args);
+static PyObject *dac_open(PyObject * self, PyObject * args);
+static PyObject *dac_setValueInMillivolts(PyObject * self, PyObject * args);
+static PyObject *dac_close(PyObject * self, PyObject * args);
diff --git a/target/packages/as_devices/python/src/AsGpio_wrap.c b/target/packages/as_devices/python/src/AsGpio_wrap.c
index 29b0da7..5765bd1 100644
--- a/target/packages/as_devices/python/src/AsGpio_wrap.c
+++ b/target/packages/as_devices/python/src/AsGpio_wrap.c
@@ -22,64 +22,62 @@
** - Change name of function "blockingGetPinValue" to "WaitEvent" as named
** under C library
*/
+
#include "AsGpio_wrap.h"
#include "as_gpio.h"
-
/* Methods definitions */
static PyMethodDef AsGpio_wrap_methods[] = {
- {"gpio_open", gpio_open, METH_VARARGS, "Initialize gpio"},
- {"setPinDirection", setPinDirection, METH_VARARGS, "Set pin direction"},
- {"getPinDirection", getPinDirection, METH_VARARGS, "Get pin direction"},
- {"setPinValue", setPinValue, METH_VARARGS, "Set pin value"},
- {"getPinValue", getPinValue, METH_VARARGS, "Get pin value"},
- {"blockingGetPinValue", blockingGetPinValue, METH_VARARGS, "Blocking read pin value"},
- {"getIrqMode", getIrqMode, METH_VARARGS, "Get IRQ Mode"},
- {"setIrqMode", setIrqMode, METH_VARARGS, "Set IRQ Mode"},
- {"getPinNumber", getPinNumber, METH_VARARGS, "Get pin number"},
- {"gpio_close", gpio_close, METH_VARARGS, "Close gpio"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"gpio_open", gpio_open, METH_VARARGS, "Initialize gpio"},
+ {"setPinDirection", setPinDirection, METH_VARARGS, "Set pin direction"},
+ {"getPinDirection", getPinDirection, METH_VARARGS, "Get pin direction"},
+ {"setPinValue", setPinValue, METH_VARARGS, "Set pin value"},
+ {"getPinValue", getPinValue, METH_VARARGS, "Get pin value"},
+ {"blockingGetPinValue", blockingGetPinValue, METH_VARARGS,
+ "Blocking read pin value"},
+ {"getIrqMode", getIrqMode, METH_VARARGS, "Get IRQ Mode"},
+ {"setIrqMode", setIrqMode, METH_VARARGS, "Set IRQ Mode"},
+ {"getPinNumber", getPinNumber, METH_VARARGS, "Get pin number"},
+ {"gpio_close", gpio_close, METH_VARARGS, "Close gpio"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
/* Init module */
-void initAsGpio_wrap() /* called on first import */
-{ /* name matter if called dynamically */
- (void) Py_InitModule("AsGpio_wrap", AsGpio_wrap_methods); /* mod name, table ptr */
+void initAsGpio_wrap()
+{ /* called on first import *//* name matter if called dynamically */
+ (void)Py_InitModule("AsGpio_wrap", AsGpio_wrap_methods); /* mod name, table ptr */
}
/** @brief Initialize pin port access
* @param aGpioNum pin number on port
* @return PyObject
*/
-static PyObject * gpio_open(PyObject *self, PyObject *args)
+static PyObject *gpio_open(PyObject * self, PyObject * args)
{
- /* parameters */
- int aGpioNum;
-
- struct as_gpio_device *dev;
- PyObject *ret;
- char buff[300];
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aGpioNum))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- dev = as_gpio_open(aGpioNum);
- if (dev == NULL)
- {
- snprintf(buff, 300,
- "Initialization error %d. Is kernel module loaded ?",
- aGpioNum);
- PyErr_SetString(PyExc_IOError,buff);
- return NULL;
- }
-
- ret = Py_BuildValue("l", (long)dev);
-
- return ret;
+ /* parameters */
+ int aGpioNum;
+
+ struct as_gpio_device *dev;
+ PyObject *ret;
+ char buff[300];
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aGpioNum)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ dev = as_gpio_open(aGpioNum);
+ if (dev == NULL) {
+ snprintf(buff, 300,
+ "Initialization error %d. Is kernel module loaded ?",
+ aGpioNum);
+ PyErr_SetString(PyExc_IOError, buff);
+ return NULL;
+ }
+
+ ret = Py_BuildValue("l", (long)dev);
+
+ return ret;
}
/** @brief Set pin direction
@@ -89,59 +87,49 @@ static PyObject * gpio_open(PyObject *self, PyObject *args)
*
* @return error if negative value
*/
-static PyObject * setPinDirection(PyObject *self, PyObject *args)
+static PyObject *setPinDirection(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
- char* aDirection;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ls",
- (long *)&aFdev,
- &aDirection))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_set_pin_direction(aFdev, aDirection);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't set pin direction");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+ char *aDirection;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ls", (long *)&aFdev, &aDirection)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_set_pin_direction(aFdev, aDirection);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't set pin direction");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * getPinDirection(PyObject *self, PyObject *args)
+static PyObject *getPinDirection(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- const char* dir;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- dir = as_gpio_get_pin_direction(aFdev);
- if (strcmp(dir, "??"))
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin direction");
- return NULL;
- }
-
- return Py_BuildValue("s", dir);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ const char *dir;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ dir = as_gpio_get_pin_direction(aFdev);
+ if (strcmp(dir, "??")) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin direction");
+ return NULL;
+ }
+
+ return Py_BuildValue("s", dir);
}
/** @brief Set pin value
@@ -151,32 +139,27 @@ static PyObject * getPinDirection(PyObject *self, PyObject *args)
*
* @return error if negative
*/
-static PyObject * setPinValue(PyObject *self, PyObject *args)
+static PyObject *setPinValue(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
- int aValue;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aValue))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_set_pin_value(aFdev, aValue);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't set pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+ int aValue;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aValue)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_set_pin_value(aFdev, aValue);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't set pin value");
+ return NULL;
+ }
+ return Py_BuildValue("i", ret);
}
/** @brief Get pin value
@@ -186,30 +169,26 @@ static PyObject * setPinValue(PyObject *self, PyObject *args)
*
* @return pin value if positive or null, error if negative
*/
-static PyObject * getPinValue(PyObject *self, PyObject *args)
+static PyObject *getPinValue(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_get_pin_value(aFdev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_get_pin_value(aFdev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** @brief Get pin value, blocking until interrupt occur
@@ -220,40 +199,31 @@ static PyObject * getPinValue(PyObject *self, PyObject *args)
*
* @return pin value if positive or null, error if negative
*/
-static PyObject * blockingGetPinValue(PyObject *self, PyObject *args)
+static PyObject *blockingGetPinValue(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
- int aDelay_ms;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li",
- (long *)&aFdev,
- &aDelay_ms))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
-Py_BEGIN_ALLOW_THREADS
- ret = as_gpio_wait_event(aFdev, aDelay_ms);
-Py_END_ALLOW_THREADS
- if (ret == -ETIMEDOUT)
- {
- PyErr_SetString(PyExc_IOError, "TIMEOUT");
- return NULL;
- }
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+ int aDelay_ms;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aFdev, &aDelay_ms)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ Py_BEGIN_ALLOW_THREADS ret = as_gpio_wait_event(aFdev, aDelay_ms);
+ Py_END_ALLOW_THREADS if (ret == -ETIMEDOUT) {
+ PyErr_SetString(PyExc_IOError, "TIMEOUT");
+ return NULL;
+ }
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** @brief Set pin irq mode
@@ -263,31 +233,27 @@ Py_END_ALLOW_THREADS
*
* @return error if negative
*/
-static PyObject * setIrqMode(PyObject *self, PyObject *args)
+static PyObject *setIrqMode(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
- char *aMode;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ls", (long *)&aFdev, &aMode))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_set_irq_mode(aFdev, aMode);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+ char *aMode;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ls", (long *)&aFdev, &aMode)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_set_irq_mode(aFdev, aMode);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** @brief Get pin irq mode value
@@ -296,30 +262,26 @@ static PyObject * setIrqMode(PyObject *self, PyObject *args)
*
* @return pin mode ("falling"/"rising"/"both"/"none")
*/
-static PyObject * getIrqMode(PyObject *self, PyObject *args)
+static PyObject *getIrqMode(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- const char *mode;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- mode = as_gpio_get_irq_mode(aFdev);
- if (strcmp(mode, "??"))
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("s", mode);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ const char *mode;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ mode = as_gpio_get_irq_mode(aFdev);
+ if (strcmp(mode, "??")) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("s", mode);
}
/** @brief Get pin number value
@@ -328,30 +290,26 @@ static PyObject * getIrqMode(PyObject *self, PyObject *args)
*
* @return pin number, error if negative
*/
-static PyObject * getPinNumber(PyObject *self, PyObject *args)
+static PyObject *getPinNumber(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_get_pin_num(aFdev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get pin value");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_gpio_get_pin_num(aFdev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get pin value");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
/** @brief Close port access
@@ -360,30 +318,24 @@ static PyObject * getPinNumber(PyObject *self, PyObject *args)
*
* @return pin value if positive or null, error if negative
*/
-static PyObject * gpio_close(PyObject *self, PyObject *args)
+static PyObject *gpio_close(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_gpio_device *aFdev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aFdev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_gpio_close(aFdev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't close port");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
-}
+ /* parameters */
+ struct as_gpio_device *aFdev;
+
+ int ret;
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aFdev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ ret = as_gpio_close(aFdev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't close port");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
+}
diff --git a/target/packages/as_devices/python/src/AsGpio_wrap.h b/target/packages/as_devices/python/src/AsGpio_wrap.h
index df336b7..3919a87 100644
--- a/target/packages/as_devices/python/src/AsGpio_wrap.h
+++ b/target/packages/as_devices/python/src/AsGpio_wrap.h
@@ -33,17 +33,17 @@ void initAsGpio_wrap();
/*********************/
/* Functions wrapped */
/*********************/
-static PyObject * gpio_open(PyObject *self, PyObject *args);
+static PyObject *gpio_open(PyObject * self, PyObject * args);
-static PyObject * setPinDirection(PyObject *self, PyObject *args);
-static PyObject * getPinDirection(PyObject *self, PyObject *args);
-static PyObject * setPinValue(PyObject *self, PyObject *args);
-static PyObject * getPinValue(PyObject *self, PyObject *args);
+static PyObject *setPinDirection(PyObject * self, PyObject * args);
+static PyObject *getPinDirection(PyObject * self, PyObject * args);
+static PyObject *setPinValue(PyObject * self, PyObject * args);
+static PyObject *getPinValue(PyObject * self, PyObject * args);
-static PyObject * blockingGetPinValue(PyObject *self, PyObject *args);
-static PyObject * getIrqMode(PyObject *self, PyObject *args);
-static PyObject * setIrqMode(PyObject *self, PyObject *args);
-static PyObject * getPinNumber(PyObject *self, PyObject *args);
-static PyObject * getPortLetter(PyObject *self, PyObject *args);
+static PyObject *blockingGetPinValue(PyObject * self, PyObject * args);
+static PyObject *getIrqMode(PyObject * self, PyObject * args);
+static PyObject *setIrqMode(PyObject * self, PyObject * args);
+static PyObject *getPinNumber(PyObject * self, PyObject * args);
+static PyObject *getPortLetter(PyObject * self, PyObject * args);
-static PyObject * gpio_close(PyObject *self, PyObject *args);
+static PyObject *gpio_close(PyObject * self, PyObject * args);
diff --git a/target/packages/as_devices/python/src/AsI2c_wrap.c b/target/packages/as_devices/python/src/AsI2c_wrap.c
index c080d55..e93bf2f 100644
--- a/target/packages/as_devices/python/src/AsI2c_wrap.c
+++ b/target/packages/as_devices/python/src/AsI2c_wrap.c
@@ -21,6 +21,7 @@
* TODO:
* - Suppress MAX_DATA_SIZE macro
*/
+
#include "AsI2c_wrap.h"
#include "as_i2c.h"
@@ -28,334 +29,308 @@
/* Methods definitions */
static PyMethodDef AsI2c_wrap_methods[] = {
- {"i2c_open" , i2c_open , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_close" , i2c_close , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_set_slave_addr", i2c_set_slave_addr, METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_get_slave_addr", i2c_get_slave_addr, METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_read" , i2c_read , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_write" , i2c_write , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_read_reg" , i2c_read_reg , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_write_reg" , i2c_write_reg , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_read_reg_byte" , i2c_read_reg_byte , METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_write_reg_byte", i2c_write_reg_byte, METH_VARARGS, "as_i2c function wrapped"},
- {"i2c_read_msg" , i2c_read_msg , METH_VARARGS, "as_i2c function wrapped"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ {"i2c_open", i2c_open, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_close", i2c_close, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_set_slave_addr", i2c_set_slave_addr, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_get_slave_addr", i2c_get_slave_addr, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_read", i2c_read, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_write", i2c_write, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_read_reg", i2c_read_reg, METH_VARARGS, "as_i2c function wrapped"},
+ {"i2c_write_reg", i2c_write_reg, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_read_reg_byte", i2c_read_reg_byte, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_write_reg_byte", i2c_write_reg_byte, METH_VARARGS,
+ "as_i2c function wrapped"},
+ {"i2c_read_msg", i2c_read_msg, METH_VARARGS, "as_i2c function wrapped"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
-
/* Init module */
-void initAsI2c_wrap() /* called on first import */
-{ /* name matter if called dynamically */
- (void) Py_InitModule("AsI2c_wrap", AsI2c_wrap_methods); /* mod name, table ptr */
+void initAsI2c_wrap()
+{ /* called on first import *//* name matter if called dynamically */
+ (void)Py_InitModule("AsI2c_wrap", AsI2c_wrap_methods); /* mod name, table ptr */
}
-static PyObject * i2c_open(PyObject *self, PyObject *args)
+static PyObject *i2c_open(PyObject * self, PyObject * args)
{
- /* parameters */
- int aBusNumber;
-
- struct as_i2c_device *dev;
- PyObject *ret;
- char buff[300];
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "i", &aBusNumber))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- dev = as_i2c_open(aBusNumber);
- if (dev == NULL)
- {
- snprintf(buff, 300,
- "Initialization error for i2c bus %d.", aBusNumber);
- PyErr_SetString(PyExc_IOError,buff);
- return NULL;
- }
- ret = Py_BuildValue("l", (long)dev);
-
- return ret;
+ /* parameters */
+ int aBusNumber;
+
+ struct as_i2c_device *dev;
+ PyObject *ret;
+ char buff[300];
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "i", &aBusNumber)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ dev = as_i2c_open(aBusNumber);
+ if (dev == NULL) {
+ snprintf(buff, 300,
+ "Initialization error for i2c bus %d.", aBusNumber);
+ PyErr_SetString(PyExc_IOError, buff);
+ return NULL;
+ }
+ ret = Py_BuildValue("l", (long)dev);
+
+ return ret;
}
-static PyObject * i2c_close(PyObject *self, PyObject *args)
+static PyObject *i2c_close(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
-
- /* return value */
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aDev)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- ret = as_i2c_close(aDev);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError, "Can't close i2c");
- return Py_BuildValue("i", -1);
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+
+ /* return value */
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aDev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ ret = as_i2c_close(aDev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't close i2c");
+ return Py_BuildValue("i", -1);
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_set_slave_addr(PyObject *self, PyObject *args)
+static PyObject *i2c_set_slave_addr(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- int aSlaveAddr;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aSlaveAddr))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_set_slave_addr(aDev, aSlaveAddr);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't set slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ int aSlaveAddr;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aSlaveAddr)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_set_slave_addr(aDev, aSlaveAddr);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't set slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_get_slave_addr(PyObject *self, PyObject *args)
+static PyObject *i2c_get_slave_addr(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "l", (long *)&aDev))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_get_slave_addr(aDev);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "l", (long *)&aDev)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_get_slave_addr(aDev);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_read(PyObject *self, PyObject *args)
+static PyObject *i2c_read(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aData[MAX_DATA_SIZE];
- int aSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aSize))
- {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- if (aSize > MAX_DATA_SIZE) {
- PyErr_SetString(PyExc_IOError,
- "Size too high");
- return NULL;
- }
-
- ret = as_i2c_read(aDev, aData, aSize);
- if (ret < 0)
- {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("s#", (unsigned char *)aData, aSize);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aData[MAX_DATA_SIZE];
+ int aSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ if (aSize > MAX_DATA_SIZE) {
+ PyErr_SetString(PyExc_IOError, "Size too high");
+ return NULL;
+ }
+
+ ret = as_i2c_read(aDev, aData, aSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("s#", (unsigned char *)aData, aSize);
}
-static PyObject * i2c_write(PyObject *self, PyObject *args)
+static PyObject *i2c_write(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t *aData;
- int aSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ls#", (long *)&aDev, (unsigned char *)&aData, &aSize)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_write(aDev, aData, aSize);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t *aData;
+ int aSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple
+ (args, "ls#", (long *)&aDev, (unsigned char *)&aData, &aSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_write(aDev, aData, aSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_read_reg(PyObject *self, PyObject *args)
+static PyObject *i2c_read_reg(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aReg;
- uint8_t aData[MAX_DATA_SIZE];
- int aSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aReg, &aSize)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- if (aSize > MAX_DATA_SIZE) {
- PyErr_SetString(PyExc_IOError,
- "Size too high");
- return NULL;
- }
-
- ret = as_i2c_read_reg(aDev, aReg, aData, aSize);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("s#", (unsigned char *)aData, aSize);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aReg;
+ uint8_t aData[MAX_DATA_SIZE];
+ int aSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aReg, &aSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ if (aSize > MAX_DATA_SIZE) {
+ PyErr_SetString(PyExc_IOError, "Size too high");
+ return NULL;
+ }
+
+ ret = as_i2c_read_reg(aDev, aReg, aData, aSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("s#", (unsigned char *)aData, aSize);
}
-static PyObject * i2c_write_reg(PyObject *self, PyObject *args)
+static PyObject *i2c_write_reg(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aReg;
- uint8_t *aData;
- int aSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "lis#", (long *)&aDev, &aReg, (unsigned char *)&aData, &aSize)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_write_reg(aDev, aReg, aData, aSize);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aReg;
+ uint8_t *aData;
+ int aSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple
+ (args, "lis#", (long *)&aDev, &aReg, (unsigned char *)&aData,
+ &aSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_write_reg(aDev, aReg, aData, aSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_read_reg_byte(PyObject *self, PyObject *args)
+static PyObject *i2c_read_reg_byte(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aReg;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aReg)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_read_reg_byte(aDev, aReg);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aReg;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "li", (long *)&aDev, &aReg)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_read_reg_byte(aDev, aReg);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-static PyObject * i2c_read_msg(PyObject *self, PyObject *args)
+static PyObject *i2c_read_msg(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t *aWData;
- int aWriteSize;
- uint8_t RData[MAX_DATA_SIZE];
- int aReadSize;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "ls#i", (long *)&aDev,
- (unsigned char *)&aWData, &aWriteSize,
- &aReadSize)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
- if (aReadSize > MAX_DATA_SIZE) {
- PyErr_SetString(PyExc_IOError,
- "Read size too high");
- return NULL;
- }
-
- ret = as_i2c_read_msg(aDev, aWData, aWriteSize, RData, aReadSize);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't forge read message");
- return NULL;
- }
-
- return Py_BuildValue("s#", (unsigned char *)RData, aReadSize);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t *aWData;
+ int aWriteSize;
+ uint8_t RData[MAX_DATA_SIZE];
+ int aReadSize;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "ls#i", (long *)&aDev,
+ (unsigned char *)&aWData, &aWriteSize,
+ &aReadSize)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+ if (aReadSize > MAX_DATA_SIZE) {
+ PyErr_SetString(PyExc_IOError, "Read size too high");
+ return NULL;
+ }
+
+ ret = as_i2c_read_msg(aDev, aWData, aWriteSize, RData, aReadSize);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't forge read message");
+ return NULL;
+ }
+
+ return Py_BuildValue("s#", (unsigned char *)RData, aReadSize);
}
-
-static PyObject * i2c_write_reg_byte(PyObject *self, PyObject *args)
+static PyObject *i2c_write_reg_byte(PyObject * self, PyObject * args)
{
- /* parameters */
- struct as_i2c_device *aDev;
- uint8_t aReg;
- uint8_t aVal;
-
- int ret;
-
- /* Get arguments */
- if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aReg, &aVal)) {
- PyErr_SetString(PyExc_IOError,
- "Wrong parameters.");
- return NULL;
- }
-
- ret = as_i2c_write_reg_byte(aDev, aReg, aVal);
- if (ret < 0) {
- PyErr_SetString(PyExc_IOError,
- "Can't get slave address");
- return NULL;
- }
-
- return Py_BuildValue("i", ret);
+ /* parameters */
+ struct as_i2c_device *aDev;
+ uint8_t aReg;
+ uint8_t aVal;
+
+ int ret;
+
+ /* Get arguments */
+ if (!PyArg_ParseTuple(args, "lii", (long *)&aDev, &aReg, &aVal)) {
+ PyErr_SetString(PyExc_IOError, "Wrong parameters.");
+ return NULL;
+ }
+
+ ret = as_i2c_write_reg_byte(aDev, aReg, aVal);
+ if (ret < 0) {
+ PyErr_SetString(PyExc_IOError, "Can't get slave address");
+ return NULL;
+ }
+
+ return Py_BuildValue("i", ret);
}
-
diff --git a/target/packages/as_devices/python/src/AsI2c_wrap.h b/target/packages/as_devices/python/src/AsI2c_wrap.h
index 2920523..4d5dc02 100644
--- a/target/packages/as_devices/python/src/AsI2c_wrap.h
+++ b/target/packages/as_devices/python/src/AsI2c_wrap.h
@@ -33,19 +33,19 @@ void initAsI2c_wrap();
/*********************/
/* Functions wrapped */
/*********************/
-static PyObject * i2...
[truncated message content] |
