config/version: set OPENELEC_VERSION to 4.95.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>

config/options

@@ -24,6 +24,11 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # include versioning
   . config/version
 
+# read distro versioning if available
+ if [ -f "$PROJECT_DIR/version.$DISTRO" ]; then
+   . $PROJECT_DIR/version.$DISTRO
+ fi
+
 # read project options if available
  if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
    . $PROJECT_DIR/$PROJECT/options

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="4.95.1"
 
 # OS_VERSION: OS Version
   OS_VERSION="5.0"

packages/devel/libcec/package.mk

@@ -17,12 +17,20 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="2.2.0"
+case "$KODIPLAYER_DRIVER" in
+  libfslvpuwrap)
+    PKG_VERSION="2.1.4"
+    PKG_URL="http://packages.pulse-eight.net/pulse/sources/libcec/$PKG_NAME-$PKG_VERSION.tar.gz"
+    ;;
+  *)
+    PKG_VERSION="2.2.0"
+    PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-3.tar.gz"
+    ;;
+esac
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libcec.pulse-eight.com/"
-PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-3.tar.gz"
 PKG_DEPENDS_TARGET="toolchain systemd lockdev"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"

packages/linux/package.mk

@@ -19,7 +19,7 @@
 PKG_NAME="linux"
 case "$LINUX" in
   imx6)
-    PKG_VERSION="cuboxi-3.14-e85332f"
+    PKG_VERSION="cuboxi-3.14-dc5edb8"
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   *)

packages/mediacenter/OpenELEC-settings/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="OpenELEC-settings"
-PKG_VERSION="0.5.1"
+PKG_VERSION="0.5.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="prop."

packages/mediacenter/kodi-audioencoder-lame/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-audioencoder-lame"
-PKG_VERSION="90fb99b"
+PKG_VERSION="46592f8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-audioencoder-lame/patches/kodi-audioencoder-lame-xbmc-rebrand.patch

@@ -1,24 +0,0 @@
-diff -Naur xbmc-audioencoder-lame-736b5f4/CMakeLists.txt xbmc-audioencoder-lame-736b5f4.patch/CMakeLists.txt
---- xbmc-audioencoder-lame-736b5f4/CMakeLists.txt	2014-07-18 23:48:35.000000000 +0200
-+++ xbmc-audioencoder-lame-736b5f4.patch/CMakeLists.txt	2014-10-20 13:06:32.787416257 +0200
-@@ -6,7 +6,7 @@
- 
- enable_language(CXX)
- 
--find_package(xbmc REQUIRED)
-+find_package(kodi REQUIRED)
- find_package(Lame REQUIRED)
- if(WIN32)
-   find_package(MPGHIP REQUIRED)
-diff -Naur xbmc-audioencoder-lame-736b5f4/src/EncoderLame.cpp xbmc-audioencoder-lame-736b5f4.patch/src/EncoderLame.cpp
---- xbmc-audioencoder-lame-736b5f4/src/EncoderLame.cpp	2014-07-18 23:48:35.000000000 +0200
-+++ xbmc-audioencoder-lame-736b5f4.patch/src/EncoderLame.cpp	2014-10-20 02:51:53.710444163 +0200
-@@ -19,7 +19,7 @@
-  */
- 
- #include <lame/lame.h>
--#include "xbmc/xbmc_audioenc_dll.h"
-+#include "kodi/xbmc_audioenc_dll.h"
- #include <string.h>
- #include <stdlib.h>
- #include <algorithm>

packages/mediacenter/kodi-audioencoder-vorbis/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-audioencoder-vorbis"
-PKG_VERSION="a73ef7e"
+PKG_VERSION="f75f329"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-audioencoder-vorbis/patches/kodi-audioencoder-vorbis-xbmc-rebrand.patch

@@ -1,24 +0,0 @@
-diff -Naur xbmc-audioencoder-vorbis-143d10d/CMakeLists.txt xbmc-audioencoder-vorbis-143d10d.patch/CMakeLists.txt
---- xbmc-audioencoder-vorbis-143d10d/CMakeLists.txt	2014-07-18 23:48:45.000000000 +0200
-+++ xbmc-audioencoder-vorbis-143d10d.patch/CMakeLists.txt	2014-10-20 13:07:21.666556980 +0200
-@@ -6,7 +6,7 @@
- 
- enable_language(CXX)
- 
--find_package(xbmc REQUIRED)
-+find_package(kodi REQUIRED)
- find_package(Ogg REQUIRED)
- find_package(Vorbis REQUIRED)
- find_package(VorbisEnc REQUIRED)
-diff -Naur xbmc-audioencoder-vorbis-143d10d/src/EncoderVorbis.cpp xbmc-audioencoder-vorbis-143d10d.patch/src/EncoderVorbis.cpp
---- xbmc-audioencoder-vorbis-143d10d/src/EncoderVorbis.cpp	2014-07-18 23:48:45.000000000 +0200
-+++ xbmc-audioencoder-vorbis-143d10d.patch/src/EncoderVorbis.cpp	2014-10-20 02:54:04.983666757 +0200
-@@ -20,7 +20,7 @@
- 
- #include <ogg/ogg.h>
- #include <vorbis/vorbisenc.h>
--#include "xbmc/xbmc_audioenc_dll.h"
-+#include "kodi/xbmc_audioenc_dll.h"
- #include <string.h>
- #include <stdlib.h>
- #include <time.h>

packages/mediacenter/kodi-audioencoder-wav/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-audioencoder-wav"
-PKG_VERSION="b28ab95"
+PKG_VERSION="40aaedf"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi-audioencoder-wav/patches/kodi-audioencoder-wav-xbmc-rebrand.patch

@@ -1,24 +0,0 @@
-diff -Naur xbmc-audioencoder-wav-91a2b72/CMakeLists.txt xbmc-audioencoder-wav-91a2b72.patch/CMakeLists.txt
---- xbmc-audioencoder-wav-91a2b72/CMakeLists.txt	2014-07-18 23:48:40.000000000 +0200
-+++ xbmc-audioencoder-wav-91a2b72.patch/CMakeLists.txt	2014-10-20 13:08:19.017026869 +0200
-@@ -6,7 +6,7 @@
- 
- enable_language(CXX)
- 
--find_package(xbmc REQUIRED)
-+find_package(kodi REQUIRED)
- 
- include_directories(${XBMC_INCLUDE_DIR})
- 
-diff -Naur xbmc-audioencoder-wav-91a2b72/src/EncoderWav.cpp xbmc-audioencoder-wav-91a2b72.patch/src/EncoderWav.cpp
---- xbmc-audioencoder-wav-91a2b72/src/EncoderWav.cpp	2014-07-18 23:48:40.000000000 +0200
-+++ xbmc-audioencoder-wav-91a2b72.patch/src/EncoderWav.cpp	2014-10-20 02:55:43.985839271 +0200
-@@ -18,7 +18,7 @@
-  *
-  */
- 
--#include "xbmc/xbmc_audioenc_dll.h"
-+#include "kodi/xbmc_audioenc_dll.h"
- #include <stdio.h>
- #include <string.h>
- 

packages/mediacenter/kodi-theme-Confluence/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-theme-Confluence"
-PKG_VERSION="14-ba267af"
+PKG_VERSION="14-d6947be"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="14-ba267af"
+PKG_VERSION="14-d6947be"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/kodi/patches/kodi-001.01-xbmc-rebrand.patch

@@ -1,416 +0,0 @@
-diff -Naur xbmc-14-31ce987/configure.in xbmc-14-31ce987.patch/configure.in
---- xbmc-14-31ce987/configure.in	2014-10-20 02:31:03.259864060 +0200
-+++ xbmc-14-31ce987.patch/configure.in	2014-10-20 12:49:16.126851321 +0200
-@@ -2501,7 +2501,7 @@
-     xbmc/osx/Info.plist \
-     xbmc/osx/ios/XBMCIOS-Info.plist \
-     xbmc/osx/atv2/XBMCATV2-Info.plist \
--    project/cmake/xbmc-config.cmake \
-+    project/cmake/kodi-config.cmake \
-     tools/android/packaging/xbmc/AndroidManifest.xml \
-     tools/android/packaging/Makefile \
-     tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java \
-diff -Naur xbmc-14-31ce987/.gitignore xbmc-14-31ce987.patch/.gitignore
---- xbmc-14-31ce987/.gitignore	2014-10-20 02:31:03.272864215 +0200
-+++ xbmc-14-31ce987.patch/.gitignore	2014-10-20 12:49:03.991834753 +0200
-@@ -337,7 +337,7 @@
- /project/output
- 
- # /project/cmake
--/project/cmake/xbmc-config.cmake
-+/project/cmake/kodi-config.cmake
- /project/cmake/*.error
- /project/cmake/addons/build
- /project/cmake/addons/depends/build
-diff -Naur xbmc-14-31ce987/project/cmake/addons/CMakeLists.txt xbmc-14-31ce987.patch/project/cmake/addons/CMakeLists.txt
---- xbmc-14-31ce987/project/cmake/addons/CMakeLists.txt	2014-10-18 12:14:11.000000000 +0200
-+++ xbmc-14-31ce987.patch/project/cmake/addons/CMakeLists.txt	2014-10-20 12:47:44.298691059 +0200
-@@ -70,14 +70,14 @@
- endif()
- 
- if(NOT WIN32)
--  # copy the xbmc-prepare-env.cmake script to the depends path so that we can include it
--  file(COPY ${XBMCROOT}/project/cmake/scripts/common/xbmc-prepare-env.cmake DESTINATION ${DEPENDS_PATH}/lib/xbmc)
-+  # copy the kodi-prepare-env.cmake script to the depends path so that we can include it
-+  file(COPY ${XBMCROOT}/project/cmake/scripts/common/kodi-prepare-env.cmake DESTINATION ${DEPENDS_PATH}/lib/kodi)
- 
--  # add the location of xbmc-prepare-env.cmake to CMAKE_MODULE_PATH so that it is found
--  list(APPEND CMAKE_MODULE_PATH ${DEPENDS_PATH}/lib/xbmc)
-+  # add the location of kodi-prepare-env.cmake to CMAKE_MODULE_PATH so that it is found
-+  list(APPEND CMAKE_MODULE_PATH ${DEPENDS_PATH}/lib/kodi)
- 
--  # include xbmc-prepare-env.cmake which contains the logic to install the addon header bindings etc
--  include(xbmc-prepare-env)
-+  # include kodi-prepare-env.cmake which contains the logic to install the addon header bindings etc
-+  include(kodi-prepare-env)
- endif()
- 
- ### get and build all the binary addons
-diff -Naur xbmc-14-31ce987/project/cmake/addons/depends/windows/cmake/xbmc/CMakeLists.txt xbmc-14-31ce987.patch/project/cmake/addons/depends/windows/cmake/xbmc/CMakeLists.txt
---- xbmc-14-31ce987/project/cmake/addons/depends/windows/cmake/xbmc/CMakeLists.txt	2014-10-18 12:14:11.000000000 +0200
-+++ xbmc-14-31ce987.patch/project/cmake/addons/depends/windows/cmake/xbmc/CMakeLists.txt	2014-10-20 12:46:06.181514316 +0200
-@@ -21,11 +21,11 @@
- get_filename_component(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
- 
- ### prepare the environment
--# set the DEPENDS_PATH variable used by xbmc-prepare-env
-+# set the DEPENDS_PATH variable used by kodi-prepare-env
- set(DEPENDS_PATH "${CMAKE_INSTALL_PREFIX}")
- 
--# copy the xbmc-prepare-env.cmake script so that we can include it
--file(COPY ${XBMCROOT}/project/cmake/scripts/common/xbmc-prepare-env.cmake DESTINATION ${CMAKE_BINARY_DIR})
-+# copy the kodi-prepare-env.cmake script so that we can include it
-+file(COPY ${XBMCROOT}/project/cmake/scripts/common/kodi-prepare-env.cmake DESTINATION ${CMAKE_BINARY_DIR})
- 
--# include xbmc-prepare-env.cmake which contains the logic to install the addon header bindings etc
--include(xbmc-prepare-env)
-\ Kein Zeilenumbruch am Dateiende.
-+# include kodi-prepare-env.cmake which contains the logic to install the addon header bindings etc
-+include(kodi-prepare-env)
-\ Kein Zeilenumbruch am Dateiende.
-diff -Naur xbmc-14-31ce987/project/cmake/addons/README xbmc-14-31ce987.patch/project/cmake/addons/README
---- xbmc-14-31ce987/project/cmake/addons/README	2014-10-18 12:14:11.000000000 +0200
-+++ xbmc-14-31ce987.patch/project/cmake/addons/README	2014-10-20 12:44:44.880370598 +0200
-@@ -33,8 +33,8 @@
-   * XBMCROOT points to the root directory of the xbmc project (default is the
-     absolute representation of ../../.. starting from this directory).
-   * PACKAGE_ZIP=1 will mean the add-ons will be 'packaged' into a common folder,
--    rather than being placed in <CMAKE_INSTALL_PREFIX>/lib/xbmc/addons and
--    <CMAKE_INSTALL_PREFIX>/share/xbmc/addons.
-+    rather than being placed in <CMAKE_INSTALL_PREFIX>/lib/kodi/addons and
-+    <CMAKE_INSTALL_PREFIX>/share/kodi/addons.
-   * ARCH_DEFINES specifies the platform-specific C/C++ preprocessor defines
-     (defaults to empty).
- 
-diff -Naur xbmc-14-31ce987/project/cmake/kodi-config.cmake.in xbmc-14-31ce987.patch/project/cmake/kodi-config.cmake.in
---- xbmc-14-31ce987/project/cmake/kodi-config.cmake.in	1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-14-31ce987.patch/project/cmake/kodi-config.cmake.in	2014-10-20 13:11:45.147629367 +0200
-@@ -0,0 +1,8 @@
-+SET(XBMC_INCLUDE_DIR @prefix@/include)
-+SET(APP_NAME @APP_NAME@)
-+SET(APP_VERSION_MAJOR @APP_VERSION_MAJOR@)
-+SET(APP_VERSION_MINOR @APP_VERSION_MINOR@)
-+LIST(APPEND CMAKE_MODULE_PATH @prefix@/lib/kodi)
-+ADD_DEFINITIONS(@ARCH_DEFINES@)
-+
-+include(kodi-addon-helpers)
-diff -Naur xbmc-14-31ce987/project/cmake/scripts/common/kodi-addon-helpers.cmake xbmc-14-31ce987.patch/project/cmake/scripts/common/kodi-addon-helpers.cmake
---- xbmc-14-31ce987/project/cmake/scripts/common/kodi-addon-helpers.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-14-31ce987.patch/project/cmake/scripts/common/kodi-addon-helpers.cmake	2014-10-20 02:39:16.065509547 +0200
-@@ -0,0 +1,99 @@
-+# Workaround for the fact that cpack's filenames are not customizable.
-+# Each add-on is added as a separate component to facilitate zip/tgz packaging.
-+# The filenames are always of the form basename-component, which is 
-+# incompatible with the addonid-version scheme we want. This hack renames
-+# the files from the file names generated by the 'package' target.
-+# Sadly we cannot extend the 'package' target, as it is a builtin target, see 
-+# http://public.kitware.com/Bug/view.php?id=8438
-+# Thus, we have to add an 'addon-package' target.
-+add_custom_target(addon-package
-+                  COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
-+
-+macro(add_cpack_workaround target version ext)
-+  add_custom_command(TARGET addon-package PRE_BUILD
-+                     COMMAND ${CMAKE_COMMAND} -E rename addon-${target}-${version}.${ext} ${target}-${version}.${ext})
-+endmacro()
-+
-+# Grab the version from a given add-on's addon.xml
-+macro (addon_version dir prefix)
-+  FILE(READ ${dir}/addon.xml ADDONXML)
-+  STRING(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML}) 
-+  STRING(REGEX REPLACE ".*version=.([0-9\\.]+).*" "\\1" ${prefix}_VERSION ${VERSION_STRING})
-+  message(STATUS ${prefix}_VERSION=${${prefix}_VERSION})
-+endmacro()
-+
-+# Build, link and optionally package an add-on
-+macro (build_addon target prefix libs)
-+  ADD_LIBRARY(${target} ${${prefix}_SOURCES})
-+  TARGET_LINK_LIBRARIES(${target} ${${libs}})
-+  addon_version(${target} ${prefix})
-+  SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${${prefix}_VERSION}
-+                                             SOVERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}
-+                                             PREFIX "")
-+  IF(OS STREQUAL "android")
-+    SET_TARGET_PROPERTIES(${target} PROPERTIES PREFIX "lib")
-+  ENDIF(OS STREQUAL "android")
-+
-+  # set zip as default if addon-package is called without PACKAGE_XXX
-+  SET(CPACK_GENERATOR "ZIP")
-+  SET(ext "zip")
-+  IF(PACKAGE_ZIP OR PACKAGE_TGZ)
-+    IF(PACKAGE_TGZ)
-+      SET(CPACK_GENERATOR "TGZ")
-+      SET(ext "tar.gz")
-+    ENDIF(PACKAGE_TGZ)
-+    SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
-+    set(CPACK_PACKAGE_FILE_NAME addon)
-+    IF(CMAKE_BUILD_TYPE STREQUAL "Release")
-+      SET(CPACK_STRIP_FILES TRUE)
-+    ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
-+    set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
-+    set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
-+    list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION})
-+    # Pack files together to create an archive
-+    INSTALL(DIRECTORY ${target} DESTINATION ./ COMPONENT ${target}-${${prefix}_VERSION})
-+    IF(WIN32)
-+      INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/${target}.dll
-+              DESTINATION ${target}
-+              COMPONENT ${target}-${${prefix}_VERSION})
-+    ELSE(WIN32)
-+      INSTALL(TARGETS ${target} DESTINATION ${target}
-+              COMPONENT ${target}-${${prefix}_VERSION})
-+    ENDIF(WIN32)
-+    add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext})
-+  ELSE(PACKAGE_ZIP OR PACKAGE_TGZ)
-+    INSTALL(TARGETS ${target} DESTINATION lib/kodi/addons/${target})
-+    INSTALL(DIRECTORY ${target} DESTINATION share/kodi/addons)
-+  ENDIF(PACKAGE_ZIP OR PACKAGE_TGZ)
-+endmacro()
-+
-+# finds a path to a given file (recursive)
-+function (xbmc_find_path var_name filename search_path strip_file)
-+  file(GLOB_RECURSE PATH_TO_FILE ${search_path} ${filename})
-+  if(strip_file)
-+    string(REPLACE ${filename} "" PATH_TO_FILE ${PATH_TO_FILE})
-+  endif(strip_file)
-+  set (${var_name} ${PATH_TO_FILE} PARENT_SCOPE)
-+endfunction()
-+
-+# Cmake build options
-+include(addoptions)
-+include(TestCXXAcceptsFlag)
-+OPTION(PACKAGE_ZIP "Package Zip file?" OFF)
-+OPTION(PACKAGE_TGZ "Package TGZ file?" OFF)
-+OPTION(BUILD_SHARED_LIBS "Build shared libs?" ON)
-+
-+# LTO support?
-+CHECK_CXX_ACCEPTS_FLAG("-flto" HAVE_LTO)
-+IF(HAVE_LTO)
-+  OPTION(USE_LTO "use link time optimization" OFF)
-+  IF(USE_LTO)
-+    add_options(ALL_LANGUAGES ALL_BUILDS "-flto")
-+  ENDIF(USE_LTO)
-+ENDIF(HAVE_LTO) 
-+
-+# set this to try linking dependencies as static as possible
-+IF(ADDONS_PREFER_STATIC_LIBS)
-+  SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-+ENDIF(ADDONS_PREFER_STATIC_LIBS)
-+
-diff -Naur xbmc-14-31ce987/project/cmake/scripts/common/kodi-prepare-env.cmake xbmc-14-31ce987.patch/project/cmake/scripts/common/kodi-prepare-env.cmake
---- xbmc-14-31ce987/project/cmake/scripts/common/kodi-prepare-env.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ xbmc-14-31ce987.patch/project/cmake/scripts/common/kodi-prepare-env.cmake	2014-10-20 12:42:39.118143975 +0200
-@@ -0,0 +1,46 @@
-+# parse version.txt to get the version info
-+if(EXISTS "${XBMCROOT}/version.txt")
-+  file(STRINGS "${XBMCROOT}/version.txt" versions)
-+  foreach (version ${versions})
-+    string(REGEX MATCH "^[^ ]+" version_name ${version})
-+    string(REPLACE "${version_name} " "" version_value ${version})
-+    set(APP_${version_name} "${version_value}")
-+  endforeach()
-+endif()
-+
-+# bail if we can't parse versions
-+if(NOT DEFINED APP_VERSION_MAJOR OR NOT DEFINED APP_VERSION_MINOR)
-+  message(FATAL_ERROR "Could not determine app version! make sure that ${XBMCROOT}/version.txt exists")
-+endif()
-+
-+### copy all the addon binding header files to include/kodi
-+# make sure include/kodi exists and is empty
-+set(XBMC_LIB_DIR ${DEPENDS_PATH}/lib/kodi)
-+if(NOT EXISTS "${XBMC_LIB_DIR}/")
-+  file(MAKE_DIRECTORY ${XBMC_LIB_DIR})
-+endif()
-+
-+set(XBMC_INCLUDE_DIR ${DEPENDS_PATH}/include/kodi)
-+if(NOT EXISTS "${XBMC_INCLUDE_DIR}/")
-+  file(MAKE_DIRECTORY ${XBMC_INCLUDE_DIR})
-+endif()
-+
-+# kodi-config.cmake.in (further down) expects a "prefix" variable
-+get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE)
-+
-+# generate the proper kodi-config.cmake file
-+configure_file(${XBMCROOT}/project/cmake/kodi-config.cmake.in ${XBMC_LIB_DIR}/kodi-config.cmake @ONLY)
-+# copy cmake helpers to lib/kodi
-+file(COPY ${XBMCROOT}/project/cmake/scripts/common/kodi-addon-helpers.cmake ${XBMCROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${XBMC_LIB_DIR})
-+
-+### copy all the addon binding header files to include/kodi
-+# parse addon-bindings.mk to get the list of header files to copy
-+file(STRINGS ${XBMCROOT}/xbmc/addons/addon-bindings.mk bindings)
-+string(REPLACE "\n" ";" bindings "${bindings}")
-+foreach(binding ${bindings})
-+  string(REPLACE " =" ";" binding "${binding}")
-+  string(REPLACE "+=" ";" binding "${binding}")
-+  list(GET binding 1 header)
-+  # copy the header file to include/kodi
-+  file(COPY ${XBMCROOT}/${header} DESTINATION ${XBMC_INCLUDE_DIR})
-+endforeach()
-\ Kein Zeilenumbruch am Dateiende.
-diff -Naur xbmc-14-31ce987/project/cmake/scripts/common/xbmc-addon-helpers.cmake xbmc-14-31ce987.patch/project/cmake/scripts/common/xbmc-addon-helpers.cmake
---- xbmc-14-31ce987/project/cmake/scripts/common/xbmc-addon-helpers.cmake	2014-10-18 12:14:11.000000000 +0200
-+++ xbmc-14-31ce987.patch/project/cmake/scripts/common/xbmc-addon-helpers.cmake	1970-01-01 01:00:00.000000000 +0100
-@@ -1,99 +0,0 @@
--# Workaround for the fact that cpack's filenames are not customizable.
--# Each add-on is added as a separate component to facilitate zip/tgz packaging.
--# The filenames are always of the form basename-component, which is 
--# incompatible with the addonid-version scheme we want. This hack renames
--# the files from the file names generated by the 'package' target.
--# Sadly we cannot extend the 'package' target, as it is a builtin target, see 
--# http://public.kitware.com/Bug/view.php?id=8438
--# Thus, we have to add an 'addon-package' target.
--add_custom_target(addon-package
--                  COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package)
--
--macro(add_cpack_workaround target version ext)
--  add_custom_command(TARGET addon-package PRE_BUILD
--                     COMMAND ${CMAKE_COMMAND} -E rename addon-${target}-${version}.${ext} ${target}-${version}.${ext})
--endmacro()
--
--# Grab the version from a given add-on's addon.xml
--macro (addon_version dir prefix)
--  FILE(READ ${dir}/addon.xml ADDONXML)
--  STRING(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" VERSION_STRING ${ADDONXML}) 
--  STRING(REGEX REPLACE ".*version=.([0-9\\.]+).*" "\\1" ${prefix}_VERSION ${VERSION_STRING})
--  message(STATUS ${prefix}_VERSION=${${prefix}_VERSION})
--endmacro()
--
--# Build, link and optionally package an add-on
--macro (build_addon target prefix libs)
--  ADD_LIBRARY(${target} ${${prefix}_SOURCES})
--  TARGET_LINK_LIBRARIES(${target} ${${libs}})
--  addon_version(${target} ${prefix})
--  SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${${prefix}_VERSION}
--                                             SOVERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}
--                                             PREFIX "")
--  IF(OS STREQUAL "android")
--    SET_TARGET_PROPERTIES(${target} PROPERTIES PREFIX "lib")
--  ENDIF(OS STREQUAL "android")
--
--  # set zip as default if addon-package is called without PACKAGE_XXX
--  SET(CPACK_GENERATOR "ZIP")
--  SET(ext "zip")
--  IF(PACKAGE_ZIP OR PACKAGE_TGZ)
--    IF(PACKAGE_TGZ)
--      SET(CPACK_GENERATOR "TGZ")
--      SET(ext "tar.gz")
--    ENDIF(PACKAGE_TGZ)
--    SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)
--    set(CPACK_PACKAGE_FILE_NAME addon)
--    IF(CMAKE_BUILD_TYPE STREQUAL "Release")
--      SET(CPACK_STRIP_FILES TRUE)
--    ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
--    set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
--    set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
--    list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION})
--    # Pack files together to create an archive
--    INSTALL(DIRECTORY ${target} DESTINATION ./ COMPONENT ${target}-${${prefix}_VERSION})
--    IF(WIN32)
--      INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/${target}.dll
--              DESTINATION ${target}
--              COMPONENT ${target}-${${prefix}_VERSION})
--    ELSE(WIN32)
--      INSTALL(TARGETS ${target} DESTINATION ${target}
--              COMPONENT ${target}-${${prefix}_VERSION})
--    ENDIF(WIN32)
--    add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext})
--  ELSE(PACKAGE_ZIP OR PACKAGE_TGZ)
--    INSTALL(TARGETS ${target} DESTINATION lib/xbmc/addons/${target})
--    INSTALL(DIRECTORY ${target} DESTINATION share/xbmc/addons)
--  ENDIF(PACKAGE_ZIP OR PACKAGE_TGZ)
--endmacro()
--
--# finds a path to a given file (recursive)
--function (xbmc_find_path var_name filename search_path strip_file)
--  file(GLOB_RECURSE PATH_TO_FILE ${search_path} ${filename})
--  if(strip_file)
--    string(REPLACE ${filename} "" PATH_TO_FILE ${PATH_TO_FILE})
--  endif(strip_file)
--  set (${var_name} ${PATH_TO_FILE} PARENT_SCOPE)
--endfunction()
--
--# Cmake build options
--include(addoptions)
--include(TestCXXAcceptsFlag)
--OPTION(PACKAGE_ZIP "Package Zip file?" OFF)
--OPTION(PACKAGE_TGZ "Package TGZ file?" OFF)
--OPTION(BUILD_SHARED_LIBS "Build shared libs?" ON)
--
--# LTO support?
--CHECK_CXX_ACCEPTS_FLAG("-flto" HAVE_LTO)
--IF(HAVE_LTO)
--  OPTION(USE_LTO "use link time optimization" OFF)
--  IF(USE_LTO)
--    add_options(ALL_LANGUAGES ALL_BUILDS "-flto")
--  ENDIF(USE_LTO)
--ENDIF(HAVE_LTO) 
--
--# set this to try linking dependencies as static as possible
--IF(ADDONS_PREFER_STATIC_LIBS)
--  SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
--ENDIF(ADDONS_PREFER_STATIC_LIBS)
--
-diff -Naur xbmc-14-31ce987/project/cmake/scripts/common/xbmc-prepare-env.cmake xbmc-14-31ce987.patch/project/cmake/scripts/common/xbmc-prepare-env.cmake
---- xbmc-14-31ce987/project/cmake/scripts/common/xbmc-prepare-env.cmake	2014-10-18 12:14:11.000000000 +0200
-+++ xbmc-14-31ce987.patch/project/cmake/scripts/common/xbmc-prepare-env.cmake	1970-01-01 01:00:00.000000000 +0100
-@@ -1,46 +0,0 @@
--# parse version.txt to get the version info
--if(EXISTS "${XBMCROOT}/version.txt")
--  file(STRINGS "${XBMCROOT}/version.txt" versions)
--  foreach (version ${versions})
--    string(REGEX MATCH "^[^ ]+" version_name ${version})
--    string(REPLACE "${version_name} " "" version_value ${version})
--    set(APP_${version_name} "${version_value}")
--  endforeach()
--endif()
--
--# bail if we can't parse versions
--if(NOT DEFINED APP_VERSION_MAJOR OR NOT DEFINED APP_VERSION_MINOR)
--  message(FATAL_ERROR "Could not determine app version! make sure that ${XBMCROOT}/version.txt exists")
--endif()
--
--### copy all the addon binding header files to include/xbmc
--# make sure include/xbmc exists and is empty
--set(XBMC_LIB_DIR ${DEPENDS_PATH}/lib/xbmc)
--if(NOT EXISTS "${XBMC_LIB_DIR}/")
--  file(MAKE_DIRECTORY ${XBMC_LIB_DIR})
--endif()
--
--set(XBMC_INCLUDE_DIR ${DEPENDS_PATH}/include/xbmc)
--if(NOT EXISTS "${XBMC_INCLUDE_DIR}/")
--  file(MAKE_DIRECTORY ${XBMC_INCLUDE_DIR})
--endif()
--
--# xbmc-config.cmake.in (further down) expects a "prefix" variable
--get_filename_component(prefix "${DEPENDS_PATH}" ABSOLUTE)
--
--# generate the proper xbmc-config.cmake file
--configure_file(${XBMCROOT}/project/cmake/xbmc-config.cmake.in ${XBMC_LIB_DIR}/xbmc-config.cmake @ONLY)
--# copy cmake helpers to lib/xbmc
--file(COPY ${XBMCROOT}/project/cmake/scripts/common/xbmc-addon-helpers.cmake ${XBMCROOT}/project/cmake/scripts/common/addoptions.cmake DESTINATION ${XBMC_LIB_DIR})
--
--### copy all the addon binding header files to include/xbmc
--# parse addon-bindings.mk to get the list of header files to copy
--file(STRINGS ${XBMCROOT}/xbmc/addons/addon-bindings.mk bindings)
--string(REPLACE "\n" ";" bindings "${bindings}")
--foreach(binding ${bindings})
--  string(REPLACE " =" ";" binding "${binding}")
--  string(REPLACE "+=" ";" binding "${binding}")
--  list(GET binding 1 header)
--  # copy the header file to include/xbmc
--  file(COPY ${XBMCROOT}/${header} DESTINATION ${XBMC_INCLUDE_DIR})
--endforeach()
-\ Kein Zeilenumbruch am Dateiende.
-diff -Naur xbmc-14-31ce987/project/cmake/xbmc-config.cmake.in xbmc-14-31ce987.patch/project/cmake/xbmc-config.cmake.in
---- xbmc-14-31ce987/project/cmake/xbmc-config.cmake.in	2014-10-18 12:14:11.000000000 +0200
-+++ xbmc-14-31ce987.patch/project/cmake/xbmc-config.cmake.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,8 +0,0 @@
--SET(XBMC_INCLUDE_DIR @prefix@/include)
--SET(APP_NAME @APP_NAME@)
--SET(APP_VERSION_MAJOR @APP_VERSION_MAJOR@)
--SET(APP_VERSION_MINOR @APP_VERSION_MINOR@)
--LIST(APPEND CMAKE_MODULE_PATH @prefix@/lib/xbmc)
--ADD_DEFINITIONS(@ARCH_DEFINES@)
--
--include(xbmc-addon-helpers)

packages/mediacenter/kodi/patches/kodi-995.03-ALSA-Fix_DeviceChange_event_triggered_by_enumeration-0.1.patch

@@ -0,0 +1,43 @@
+From 65342cfaebe4fcbea2e44bb61791b82197772ca1 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi@xbmc.org>
+Date: Tue, 4 Nov 2014 19:22:03 +0200
+Subject: [PATCH] [AE] ALSA: Fix DeviceChange event triggered by enumeration
+
+All hctl elements get an SND_CTL_EVENT_MASK_REMOVE event when the ctl
+file descriptor is closed, which is done e.g. when re-enumerating
+devices.
+
+(SND_CTL_EVENT_MASK_REMOVE & SND_CTL_EVENT_MASK_VALUE) is true, and
+therefore we re-triggered enumeration (depending a bit on timing).
+
+Fix that by checking for the special _REMOVE value first and ignoring
+those events.
+---
+diff -Naur kodi-14-d6947be/xbmc/cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.cpp kodi-14-d6947be.patch/xbmc/cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.cpp
+--- kodi-14-d6947be/xbmc/cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.cpp	2014-11-05 09:22:22.494136199 +0100
++++ kodi-14-d6947be.patch/xbmc/cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.cpp	2014-11-05 09:25:41.754440039 +0100
+@@ -114,12 +114,20 @@
+ 
+ int CALSAHControlMonitor::HCTLCallback(snd_hctl_elem_t *elem, unsigned int mask)
+ {
+-  /*
+-   * Currently we just re-enumerate on any change.
+-   * Custom callbacks for handling other control monitoring may be implemented when needed.
+-   */
++  /* _REMOVE is a special value instead of a bit and must be checked first */
++  if (mask == SND_CTL_EVENT_MASK_REMOVE)
++  {
++    /* Either the device was removed (which is handled in ALSADeviceMonitor instead)
++     * or snd_hctl_close() got called. */
++    return 0;
++  }
++
+   if (mask & SND_CTL_EVENT_MASK_VALUE)
+   {
++    /*
++     * Currently we just re-enumerate on any change.
++     * Custom callbacks for handling other control monitoring may be implemented when needed.
++     */
+     CAEFactory::DeviceChange();
+   }
+ 

packages/mediacenter/kodi/patches/kodi-999.91-PR5610.patch

@@ -1,334 +0,0 @@
-From 4037c9fd07fbec1873549e71e0b1c2833a5a87db Mon Sep 17 00:00:00 2001
-From: Lars Op den Kamp <lars@opdenkamp.eu>
-Date: Mon, 27 Oct 2014 14:42:30 +0100
-Subject: [PATCH 1/8] [CEC] fixed: don't try to stick a value > 255 in a byte
-
----
- system/peripherals.xml                            | 2 +-
- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/system/peripherals.xml b/system/peripherals.xml
-index 57af5d1..5fcff7c 100644
---- a/system/peripherals.xml
-+++ b/system/peripherals.xml
-@@ -30,7 +30,7 @@
-     <setting key="device_type" type="int" value="1" configurable="0" />
-     <setting key="wake_devices_advanced" type="string" value="" configurable="0" />
-     <setting key="standby_devices_advanced" type="string" value="" configurable="0" />
--    <setting key="double_tap_timeout_ms" type="int" min="0" value="2000" configurable="0" />
-+    <setting key="double_tap_timeout_ms" type="int" min="0" value="300" configurable="0" />
-   </peripheral>
- 
-   <peripheral vendor_product="2548:1001,2548:1002" bus="usb" name="Pulse-Eight CEC Adapter" mapTo="cec">
-diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
-index 9907ba2..1d068dc 100644
---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
-+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
-@@ -1347,8 +1347,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
-   m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0;
-   m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0;
- 
--  // double tap prevention timeout in ms
--  m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
-+  // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50
-+  m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50;
- }
- 
- void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses)
-
-From c82453eaf7af90d1c0a8846776d77fb62bd14246 Mon Sep 17 00:00:00 2001
-From: Lars Op den Kamp <lars@opdenkamp.eu>
-Date: Mon, 27 Oct 2014 12:29:09 +0100
-Subject: [PATCH 2/8] [CEC] bump libCEC to 2.2.0
-
----
- project/BuildDependencies/scripts/libcec_d.txt | 2 +-
- tools/depends/target/libcec/Makefile           | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt
-index a126c74..3d0265e 100644
---- a/project/BuildDependencies/scripts/libcec_d.txt
-+++ b/project/BuildDependencies/scripts/libcec_d.txt
-@@ -1,3 +1,3 @@
- ; filename                        source of the file
- 
--libcec-2.1.4.zip                  http://mirrors.xbmc.org/build-deps/win32/
-+libcec-2.2.0-win32.zip            http://mirrors.xbmc.org/build-deps/win32/
-diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile
-index 16fec1b..0f54921 100644
---- a/tools/depends/target/libcec/Makefile
-+++ b/tools/depends/target/libcec/Makefile
-@@ -3,9 +3,9 @@ DEPS= ../../Makefile.include Makefile
- 
- # lib name, version
- LIBNAME=libcec
--VERSION=2.1.4
--SOURCE=$(LIBNAME)-$(VERSION)-2
--ARCHIVE=$(SOURCE).tar.gz
-+VERSION=2.2.0
-+SOURCE=$(LIBNAME)-$(VERSION)
-+ARCHIVE=$(SOURCE)-2.tar.gz
- 
- # configuration settings
- CONFIGURE=./configure --prefix=$(PREFIX) --disable-rpi \
-
-From b5f567522961409e70eceba9629f7906069b1e0f Mon Sep 17 00:00:00 2001
-From: Lars Op den Kamp <lars@opdenkamp.eu>
-Date: Mon, 27 Oct 2014 15:32:36 +0100
-Subject: [PATCH 3/8] [CEC] prevent bus rescan on a Pi, since the adapter
- cannot be removed
-
----
- xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
-index b02535a..4941ae6 100644
---- a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
-+++ b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp
-@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceScan(PeripheralScanResults &results)
-       break;
-     case ADAPTERTYPE_RPI:
-       result.m_mappedBusType = PERIPHERAL_BUS_RPI;
-+      /** the Pi's adapter cannot be removed, no need to rescan */
-+      m_bNeedsPolling = false;
-       break;
-     default:
-       break;
-
-From 9b573e0fdb666339beb1f4cc6104c8c0d0f93829 Mon Sep 17 00:00:00 2001
-From: Lars Op den Kamp <lars@opdenkamp.eu>
-Date: Mon, 27 Oct 2014 21:01:00 +0100
-Subject: [PATCH 4/8] [CEC] fixed: don't return garbage from CEC related app
- messenger methods see
- https://github.com/xbmc/xbmc/commit/19d37944ca2a2ac2f3e71a40a94e9ea289d8f2db#commitcomment-8248480
-
----
- xbmc/Application.cpp          | 14 ++++++++------
- xbmc/ApplicationMessenger.cpp | 20 +++++---------------
- xbmc/ApplicationMessenger.h   |  4 ++--
- 3 files changed, 15 insertions(+), 23 deletions(-)
-
-diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
-index d5604dc..4d26183 100644
---- a/xbmc/Application.cpp
-+++ b/xbmc/Application.cpp
-@@ -2366,16 +2366,18 @@ bool CApplication::OnKey(const CKey& key)
- 
-   if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState") || StringUtils::StartsWithNoCase(action.GetName(),"CECStandby"))
-   {
--    bool ret = true;
--
--    CLog::LogF(LOGDEBUG, "action %s [%d], toggling state of playing device", action.GetName().c_str(), action.GetID());
-     // do not wake up the screensaver right after switching off the playing device
-     if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState"))
--      ret = CApplicationMessenger::Get().CECToggleState();
-+    {
-+      CLog::LogF(LOGDEBUG, "action %s [%d], toggling state of playing device", action.GetName().c_str(), action.GetID());
-+      if (!CApplicationMessenger::Get().CECToggleState())
-+        return true;
-+    }
-     else
--      ret = CApplicationMessenger::Get().CECStandby();
--    if (!ret) /* display is switched off */
-+    {
-+      CApplicationMessenger::Get().CECStandby();
-       return true;
-+    }
-   }
- 
-   ResetScreenSaver();
-diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp
-index 1a59c5c..d228273 100644
---- a/xbmc/ApplicationMessenger.cpp
-+++ b/xbmc/ApplicationMessenger.cpp
-@@ -843,12 +843,12 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg)
-     }
-     case TMSG_CECACTIVATESOURCE:
-     {
--      *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE);
-+      g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE);
-       break;
-     }
-     case TMSG_CECSTANDBY:
-     {
--      *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_STANDBY);
-+      g_peripherals.ToggleDeviceState(STATE_STANDBY);
-       break;
-     }
-     case TMSG_START_ANDROID_ACTIVITY:
-@@ -1396,29 +1396,19 @@ bool CApplicationMessenger::CECToggleState()
- 
-   ThreadMessage tMsg = {TMSG_CECTOGGLESTATE};
-   tMsg.lpVoid = (void*)&result;
--  SendMessage(tMsg, false);
-+  SendMessage(tMsg, true);
- 
-   return result;
- }
- 
--bool CApplicationMessenger::CECActivateSource()
-+void CApplicationMessenger::CECActivateSource()
- {
--  bool result;
--
-   ThreadMessage tMsg = {TMSG_CECACTIVATESOURCE};
--  tMsg.lpVoid = (void*)&result;
-   SendMessage(tMsg, false);
--
--  return result;
- }
- 
--bool CApplicationMessenger::CECStandby()
-+void CApplicationMessenger::CECStandby()
- {
--  bool result;
--
-   ThreadMessage tMsg = {TMSG_CECSTANDBY};
--  tMsg.lpVoid = (void*)&result;
-   SendMessage(tMsg, false);
--
--  return result;
- }
-diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h
-index 9013567..543e065 100644
---- a/xbmc/ApplicationMessenger.h
-+++ b/xbmc/ApplicationMessenger.h
-@@ -219,8 +219,8 @@ class CApplicationMessenger
- 
-   void LoadProfile(unsigned int idx);
-   bool CECToggleState();
--  bool CECActivateSource();
--  bool CECStandby();
-+  void CECActivateSource();
-+  void CECStandby();
- 
-   CStdString GetResponse();
-   int SetResponse(CStdString response);
-
-From 3e0a6a3d083fbc3773517b6d8846a5bd86e03004 Mon Sep 17 00:00:00 2001
-From: Lars Op den Kamp <lars@opdenkamp.eu>
-Date: Tue, 28 Oct 2014 14:52:16 +0100
-Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC
- for clarity. does not change binary compatibility
-
----
- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
-index 1d068dc..ad123d9 100644
---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
-+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
-@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
-   m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0;
-   m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0;
- 
-+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD)
-   // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50
--  m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50;
-+  m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50;
-+#else
-+  // backwards compatibility. will be removed once the next major release of libCEC is out
-+  m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
-+#endif
- }
- 
- void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses)
-
-From 3d6cc38152adbd67cb2ef633e0e5a6f098ec619c Mon Sep 17 00:00:00 2001
-From: Lars Op den Kamp <lars@opdenkamp.eu>
-Date: Tue, 28 Oct 2014 16:08:00 +0100
-Subject: [PATCH 6/8] [CEC] fixed - don't use CEC_CLIENT_VERSION_CURRENT for
- the client version, because it will lead to issues when XBMC is rebuilt after
- a libCEC bump that changes something
-
----
- xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
-index ad123d9..015daef 100644
---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
-+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
-@@ -1268,8 +1268,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu
- 
- void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
- {
--  // use the same client version as libCEC version
--  m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT;
-+  // client version matches the version of libCEC that we originally used the API from
-+  m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0;
- 
-   // device name 'XBMC'
-   snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());
-
-From da8c086eb4f644c5c607d7a721511230e9a078c0 Mon Sep 17 00:00:00 2001
-From: Lars Op den Kamp <lars@opdenkamp.eu>
-Date: Fri, 31 Oct 2014 12:08:03 +0100
-Subject: [PATCH 7/8] [CEC] use device name 'Kodi' instead of 'XBMC'
-
----
- system/peripherals.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/system/peripherals.xml b/system/peripherals.xml
-index 5fcff7c..a67dc2f 100644
---- a/system/peripherals.xml
-+++ b/system/peripherals.xml
-@@ -26,7 +26,7 @@
-     <setting key="port" type="string" value="" label="36022" order="15" />
- 
-     <setting key="tv_vendor" type="int" value="0" configurable="0" />
--    <setting key="device_name" type="string" value="XBMC" configurable="0" />
-+    <setting key="device_name" type="string" value="Kodi" configurable="0" />
-     <setting key="device_type" type="int" value="1" configurable="0" />
-     <setting key="wake_devices_advanced" type="string" value="" configurable="0" />
-     <setting key="standby_devices_advanced" type="string" value="" configurable="0" />
-
-From b38a4e4aeebe43d76045fb376f2f9dcb18c4f78f Mon Sep 17 00:00:00 2001
-From: Karlson2k <k2k@narod.ru>
-Date: Fri, 31 Oct 2014 13:54:00 +0300
-Subject: [PATCH 8/8] [cec] [win32] Use new package format
-
----
- project/BuildDependencies/scripts/0_package.list |  1 +
- project/BuildDependencies/scripts/libcec_d.bat   | 15 ---------------
- 2 files changed, 1 insertion(+), 15 deletions(-)
- delete mode 100644 project/BuildDependencies/scripts/libcec_d.bat
-
-diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list
-index 8127b15..e2a4a1f 100644
---- a/project/BuildDependencies/scripts/0_package.list
-+++ b/project/BuildDependencies/scripts/0_package.list
-@@ -12,6 +12,7 @@ gnutls-3.2.3-win32.zip
- jsonschemabuilder-1.0.0-win32-3.7z
- libass-0.10.2-win32.7z
- libbluray-0.4.0-win32.zip
-+libcec-2.2.0-win32-1.7z
- libiconv-1.14-win32-vc120.7z
- libjpeg-turbo-1.2.0-win32.7z
- libnfs-1.6.2-win32.7z
-diff --git a/project/BuildDependencies/scripts/libcec_d.bat b/project/BuildDependencies/scripts/libcec_d.bat
-deleted file mode 100644
-index b5104c3..0000000
---- a/project/BuildDependencies/scripts/libcec_d.bat
-+++ /dev/null
-@@ -1,15 +0,0 @@
--@ECHO OFF
--
--SET LOC_PATH=%CD%
--SET FILES=%LOC_PATH%\libcec_d.txt
--
--CALL dlextract.bat libcec %FILES%
--
--cd %TMP_PATH%
--
--mkdir "%CUR_PATH%\include\libcec"
--xcopy libcec\include\* "%CUR_PATH%\include\libcec\." /E /Q /I /Y
--
--copy libcec\libcec.dll "%APP_PATH%\system\."
--
--cd %LOC_PATH%

packages/multimedia/vdr/patches/vdr-02_disable_eitscan.patch

@@ -1,12 +0,0 @@
-diff -Nru vdr-1.7.15-vanilla/eitscan.c vdr-1.7.15-disable_eitscan/eitscan.c
---- vdr-1.7.15-vanilla/eitscan.c	2010-06-06 19:11:14.000000000 +0300
-+++ vdr-1.7.15-disable_eitscan/eitscan.c	2010-06-06 20:44:07.000000000 +0300
-@@ -146,7 +146,7 @@
-                if (Device) {
-                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
-                       const cChannel *Channel = ScanData->GetChannel();
--                      if (Channel) {
-+                      if (Channel && !cSource::IsType(Channel->Source(), 'I')) {
-                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
-                             if (Device->ProvidesTransponder(Channel)) {
-                                if (!Device->Receiving()) {

packages/network/libssh/package.mk

@@ -16,20 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-
-# TODO: update to libssh-0.6.3 fails in xbmc with
-#   ld.gold: error: libsmbclient.a: multiple definition of 'string_free'
-#   ld.gold: libssh.a: previous definition here
-
 PKG_NAME="libssh"
-PKG_VERSION="0.5.5"
+PKG_VERSION="0.6.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.libssh.org/"
-# PKG_URL="http://www.libssh.org/files/0.5/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://red.libssh.org/attachments/download/87/$PKG_NAME-$PKG_VERSION.tar.xz"
-# PKG_URL="https://red.libssh.org/attachments/download/51/$PKG_NAME-$PKG_VERSION.tar.gz" # actually down
-PKG_URL="http://pkgs.fedoraproject.org/repo/pkgs/libssh/$PKG_NAME-$PKG_VERSION.tar.gz/bb308196756c7255c0969583d917136b/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain zlib libressl"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"

packages/network/samba/patches/samba-501-rename_string_free.patch

@@ -0,0 +1,123 @@
+diff -urN a/source3/include/proto.h b/source3/include/proto.h
+--- a/source3/include/proto.h	2014-06-23 08:03:27.000000000 +0200
++++ b/source3/include/proto.h	2014-11-01 13:02:42.918300338 +0100
+@@ -947,7 +947,7 @@
+ 		size_t maxlength);
+ char *StrnCpy_fn(const char *fn, int line,char *dest,const char *src,size_t n);
+ bool in_list(const char *s, const char *list, bool casesensitive);
+-void string_free(char **s);
++void smb_string_free(char **s);
+ bool string_set(char **dest,const char *src);
+ void string_sub2(char *s,const char *pattern, const char *insert, size_t len,
+ 		 bool remove_unsafe_characters, bool replace_once,
+diff -urN a/source3/lib/util_str.c b/source3/lib/util_str.c
+--- a/source3/lib/util_str.c	2014-06-23 08:03:27.000000000 +0200
++++ b/source3/lib/util_str.c	2014-11-01 13:03:11.113658974 +0100
+@@ -764,7 +764,7 @@
+  Free a string value.
+ **/
+ 
+-void string_free(char **s)
++void smb_string_free(char **s)
+ {
+ 	if (!s || !(*s))
+ 		return;
+@@ -780,7 +780,7 @@
+ 
+ bool string_set(char **dest,const char *src)
+ {
+-	string_free(dest);
++	smb_string_free(dest);
+ 	return(string_init(dest,src));
+ }
+ 
+diff -urN a/source3/param/loadparm.c b/source3/param/loadparm.c
+--- a/source3/param/loadparm.c	2014-06-23 08:03:27.000000000 +0200
++++ b/source3/param/loadparm.c	2014-11-01 13:03:03.872057887 +0100
+@@ -4998,7 +4998,7 @@
+ 	if ((parm.type == P_STRING) ||
+ 	    (parm.type == P_USTRING))
+ 	{
+-		string_free((char**)parm_ptr);
++		smb_string_free((char**)parm_ptr);
+ 	} else if (parm.type == P_LIST) {
+ 		TALLOC_FREE(*((char***)parm_ptr));
+ 	}
+@@ -5160,7 +5160,7 @@
+ 	if (!done_init) {
+ 		/* The logfile can be set before this is invoked. Free it if so. */
+ 		if (Globals.szLogFile != NULL) {
+-			string_free(&Globals.szLogFile);
++			smb_string_free(&Globals.szLogFile);
+ 			Globals.szLogFile = NULL;
+ 		}
+ 		done_init = True;
+@@ -6108,7 +6108,7 @@
+ 
+ 	while (data) {
+ 		if (strwicmp(data->key, param_key) == 0) {
+-			string_free(&param_key);
++			smb_string_free(&param_key);
+ 			return data;
+ 		}
+ 		data = data->next;
+@@ -6120,14 +6120,14 @@
+ 		data = Globals.param_opt;
+ 		while (data) {
+ 		        if (strwicmp(data->key, param_key) == 0) {
+-			        string_free(&param_key);
++			        smb_string_free(&param_key);
+ 				return data;
+ 			}
+ 			data = data->next;
+ 		}
+ 	}
+ 
+-	string_free(&param_key);
++	smb_string_free(&param_key);
+ 
+ 	return NULL;
+ }
+@@ -6350,8 +6350,8 @@
+ 	}
+ 	opt = *popts;
+ 	while (opt != NULL) {
+-		string_free(&opt->key);
+-		string_free(&opt->value);
++		smb_string_free(&opt->key);
++		smb_string_free(&opt->value);
+ 		TALLOC_FREE(opt->list);
+ 		next_opt = opt->next;
+ 		SAFE_FREE(opt);
+@@ -6375,7 +6375,7 @@
+ 
+ 	free_parameters(pservice);
+ 
+-	string_free(&pservice->szService);
++	smb_string_free(&pservice->szService);
+ 	TALLOC_FREE(pservice->copymap);
+ 
+ 	free_param_opts(&pservice->param_opt);
+@@ -7085,7 +7085,7 @@
+ 				   overridden */
+ 				return;
+ 			}
+-			string_free(&opt->value);
++			smb_string_free(&opt->value);
+ 			TALLOC_FREE(opt->list);
+ 			opt->value = SMB_STRDUP(opt_value);
+ 			opt->flags = flags;
+diff -urN a/source3/smbd/conn.c b/source3/smbd/conn.c
+--- a/source3/smbd/conn.c	2014-06-23 08:03:27.000000000 +0200
++++ b/source3/smbd/conn.c	2014-11-01 13:02:49.008926676 +0100
+@@ -412,8 +412,8 @@
+ 	free_namearray(conn->veto_oplock_list);
+ 	free_namearray(conn->aio_write_behind_list);
+ 
+-	string_free(&conn->connectpath);
+-	string_free(&conn->origpath);
++	smb_string_free(&conn->connectpath);
++	smb_string_free(&conn->origpath);
+ 
+ 	ZERO_STRUCTP(conn);
+ 	talloc_destroy(conn);

packages/tools/plymouth-lite/package.mk

@@ -53,6 +53,9 @@ makeinstall_init() {
     elif [ -f $PROJECT_DIR/$PROJECT/splash/splash-1024.png \
            -o -f $PROJECT_DIR/$PROJECT/splash/splash-full.png ]; then
       cp $PROJECT_DIR/$PROJECT/splash/splash-*.png $INSTALL/splash
+    elif [ -f $PKG_DIR/splash.$DISTRO/splash-1024.png \
+           -o -f $PKG_DIR/splash.$DISTRO/splash-full.png ]; then
+      cp $PKG_DIR/splash.$DISTRO/splash-*.png $INSTALL/splash
     else
       cp $PKG_DIR/splash/splash-*.png $INSTALL/splash
     fi

packages/x11/driver/xf86-video-intel/package.mk

@@ -49,7 +49,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-backlight \
                            --enable-glamor \
                            --disable-xaa \
                            --disable-dga \
-                           --enable-tear-free \
+                           --disable-tear-free \
                            --disable-rendernode \
                            --disable-create2 \
                            --disable-rotation \

packages/x11/other/fluxbox/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://fluxbox.org/"
 PKG_URL="http://sourceforge.net/projects/fluxbox/files/fluxbox/${PKG_VERSION}/$PKG_NAME-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libX11"
+PKG_DEPENDS_TARGET="toolchain libX11 libXrandr libXext libXrender"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/other"
 PKG_SHORTDESC="Fluxbox is a windowmanager for X that was based on the Blackbox 0.61.1 code"
@@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
-                           ac_cv_func_malloc_0_nonnull=yes
+                           ac_cv_func_malloc_0_nonnull=yes \
                            --disable-toolbar \
                            --disable-slit \
                            --disable-systray \

projects/Generic/linux/linux.i386.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.17.1 Kernel Configuration
+# Linux/i386 3.17.2 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -374,7 +374,7 @@ CONFIG_CPU_SUP_UMC_32=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
-CONFIG_NR_CPUS=16
+CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_PREEMPT_NONE is not set
@@ -444,7 +444,8 @@ CONFIG_CLEANCACHE=y
 # CONFIG_ZSMALLOC is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_HIGHPTE is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
@@ -2701,7 +2702,6 @@ CONFIG_DVB_CXD2820R=m
 CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_SI2168=m
-CONFIG_DVB_SP2=m
 
 #
 # DVB-C (cable) frontends
@@ -2750,6 +2750,7 @@ CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+CONFIG_DVB_SP2=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m

projects/Generic/linux/linux.x86_64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.17.1 Kernel Configuration
+# Linux/x86_64 3.17.2 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -441,7 +441,8 @@ CONFIG_CLEANCACHE=y
 # CONFIG_ZBUD is not set
 # CONFIG_ZSMALLOC is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW=64
 CONFIG_MTRR=y
 CONFIG_MTRR_SANITIZER=y
@@ -2679,7 +2680,6 @@ CONFIG_DVB_CXD2820R=m
 CONFIG_DVB_RTL2830=m
 CONFIG_DVB_RTL2832=m
 CONFIG_DVB_SI2168=m
-CONFIG_DVB_SP2=m
 
 #
 # DVB-C (cable) frontends
@@ -2728,6 +2728,7 @@ CONFIG_DVB_ISL6405=m
 CONFIG_DVB_ISL6421=m
 CONFIG_DVB_ISL6423=m
 CONFIG_DVB_A8293=m
+CONFIG_DVB_SP2=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_TDA665x=m

projects/RPi/patches/kodi/kodi-001-newclock4.patch

@@ -3702,34 +3702,6 @@ index f139433..4183a2b 100644
    {
       // If dvd is an mpeg2 and hint.stills
 
-From 50e4589c1be698538bb96904709b3ed7f5781c2f Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 5 Feb 2014 11:46:33 +0000
-Subject: [PATCH 28/95] [rbp/settings] Allow av sync type to be enabled
-
-It works for dvdplayer
----
- system/settings/rbp.xml | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
-index 5985517..f572eed 100644
---- a/system/settings/rbp.xml
-+++ b/system/settings/rbp.xml
-@@ -1,13 +1,6 @@
- <?xml version="1.0" encoding="utf-8" ?>
- <settings>
-   <section id="videos">
--    <category id="videoplayer">
--      <group id="2">
--        <setting id="videoplayer.synctype">
--          <visible>false</visible>
--        </setting>
--      </group>
--    </category>
-     <category id="videoacceleration">
-       <group id="1">
-         <visible>false</visible>
 
 From 17c0d521016319411e73ee63397b28dea205f7aa Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
@@ -7712,29 +7684,6 @@ index 5ceec72..20fbdef 100644
        OpenStream(m_CurrentVideo, m_CurrentVideo.id, m_CurrentVideo.source);
        if (m_State.canseek)
 
-From 41525fca8fa9fdaaebd9bd6995fa368810e1b5f0 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Sun, 26 Oct 2014 16:20:35 +0000
-Subject: [PATCH 82/95] [omxplayer] Request 3 render buffers
-
-This avoids stuttering when using subtitle and avoids a warning of too few render buffers
----
- xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-index 5c4a515..783ac20 100644
---- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
-@@ -786,7 +786,7 @@ void OMXPlayerVideo::ResolutionUpdateCallBack(uint32_t width, uint32_t height, f
- 
-   if(!g_renderManager.Configure(width, height,
-         iDisplayWidth, iDisplayHeight, m_fFrameRate, flags, format, 0,
--        m_hints.orientation, 0))
-+        m_hints.orientation, 3))
-   {
-     CLog::Log(LOGERROR, "%s - failed to configure renderer", __FUNCTION__);
-     return;
 
 From aa3b9a73c1684d5806106c2e5167c1e30d1b23b1 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>

projects/imx6/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.14.18 Kernel Configuration
+# Linux/arm 3.14.20 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_MIGHT_HAVE_PCI=y
@@ -523,7 +523,7 @@ CONFIG_ATAGS=y
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
 # CONFIG_ARM_APPENDED_DTB is not set
-CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init consoleblank=0 gpumem=64M fbmem=10M noram"
+CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init noram"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 CONFIG_CMDLINE_EXTEND=y
 # CONFIG_CMDLINE_FORCE is not set
@@ -3170,6 +3170,7 @@ CONFIG_DVB_AS102=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_IGORPLUGUSB=m
 # CONFIG_LIRC_IMON is not set
+CONFIG_LIRC_GPIO=m
 # CONFIG_LIRC_SASEM is not set
 # CONFIG_LIRC_SERIAL is not set
 # CONFIG_LIRC_SIR is not set

projects/imx6/patches/kodi/kodi-999.01-enable-libcec-2.1-support.patch

@@ -0,0 +1,12 @@
+diff -Naur kodi-14-d6947be/xbmc/peripherals/devices/PeripheralCecAdapter.cpp kodi-14-d6947be.patch/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+--- kodi-14-d6947be/xbmc/peripherals/devices/PeripheralCecAdapter.cpp	2014-11-03 19:59:12.000000000 +0100
++++ kodi-14-d6947be.patch/xbmc/peripherals/devices/PeripheralCecAdapter.cpp	2014-11-04 11:47:00.790424301 +0100
+@@ -1269,7 +1269,7 @@
+ void CPeripheralCecAdapter::SetConfigurationFromSettings(void)
+ {
+   // client version matches the version of libCEC that we originally used the API from
+-  m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0;
++  m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT;
+ 
+   // device name 'XBMC'
+   snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str());

projects/imx6/patches/libcec/libcec-mk01-libCEC-fixes.patch

@@ -0,0 +1,37 @@
+From 2a579cc8641a4cf2aba9c03274de68064508ff06 Mon Sep 17 00:00:00 2001
+From: Matus Kral <matuskral@me.com>
+Date: Sun, 25 May 2014 07:03:32 +0200
+Subject: [PATCH] this solves problem with device dissapearing from TV's menu
+ when source is changed to another device.
+
+(needs fix on adapter side to correctly mark devices with
+"ishandledbycec").
+---
+ src/lib/implementations/CECCommandHandler.cpp | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/implementations/CECCommandHandler.cpp b/src/lib/implementations/CECCommandHandler.cpp
+index 29d1ffb..a89ebe6 100644
+--- a/src/lib/implementations/CECCommandHandler.cpp
++++ b/src/lib/implementations/CECCommandHandler.cpp
+@@ -592,12 +592,15 @@ int CCECCommandHandler::HandleSetStreamPath(const cec_command &command)
+     CCECBusDevice *device = GetDeviceByPhysicalAddress(iStreamAddress);
+     if (device)
+     {
+-      if (device->IsHandledByLibCEC() && !device->IsActiveSource())
+-        device->ActivateSource();
+-      else
++      if (device->IsHandledByLibCEC())
+       {
+-        device->MarkAsActiveSource();
+-        device->TransmitActiveSource(true);
++        if (!device->IsActiveSource())
++          device->ActivateSource();
++        else
++        {
++          device->MarkAsActiveSource();
++          device->TransmitActiveSource(true);
++        }
+       }
+       return COMMAND_HANDLED;
+     }

projects/imx6/patches/linux/linux-007-config_cmdline.patch

@@ -0,0 +1,26 @@
+diff -urN a/drivers/of/fdt.c b/drivers/of/fdt.c
+--- a/drivers/of/fdt.c	2014-09-25 08:33:34.727318450 +0200
++++ b/drivers/of/fdt.c	2014-09-25 08:46:52.192711249 +0200
+@@ -822,12 +822,21 @@
+ 	 * CONFIG_CMDLINE is meant to be a default in case nothing else
+ 	 * managed to set the command line, unless CONFIG_CMDLINE_FORCE
+ 	 * is set in which case we override whatever was found earlier.
++	 *
++	 * But we do append CONFIG_CMDLINE to bootloader arguments.
+ 	 */
+ #ifdef CONFIG_CMDLINE
+ #ifndef CONFIG_CMDLINE_FORCE
+ 	if (!((char *)data)[0])
+-#endif
+ 		strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
++	else {
++		/* append CONFIG_CMDLINE to bootloader arguments */
++		strlcat(data, " ", COMMAND_LINE_SIZE);	
++		strlcat(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);		
++	}
++#else
++	strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
++#endif /* CONFIG_CMDLINE_FORCE */
+ #endif /* CONFIG_CMDLINE */
+ 
+ 	pr_debug("Command line is: %s\n", (char*)data);

projects/imx6/patches/linux/linux-300-tbs2910_device_tree_from_imx6q-sabresd.patch

@@ -0,0 +1,850 @@
+From 260d0a77f9848d2495c3f5031f734dbedac244c6 Mon Sep 17 00:00:00 2001
+From: vpeter4 <peter.vicman@gmail.com>
+Date: Sun, 5 Oct 2014 14:22:53 +0200
+Subject: [PATCH] tbs2910_device_tree_from_imx6q-sabresd
+
+copied from imx6q-sabresd.dts and imx6qdl-sabresd.dtsi
+---
+ arch/arm/boot/dts/Makefile             |   1 +
+ arch/arm/boot/dts/imx6q-tbs2910.dts    |  41 ++
+ arch/arm/boot/dts/imx6qdl-tbs2910.dtsi | 768 +++++++++++++++++++++++++++++++++
+ 3 files changed, 810 insertions(+)
+ create mode 100644 arch/arm/boot/dts/imx6q-tbs2910.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-tbs2910.dtsi
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index f363929..49004c4 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -185,6 +185,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
+ 	imx6q-sabrelite.dtb \
+ 	imx6q-sabresd.dtb \
+ 	imx6q-sabresd-hdcp.dtb \
++	imx6q-tbs2910.dtb \
+ 	imx6q-sbc6x.dtb \
+ 	imx6q-udoo.dtb \
+ 	imx6q-wandboard.dtb \
+diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
+new file mode 100644
+index 0000000..0374484
+--- /dev/null
++++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
+@@ -0,0 +1,41 @@
++/*
++ * Copyright 2012 Freescale Semiconductor, Inc.
++ * Copyright 2011 Linaro Ltd.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++
++#include "imx6q.dtsi"
++#include "imx6qdl-tbs2910.dtsi"
++
++/ {
++	model = "TBS Matrix";
++	compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
++};
++
++&sata {
++	status = "okay";
++};
++
++&mxcfb1 {
++	status = "okay";
++};
++
++&mxcfb2 {
++	status = "okay";
++};
++
++&mxcfb3 {
++	status = "okay";
++};
++
++&mxcfb4 {
++	status = "okay";
++};
+diff --git a/arch/arm/boot/dts/imx6qdl-tbs2910.dtsi b/arch/arm/boot/dts/imx6qdl-tbs2910.dtsi
+new file mode 100644
+index 0000000..f351c21
+--- /dev/null
++++ b/arch/arm/boot/dts/imx6qdl-tbs2910.dtsi
+@@ -0,0 +1,768 @@
++/*
++ * Copyright 2012 Freescale Semiconductor, Inc.
++ * Copyright 2011 Linaro Ltd.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++
++/ {
++	aliases {
++		mxcfb0 = &mxcfb1;
++		mxcfb1 = &mxcfb2;
++		mxcfb2 = &mxcfb3;
++		mxcfb3 = &mxcfb4;
++	};
++
++	chosen {
++		stdout-path = &uart1;
++	};
++
++	memory {
++		reg = <0x10000000 0x40000000>;
++	};
++
++	regulators {
++		compatible = "simple-bus";
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		reg_usb_otg_vbus: regulator@0 {
++			compatible = "regulator-fixed";
++			reg = <0>;
++			regulator-name = "usb_otg_vbus";
++			regulator-min-microvolt = <5000000>;
++			regulator-max-microvolt = <5000000>;
++			gpio = <&gpio3 22 0>;
++			enable-active-high;
++		};
++
++		reg_usb_h1_vbus: regulator@1 {
++			compatible = "regulator-fixed";
++			reg = <1>;
++			regulator-name = "usb_h1_vbus";
++			regulator-min-microvolt = <5000000>;
++			regulator-max-microvolt = <5000000>;
++			gpio = <&gpio1 29 0>;
++			enable-active-high;
++		};
++
++		reg_audio: regulator@2 {
++			compatible = "regulator-fixed";
++			reg = <2>;
++			regulator-name = "wm8962-supply";
++			gpio = <&gpio4 10 0>;
++			enable-active-high;
++		};
++
++		reg_mipi_dsi_pwr_on: mipi_dsi_pwr_on {
++			compatible = "regulator-fixed";
++			regulator-name = "mipi_dsi_pwr_on";
++			gpio = <&gpio6 14 0>;
++			enable-active-high;
++		};
++	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++		pinctrl-names = "default";
++		pinctrl-0 = <&pinctrl_gpio_keys>;
++
++		power {
++			label = "Power Button";
++			gpios = <&gpio3 29 GPIO_ACTIVE_LOW>;
++			gpio-key,wakeup;
++			linux,code = <KEY_POWER>;
++		};
++
++		volume-up {
++			label = "Volume Up";
++			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
++			gpio-key,wakeup;
++			linux,code = <KEY_VOLUMEUP>;
++		};
++
++		volume-down {
++			label = "Volume Down";
++			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
++			gpio-key,wakeup;
++			linux,code = <KEY_VOLUMEDOWN>;
++		};
++	};
++
++	sound {
++		compatible = "fsl,imx6q-sabresd-wm8962",
++			   "fsl,imx-audio-wm8962";
++		model = "wm8962-audio";
++		ssi-controller = <&ssi2>;
++		audio-codec = <&codec>;
++		audio-routing =
++			"Headphone Jack", "HPOUTL",
++			"Headphone Jack", "HPOUTR",
++			"Ext Spk", "SPKOUTL",
++			"Ext Spk", "SPKOUTR",
++			"MICBIAS", "AMIC",
++			"IN3R", "MICBIAS",
++			"DMIC", "MICBIAS",
++			"DMICDAT", "DMIC";
++		mux-int-port = <2>;
++		mux-ext-port = <3>;
++	};
++
++	backlight {
++		compatible = "pwm-backlight";
++		pwms = <&pwm1 0 5000000>;
++		brightness-levels = <0 4 8 16 32 64 128 255>;
++		default-brightness-level = <7>;
++		status = "okay";
++	};
++
++	leds {
++		compatible = "gpio-leds";
++		pinctrl-names = "default";
++		pinctrl-0 = <&pinctrl_gpio_leds>;
++
++		red {
++		        gpios = <&gpio1 2 0>;
++		        default-state = "on";
++		};
++	};
++
++	sound-hdmi {
++		compatible = "fsl,imx6q-audio-hdmi",
++			     "fsl,imx-audio-hdmi";
++		model = "imx-audio-hdmi";
++		hdmi-controller = <&hdmi_audio>;
++	};
++
++	mxcfb1: fb@0 {
++		compatible = "fsl,mxc_sdc_fb";
++		disp_dev = "ldb";
++		interface_pix_fmt = "RGB666";
++		mode_str ="LDB-XGA";
++		default_bpp = <16>;
++		int_clk = <0>;
++		late_init = <0>;
++		status = "disabled";
++	};
++
++	mxcfb2: fb@1 {
++		compatible = "fsl,mxc_sdc_fb";
++		disp_dev = "hdmi";
++		interface_pix_fmt = "RGB24";
++		mode_str ="1920x1080M@60";
++		default_bpp = <24>;
++		int_clk = <0>;
++		late_init = <0>;
++		status = "disabled";
++	};
++
++	mxcfb3: fb@2 {
++		compatible = "fsl,mxc_sdc_fb";
++		disp_dev = "lcd";
++		interface_pix_fmt = "RGB565";
++		mode_str ="CLAA-WVGA";
++		default_bpp = <16>;
++		int_clk = <0>;
++		late_init = <0>;
++		status = "disabled";
++	};
++
++	mxcfb4: fb@3 {
++		compatible = "fsl,mxc_sdc_fb";
++		disp_dev = "ldb";
++		interface_pix_fmt = "RGB666";
++		mode_str ="LDB-XGA";
++		default_bpp = <16>;
++		int_clk = <0>;
++		late_init = <0>;
++		status = "disabled";
++	};
++
++	lcd@0 {
++		compatible = "fsl,lcd";
++		ipu_id = <0>;
++		disp_id = <0>;
++		default_ifmt = "RGB565";
++		pinctrl-names = "default";
++		pinctrl-0 = <&pinctrl_ipu1>;
++		status = "okay";
++	};
++
++	backlight {
++		compatible = "pwm-backlight";
++		pwms = <&pwm1 0 5000000>;
++		brightness-levels = <0 4 8 16 32 64 128 255>;
++		default-brightness-level = <7>;
++	};
++
++	v4l2_out {
++		compatible = "fsl,mxc_v4l2_output";
++		status = "okay";
++	};
++
++	lvds_cabc_ctrl {
++		lvds0-gpios = <&gpio6 15 0>;
++		lvds1-gpios = <&gpio6 16 0>;
++	};
++
++	mipi_dsi_reset: mipi-dsi-reset {
++		compatible = "gpio-reset";
++		reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
++		reset-delay-us = <50>;
++		#reset-cells = <0>;
++	};
++};
++
++&audmux {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_audmux>;
++	status = "okay";
++};
++
++&ecspi1 {
++	fsl,spi-num-chipselects = <1>;
++	cs-gpios = <&gpio4 9 0>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_ecspi1>;
++	status = "okay";
++
++	flash: m25p80@0 {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		compatible = "st,m25p32";
++		spi-max-frequency = <20000000>;
++		reg = <0>;
++	};
++};
++
++&fec {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_enet>;
++	phy-mode = "rgmii";
++	phy-reset-gpios = <&gpio1 25 0>;
++	status = "okay";
++};
++
++&i2c1 {
++	clock-frequency = <100000>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_i2c1>;
++	status = "okay";
++
++	codec: wm8962@1a {
++		compatible = "wlf,wm8962";
++		reg = <0x1a>;
++		clocks = <&clks 201>;
++		DCVDD-supply = <&reg_audio>;
++		DBVDD-supply = <&reg_audio>;
++		AVDD-supply = <&reg_audio>;
++		CPVDD-supply = <&reg_audio>;
++		MICVDD-supply = <&reg_audio>;
++		PLLVDD-supply = <&reg_audio>;
++		SPKVDD1-supply = <&reg_audio>;
++		SPKVDD2-supply = <&reg_audio>;
++		gpio-cfg = <
++			0x0000 /* 0:Default */
++			0x0000 /* 1:Default */
++			0x0013 /* 2:FN_DMICCLK */
++			0x0000 /* 3:Default */
++			0x8014 /* 4:FN_DMICCDAT */
++			0x0000 /* 5:Default */
++		>;
++       };
++};
++
++&i2c2 {
++	clock-frequency = <100000>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_i2c2>;
++	status = "okay";
++
++	hdmi: edid@50 {
++		compatible = "fsl,imx6-hdmi-i2c";
++		reg = <0x50>;
++	};
++
++	pmic: pfuze100@08 {
++		compatible = "fsl,pfuze100";
++		reg = <0x08>;
++
++		regulators {
++			sw1a_reg: sw1ab {
++				regulator-min-microvolt = <300000>;
++				regulator-max-microvolt = <1875000>;
++				regulator-boot-on;
++				regulator-always-on;
++				regulator-ramp-delay = <6250>;
++			};
++
++			sw1c_reg: sw1c {
++				regulator-min-microvolt = <300000>;
++				regulator-max-microvolt = <1875000>;
++				regulator-boot-on;
++				regulator-always-on;
++				regulator-ramp-delay = <6250>;
++			};
++
++			sw2_reg: sw2 {
++				regulator-min-microvolt = <800000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			sw3a_reg: sw3a {
++				regulator-min-microvolt = <400000>;
++				regulator-max-microvolt = <1975000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			sw3b_reg: sw3b {
++				regulator-min-microvolt = <400000>;
++				regulator-max-microvolt = <1975000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			sw4_reg: sw4 {
++				regulator-min-microvolt = <800000>;
++				regulator-max-microvolt = <3300000>;
++			};
++
++			swbst_reg: swbst {
++				regulator-min-microvolt = <5000000>;
++				regulator-max-microvolt = <5150000>;
++			};
++
++			snvs_reg: vsnvs {
++				regulator-min-microvolt = <1000000>;
++				regulator-max-microvolt = <3000000>;
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			vref_reg: vrefddr {
++				regulator-boot-on;
++				regulator-always-on;
++			};
++
++			vgen1_reg: vgen1 {
++				regulator-min-microvolt = <800000>;
++				regulator-max-microvolt = <1550000>;
++			};
++
++			vgen2_reg: vgen2 {
++				regulator-min-microvolt = <800000>;
++				regulator-max-microvolt = <1550000>;
++			};
++
++			vgen3_reg: vgen3 {
++				regulator-min-microvolt = <1800000>;
++				regulator-max-microvolt = <3300000>;
++			};
++
++			vgen4_reg: vgen4 {
++				regulator-min-microvolt = <1800000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-always-on;
++			};
++
++			vgen5_reg: vgen5 {
++				regulator-min-microvolt = <1800000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-always-on;
++			};
++
++			vgen6_reg: vgen6 {
++				regulator-min-microvolt = <1800000>;
++				regulator-max-microvolt = <3300000>;
++				regulator-always-on;
++			};
++		};
++	};
++};
++
++&i2c3 {
++	clock-frequency = <100000>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_i2c3>;
++	status = "okay";
++
++	egalax_ts@04 {
++		compatible = "eeti,egalax_ts";
++		reg = <0x04>;
++		interrupt-parent = <&gpio6>;
++		interrupts = <7 2>;
++		wakeup-gpios = <&gpio6 7 0>;
++	};
++};
++
++&iomuxc {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_hog>;
++
++	imx6qdl-sabresd {
++		pinctrl_hog: hoggrp {
++			fsl,pins = <
++				MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
++				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
++				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
++				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
++				MX6QDL_PAD_GPIO_0__CCM_CLKO1    0x130b0
++				MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000
++				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000
++				MX6QDL_PAD_EIM_D22__GPIO3_IO22  0x80000000
++				MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x80000000
++				MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000
++				MX6QDL_PAD_NANDF_CS3__GPIO6_IO16 0x80000000
++				MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000
++				MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000
++			>;
++		};
++
++		pinctrl_audmux: audmuxgrp {
++			fsl,pins = <
++				MX6QDL_PAD_CSI0_DAT7__AUD3_RXD		0x130b0
++				MX6QDL_PAD_CSI0_DAT4__AUD3_TXC		0x130b0
++				MX6QDL_PAD_CSI0_DAT5__AUD3_TXD		0x110b0
++				MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS		0x130b0
++			>;
++		};
++
++		pinctrl_ecspi1: ecspi1grp {
++			fsl,pins = <
++				MX6QDL_PAD_KEY_COL1__ECSPI1_MISO	0x100b1
++				MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI	0x100b1
++				MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK	0x100b1
++			>;
++		};
++
++		pinctrl_enet: enetgrp {
++			fsl,pins = <
++				MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
++				MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
++				MX6QDL_PAD_RGMII_TXC__RGMII_TXC		0x1b0b0
++				MX6QDL_PAD_RGMII_TD0__RGMII_TD0		0x1b0b0
++				MX6QDL_PAD_RGMII_TD1__RGMII_TD1		0x1b0b0
++				MX6QDL_PAD_RGMII_TD2__RGMII_TD2		0x1b0b0
++				MX6QDL_PAD_RGMII_TD3__RGMII_TD3		0x1b0b0
++				MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL	0x1b0b0
++				MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x1b0b0
++				MX6QDL_PAD_RGMII_RXC__RGMII_RXC		0x1b0b0
++				MX6QDL_PAD_RGMII_RD0__RGMII_RD0		0x1b0b0
++				MX6QDL_PAD_RGMII_RD1__RGMII_RD1		0x1b0b0
++				MX6QDL_PAD_RGMII_RD2__RGMII_RD2		0x1b0b0
++				MX6QDL_PAD_RGMII_RD3__RGMII_RD3		0x1b0b0
++				MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL	0x1b0b0
++				MX6QDL_PAD_GPIO_16__ENET_REF_CLK	0x4001b0a8
++			>;
++		};
++
++		pinctrl_gpio_keys: gpio_keysgrp {
++			fsl,pins = <
++				MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000
++				MX6QDL_PAD_GPIO_4__GPIO1_IO04  0x80000000
++				MX6QDL_PAD_GPIO_5__GPIO1_IO05  0x80000000
++			>;
++		};
++
++		pinctrl_hdmi_cec: hdmi_cecgrp {
++			fsl,pins = <
++				MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
++			>;
++		};
++
++		pinctrl_hdmi_hdcp: hdmi_hdcpgrp {
++			fsl,pins = <
++				MX6QDL_PAD_KEY_COL3__HDMI_TX_DDC_SCL 0x4001b8b1
++				MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1
++			>;
++		};
++
++		pinctrl_i2c1: i2c1grp {
++			fsl,pins = <
++				MX6QDL_PAD_CSI0_DAT8__I2C1_SDA		0x4001b8b1
++				MX6QDL_PAD_CSI0_DAT9__I2C1_SCL		0x4001b8b1
++			>;
++		};
++
++		pinctrl_i2c2: i2c2grp {
++			fsl,pins = <
++				MX6QDL_PAD_KEY_COL3__I2C2_SCL		0x4001b8b1
++				MX6QDL_PAD_KEY_ROW3__I2C2_SDA		0x4001b8b1
++			>;
++		};
++
++		pinctrl_i2c3: i2c3grp {
++			fsl,pins = <
++				MX6QDL_PAD_GPIO_3__I2C3_SCL		0x4001b8b1
++				MX6QDL_PAD_GPIO_6__I2C3_SDA		0x4001b8b1
++			>;
++		};
++
++		pinctrl_ipu1: ipu1grp {
++			fsl,pins = <
++				MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10
++				MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15       0x10
++				MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02        0x10
++				MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03        0x10
++				MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04        0x80000000
++				MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00   0x10
++				MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01   0x10
++				MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02   0x10
++				MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03   0x10
++				MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04   0x10
++				MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05   0x10
++				MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06   0x10
++				MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07   0x10
++				MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08   0x10
++				MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09   0x10
++				MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10  0x10
++				MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11  0x10
++				MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12  0x10
++				MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13  0x10
++				MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14  0x10
++				MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15  0x10
++				MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16  0x10
++				MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17  0x10
++				MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18  0x10
++				MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19  0x10
++				MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20  0x10
++				MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21  0x10
++				MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22  0x10
++				MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23  0x10
++			>;
++		};
++
++		pinctrl_pcie: pciegrp {
++			fsl,pins = <
++				MX6QDL_PAD_GPIO_17__GPIO7_IO12	0x80000000
++			>;
++		};
++
++		pinctrl_pwm1: pwm1grp {
++			fsl,pins = <
++				MX6QDL_PAD_SD1_DAT3__PWM1_OUT		0x1b0b1
++			>;
++		};
++
++		pinctrl_uart1: uart1grp {
++			fsl,pins = <
++				MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA	0x1b0b1
++				MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA	0x1b0b1
++			>;
++		};
++
++		pinctrl_usbotg: usbotggrp {
++			fsl,pins = <
++				MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID	0x17059
++			>;
++		};
++
++		pinctrl_usdhc2: usdhc2grp {
++			fsl,pins = <
++				MX6QDL_PAD_SD2_CMD__SD2_CMD		0x17059
++				MX6QDL_PAD_SD2_CLK__SD2_CLK		0x10059
++				MX6QDL_PAD_SD2_DAT0__SD2_DATA0		0x17059
++				MX6QDL_PAD_SD2_DAT1__SD2_DATA1		0x17059
++				MX6QDL_PAD_SD2_DAT2__SD2_DATA2		0x17059
++				MX6QDL_PAD_SD2_DAT3__SD2_DATA3		0x17059
++				MX6QDL_PAD_NANDF_D4__SD2_DATA4		0x17059
++				MX6QDL_PAD_NANDF_D5__SD2_DATA5		0x17059
++				MX6QDL_PAD_NANDF_D6__SD2_DATA6		0x17059
++				MX6QDL_PAD_NANDF_D7__SD2_DATA7		0x17059
++			>;
++		};
++
++		pinctrl_usdhc3: usdhc3grp {
++			fsl,pins = <
++				MX6QDL_PAD_SD3_CMD__SD3_CMD		0x17059
++				MX6QDL_PAD_SD3_CLK__SD3_CLK		0x10059
++				MX6QDL_PAD_SD3_DAT0__SD3_DATA0		0x17059
++				MX6QDL_PAD_SD3_DAT1__SD3_DATA1		0x17059
++				MX6QDL_PAD_SD3_DAT2__SD3_DATA2		0x17059
++				MX6QDL_PAD_SD3_DAT3__SD3_DATA3		0x17059
++				MX6QDL_PAD_SD3_DAT4__SD3_DATA4		0x17059
++				MX6QDL_PAD_SD3_DAT5__SD3_DATA5		0x17059
++				MX6QDL_PAD_SD3_DAT6__SD3_DATA6		0x17059
++				MX6QDL_PAD_SD3_DAT7__SD3_DATA7		0x17059
++			>;
++		};
++
++		pinctrl_usdhc4: usdhc4grp {
++			fsl,pins = <
++				MX6QDL_PAD_SD4_CMD__SD4_CMD		0x17059
++				MX6QDL_PAD_SD4_CLK__SD4_CLK		0x10059
++				MX6QDL_PAD_SD4_DAT0__SD4_DATA0		0x17059
++				MX6QDL_PAD_SD4_DAT1__SD4_DATA1		0x17059
++				MX6QDL_PAD_SD4_DAT2__SD4_DATA2		0x17059
++				MX6QDL_PAD_SD4_DAT3__SD4_DATA3		0x17059
++				MX6QDL_PAD_SD4_DAT4__SD4_DATA4		0x17059
++				MX6QDL_PAD_SD4_DAT5__SD4_DATA5		0x17059
++				MX6QDL_PAD_SD4_DAT6__SD4_DATA6		0x17059
++				MX6QDL_PAD_SD4_DAT7__SD4_DATA7		0x17059
++			>;
++		};
++	};
++
++	gpio_leds {
++		pinctrl_gpio_leds: gpioledsgrp {
++			fsl,pins = <
++				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
++			>;
++		};
++	};
++};
++
++&ldb {
++	status = "okay";
++
++	lvds-channel@1 {
++		fsl,data-mapping = "spwg";
++		fsl,data-width = <18>;
++		status = "okay";
++
++		display-timings {
++			native-mode = <&timing0>;
++			timing0: hsd100pxn1 {
++				clock-frequency = <65000000>;
++				hactive = <1024>;
++				vactive = <768>;
++				hback-porch = <220>;
++				hfront-porch = <40>;
++				vback-porch = <21>;
++				vfront-porch = <7>;
++				hsync-len = <60>;
++				vsync-len = <10>;
++			};
++		};
++	};
++};
++
++&pcie {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_pcie>;
++	reset-gpio = <&gpio7 12 0>;
++	status = "okay";
++};
++
++&pcie {
++	power-on-gpio = <&gpio3 19 0>;
++	reset-gpio = <&gpio7 12 0>;
++	status = "okay";
++};
++
++
++&pwm1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_pwm1>;
++	status = "okay";
++};
++
++&ldb {
++	ipu_id = <1>;
++	disp_id = <1>;
++	ext_ref = <1>;
++	mode = "sep1";
++	sec_ipu_id = <1>;
++	sec_disp_id = <0>;
++	status = "okay";
++};
++
++&ssi2 {
++	fsl,mode = "i2s-slave";
++	status = "okay";
++};
++
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_uart1>;
++	status = "okay";
++};
++
++&mipi_dsi {
++	dev_id = <0>;
++	disp_id = <0>;
++	lcd_panel = "TRULY-WVGA";
++	disp-power-on-supply = <&reg_mipi_dsi_pwr_on>;
++	resets = <&mipi_dsi_reset>;
++	status = "okay";
++};
++
++&usbh1 {
++	vbus-supply = <&reg_usb_h1_vbus>;
++	status = "okay";
++};
++
++&usbotg {
++	vbus-supply = <&reg_usb_otg_vbus>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_usbotg>;
++	disable-over-current;
++	status = "okay";
++};
++
++&usdhc2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_usdhc2>;
++	bus-width = <8>;
++	cd-gpios = <&gpio2 2 0>;
++	wp-gpios = <&gpio2 3 0>;
++	status = "okay";
++};
++
++&usdhc3 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_usdhc3>;
++	bus-width = <8>;
++	cd-gpios = <&gpio2 0 0>;
++	wp-gpios = <&gpio2 1 0>;
++	status = "okay";
++};
++
++&usdhc4 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_usdhc4>;
++	bus-width = <8>;
++	non-removable;
++	no-1-8-v;
++	status = "okay";
++};
++
++&hdmi_core {
++	ipu_id = <0>;
++	disp_id = <0>;
++	status = "okay";
++};
++
++&hdmi_video {
++	fsl,phy_reg_vlev = <0x0294>;
++	fsl,phy_reg_cksymtx = <0x800d>;
++	status = "okay";
++};
++
++&hdmi_audio {
++	status = "okay";
++};
++
++&hdmi_cec {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_hdmi_cec>;
++	status = "okay";
++};
++
++&gpc {
++	fsl,cpu_pupscr_sw2iso = <0xf>;
++	fsl,cpu_pupscr_sw = <0xf>;
++	fsl,cpu_pdnscr_iso2sw = <0x1>;
++	fsl,cpu_pdnscr_iso = <0x1>;
++};
+-- 
+1.8.1.2
+

projects/imx6/patches/linux/linux-300-tbs_matrix_device_tree.patch

@@ -1,88 +0,0 @@
---- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi	2014-08-26 14:31:43.000000000 +0200
-+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi	2014-08-27 22:14:04.000000000 +0200
-@@ -21,6 +21,14 @@
- 		mxcfb3 = &mxcfb4;
- 	};
- 
-+	ir_recv: ir-receiver {
-+		compatible = "gpio-ir-receiver";
-+		gpios = <&gpio3 18 1>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pinctrl_sabresd_ir>;
-+		linux,rc-map-name = "rc-rc6-mce";
-+	};
-+	
- 	chosen {
- 		stdout-path = &uart1;
- 	};
-@@ -132,9 +140,22 @@
- 		red {
- 		        gpios = <&gpio1 2 0>;
- 		        default-state = "on";
-+		        linux,default-trigger = "heartbeat";
-+		};
-+
-+		fan {
-+			gpios = <&gpio3 28 0>;
-+			default-state = "off";
- 		};
- 	};
- 
-+	sound-spdif {
-+		compatible = "fsl,imx-audio-spdif";
-+		model = "imx-spdif";
-+		spdif-controller = <&spdif>;
-+		spdif-out;
-+	};
-+
- 	sound-hdmi {
- 		compatible = "fsl,imx6q-audio-hdmi",
- 			     "fsl,imx-audio-hdmi";
-@@ -475,6 +496,16 @@
- 			>;
- 		};
- 
-+		pinctrl_sabresd_ir: sabresd-ir {
-+			fsl,pins = <
-+				MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x80000000
-+			>;
-+		};
-+
-+		pinctrl_sabresd_spdif: sabresd-spdif {
-+			fsl,pins = <MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x13091>;
-+		};
-+
- 		pinctrl_hdmi_cec: hdmi_cecgrp {
- 			fsl,pins = <
- 				MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
-@@ -618,6 +649,7 @@
- 		pinctrl_gpio_leds: gpioledsgrp {
- 			fsl,pins = <
- 				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
-+				MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x80000000
- 			>;
- 		};
- 	};
-@@ -698,6 +730,22 @@
- 	status = "okay";
- };
- 
-+&spdif {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_sabresd_spdif>;
-+	clocks = <&clks 197>, <&clks 0>,
-+		 <&clks 197>, <&clks 0>,
-+		 <&clks 0>,   <&clks 0>,
-+		 <&clks 0>,   <&clks 0>,
-+		 <&clks 0>;
-+	clock-names = "core",  "rxtx0",
-+		      "rxtx1", "rxtx2",
-+		      "rxtx3", "rxtx4",
-+		      "rxtx5", "rxtx6",
-+		      "rxtx7";
-+	status = "okay";
-+};
-+
- &usbh1 {
- 	vbus-supply = <&reg_usb_h1_vbus>;
- 	status = "okay";

projects/imx6/patches/linux/linux-301-tbs2910_device_tree_updates.patch

@@ -0,0 +1,206 @@
+From a2e2a3127261078129a5fc6f29222c7edbc3acea Mon Sep 17 00:00:00 2001
+From: vpeter4 <peter.vicman@gmail.com>
+Date: Sun, 5 Oct 2014 14:25:57 +0200
+Subject: [PATCH] tbs2910_device_tree_updates
+
+gpio ir receiver, red led as heartbeat, fan (as led output), spdif sound
+
+sgtl5000 audio codec by @milan on TBS forum
+	http://www.tbsdtv.com/forum/viewtopic.php?f=154&t=8859&p=32020#p32018
+
+---
+ arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6q-tbs2910.dts    |   4 ++
+ arch/arm/boot/dts/imx6qdl-tbs2910.dtsi | 106 ++++++++++++++++++++++-----------
+ 3 files changed, 76 insertions(+), 36 deletions(-)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-tbs2910.dtsi b/arch/arm/boot/dts/imx6qdl-tbs2910.dtsi
+index f351c21..53803c9 100644
+--- a/arch/arm/boot/dts/imx6qdl-tbs2910.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-tbs2910.dtsi
+@@ -21,6 +21,14 @@
+ 		mxcfb3 = &mxcfb4;
+ 	};
+ 
++	ir_recv: ir-receiver {
++		compatible = "gpio-ir-receiver";
++		gpios = <&gpio3 18 1>;
++		pinctrl-names = "default";
++		pinctrl-0 = <&pinctrl_sabresd_ir>;
++		linux,rc-map-name = "rc-rc6-mce";
++	};
++	
+ 	chosen {
+ 		stdout-path = &uart1;
+ 	};
+@@ -57,9 +65,10 @@
+ 		reg_audio: regulator@2 {
+ 			compatible = "regulator-fixed";
+ 			reg = <2>;
+-			regulator-name = "wm8962-supply";
+-			gpio = <&gpio4 10 0>;
+-			enable-active-high;
++			regulator-name = "sgtl5000-supply";
++			regulator-min-microvolt = <3300000>;
++			regulator-max-microvolt = <3300000>;
++			regulator-always-on;
+ 		};
+ 
+ 		reg_mipi_dsi_pwr_on: mipi_dsi_pwr_on {
+@@ -98,20 +107,14 @@
+ 	};
+ 
+ 	sound {
+-		compatible = "fsl,imx6q-sabresd-wm8962",
+-			   "fsl,imx-audio-wm8962";
+-		model = "wm8962-audio";
++		compatible = "fsl,imx-audio-sgtl5000";
++		model = "imx-sgtl5000";
+ 		ssi-controller = <&ssi2>;
+ 		audio-codec = <&codec>;
+ 		audio-routing =
+-			"Headphone Jack", "HPOUTL",
+-			"Headphone Jack", "HPOUTR",
+-			"Ext Spk", "SPKOUTL",
+-			"Ext Spk", "SPKOUTR",
+-			"MICBIAS", "AMIC",
+-			"IN3R", "MICBIAS",
+-			"DMIC", "MICBIAS",
+-			"DMICDAT", "DMIC";
++			"MIC_IN", "Mic Jack",
++			"Mic Jack", "Mic Bias",
++			"Headphone Jack", "HP_OUT";
+ 		mux-int-port = <2>;
+ 		mux-ext-port = <3>;
+ 	};
+@@ -132,9 +135,22 @@
+ 		red {
+ 		        gpios = <&gpio1 2 0>;
+ 		        default-state = "on";
++		        linux,default-trigger = "heartbeat";
++		};
++
++		fan {
++			gpios = <&gpio3 28 0>;
++			default-state = "off";
+ 		};
+ 	};
+ 
++	sound-spdif {
++		compatible = "fsl,imx-audio-spdif";
++		model = "imx-spdif";
++		spdif-controller = <&spdif>;
++		spdif-out;
++	};
++
+ 	sound-hdmi {
+ 		compatible = "fsl,imx6q-audio-hdmi",
+ 			     "fsl,imx-audio-hdmi";
+@@ -257,27 +273,15 @@
+ 	pinctrl-0 = <&pinctrl_i2c1>;
+ 	status = "okay";
+ 
+-	codec: wm8962@1a {
+-		compatible = "wlf,wm8962";
+-		reg = <0x1a>;
++	codec: sgtl5000@0a {
+ 		clocks = <&clks 201>;
+-		DCVDD-supply = <&reg_audio>;
+-		DBVDD-supply = <&reg_audio>;
+-		AVDD-supply = <&reg_audio>;
+-		CPVDD-supply = <&reg_audio>;
+-		MICVDD-supply = <&reg_audio>;
+-		PLLVDD-supply = <&reg_audio>;
+-		SPKVDD1-supply = <&reg_audio>;
+-		SPKVDD2-supply = <&reg_audio>;
+-		gpio-cfg = <
+-			0x0000 /* 0:Default */
+-			0x0000 /* 1:Default */
+-			0x0013 /* 2:FN_DMICCLK */
+-			0x0000 /* 3:Default */
+-			0x8014 /* 4:FN_DMICCDAT */
+-			0x0000 /* 5:Default */
+-		>;
+-       };
++		compatible = "fsl,sgtl5000";
++		reg = <0x0a>;
++		pinctrl-names = "default";
++		pinctrl-0 = <&pinctrl_sgtl5000>;
++		VDDA-supply = <&reg_audio>;
++		VDDIO-supply = <&reg_audio>;
++    };
+ };
+ 
+ &i2c2 {
+@@ -417,7 +421,6 @@
+ 				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
+ 				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
+ 				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
+-				MX6QDL_PAD_GPIO_0__CCM_CLKO1    0x130b0
+ 				MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000
+ 				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000
+ 				MX6QDL_PAD_EIM_D22__GPIO3_IO22  0x80000000
+@@ -429,6 +432,12 @@
+ 			>;
+ 		};
+ 
++		pinctrl_sgtl5000: sgtl5000grp {
++			fsl,pins = <
++				MX6QDL_PAD_GPIO_0__CCM_CLKO1	    0x130b0
++			>;
++		};
++
+ 		pinctrl_audmux: audmuxgrp {
+ 			fsl,pins = <
+ 				MX6QDL_PAD_CSI0_DAT7__AUD3_RXD		0x130b0
+@@ -475,6 +484,16 @@
+ 			>;
+ 		};
+ 
++		pinctrl_sabresd_ir: sabresd-ir {
++			fsl,pins = <
++				MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x80000000
++			>;
++		};
++
++		pinctrl_sabresd_spdif: sabresd-spdif {
++			fsl,pins = <MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x13091>;
++		};
++
+ 		pinctrl_hdmi_cec: hdmi_cecgrp {
+ 			fsl,pins = <
+ 				MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+@@ -618,6 +637,7 @@
+ 		pinctrl_gpio_leds: gpioledsgrp {
+ 			fsl,pins = <
+ 				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
++				MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x80000000
+ 			>;
+ 		};
+ 	};
+@@ -698,6 +718,22 @@
+ 	status = "okay";
+ };
+ 
++&spdif {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_sabresd_spdif>;
++	clocks = <&clks 197>, <&clks 0>,
++		 <&clks 197>, <&clks 0>,
++		 <&clks 0>,   <&clks 0>,
++		 <&clks 0>,   <&clks 0>,
++		 <&clks 0>;
++	clock-names = "core",  "rxtx0",
++		      "rxtx1", "rxtx2",
++		      "rxtx3", "rxtx4",
++		      "rxtx5", "rxtx6",
++		      "rxtx7";
++	status = "okay";
++};
++
+ &usbh1 {
+ 	vbus-supply = <&reg_usb_h1_vbus>;
+ 	status = "okay";
+-- 
+1.8.1.2
+

projects/imx6/patches/u-boot/030-tbs_matrix_system.patch

@@ -12,7 +12,12 @@ diff -urN a/boards.cfg b/boards.cfg
 diff -urN a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
 --- a/include/configs/mx6sabresd.h	2014-04-13 01:27:26.000000000 +0200
 +++ b/include/configs/mx6sabresd.h	2014-08-23 17:01:13.000000000 +0200
-@@ -21,13 +21,13 @@
+@@ -17,17 +17,17 @@
+ #define CONFIG_CONSOLE_DEV		"ttymxc0"
+ #define CONFIG_MMCROOT			"/dev/mmcblk1p2"
+ #if defined(CONFIG_MX6Q)
+-#define CONFIG_DEFAULT_FDT_FILE	"imx6q-sabresd.dtb"
++#define CONFIG_DEFAULT_FDT_FILE	"imx6q-tbs2910.dtb"
  #elif defined(CONFIG_MX6DL)
  #define CONFIG_DEFAULT_FDT_FILE	"imx6dl-sabresd.dtb"
  #endif

projects/imx6/patches/u-boot/050-tbs_matrix_multiboot.patch

@@ -9,17 +9,17 @@ diff -urN a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.
 +	"echo SD/MMC device set to ${mmcdev} but checking 0, 1 and 2; " \
 +	"setenv mmcdevold ${mmcdev}; " \
 +	"setenv mmcdev 0; " \
-+	"echo Checking mmc dev ${mmcdev};" \
++	"echo Checking mmc dev ${mmcdev} (microSD card);" \
 +	"mmc dev ${mmcdev};" \
 +	"if mmc rescan && run loadbootenv; then " \
 +	"else " \
 +	  "setenv mmcdev 1; " \
-+	  "echo Checking mmc dev ${mmcdev};" \
++	  "echo Checking mmc dev ${mmcdev} (SD card);" \
 +	  "mmc dev ${mmcdev};" \
 +	  "if mmc rescan && run loadbootenv; then " \
 +	  "else " \
 +	    "setenv mmcdev 2; " \
-+	    "echo Checking mmc dev ${mmcdev};" \
++	    "echo Checking mmc dev ${mmcdev} (internal eMMC);" \
 +	    "mmc dev ${mmcdev};" \
 +	    "if mmc rescan && run loadbootenv; then " \
 +	    "else " \