Merge pull request LibreELEC#54 from vpeter4/imx6.kernel

imx6: update kernel, prepare for second kernel
stbenz · Mar 28, 2016 · ebbbbac · ebbbbac
2 parents 31aa77e + 33c5133
commit ebbbbac
Show file tree

Hide file tree

Showing 84 changed files with 571 additions and 74,944 deletions.
diff --git a/config/functions b/config/functions
@@ -286,14 +286,15 @@ dashes="==========================="
     exit 1
   fi
 
-  if [ ! -f $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -a ! -f $HOME/.libreelec/projects/$PROJECT/linux/linux.$TARGET_ARCH.conf ]; then
+  if [ ! -f $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -a ! -f $HOME/.libreelec/projects/$PROJECT/linux/linux.$TARGET_ARCH.conf ] &&
+     ! ls $PROJECT_DIR/$PROJECT/linux/*/linux.$TARGET_ARCH.conf &>/dev/null; then
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n ERROR: Architecture not found, use a valid Architecture"
     check_arch="$check_arch\n for your project or create a new config"
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n\n Valid Architectures for your project: $PROJECT"
 
-    for arch in $PROJECT_DIR/$PROJECT/linux/*.conf $HOME/.libreelec/projects/$PROJECT/linux/*.conf; do
+    for arch in $PROJECT_DIR/$PROJECT/linux/*.conf $HOME/.libreelec/projects/$PROJECT/linux/*.conf $PROJECT_DIR/$PROJECT/linux/*/linux.$TARGET_ARCH.conf; do
       check_arch="$check_arch\n - $(basename $arch | cut -f2 -d".")"
     done
     echo -e $check_arch

diff --git a/packages/graphics/gpu-viv-bin-mx6q/package.mk b/packages/graphics/gpu-viv-bin-mx6q/package.mk
@@ -17,67 +17,48 @@
 ################################################################################
 
 PKG_NAME="gpu-viv-bin-mx6q"
-PKG_VERSION="3.10.17-1.0.0-1"
+PKG_VERSION="3.10.17-1.0.2-hfp"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.freescale.com"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="toolchain gpu-viv-g2d"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="gpu-viv-bin-mx6q: OpenGL-ES and VIVANTE driver for imx6q"
 PKG_LONGDESC="gpu-viv-bin-mx6q: OpenGL-ES and VIVANTE driver for imx6q"
-
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-if [ "$TARGET_FLOAT" = "softfp" -o "$TARGET_FLOAT" = "soft" ]; then
-  FLOAT="softfp"
-elif [ "$TARGET_FLOAT" = "hard" ]; then
-  FLOAT="hardfp"
-fi
-
 make_target() {
  : # nothing to make
 }
 
 makeinstall_target() {
   mkdir -p $SYSROOT_PREFIX/usr/include
-    cp -PRv $FLOAT/usr/include/* $SYSROOT_PREFIX/usr/include
+  cp -PRv usr/include/* $SYSROOT_PREFIX/usr/include
+
+  LIBS_COPY="usr/lib/libEGL-fb.so \
+             usr/lib/libEGL.so* \
+             usr/lib/libGLES_CL.so \
+             usr/lib/libGLES_CM.so \
+             usr/lib/libGLESv1_CL.so* \
+             usr/lib/libGLESv1_CM.so* \
+             usr/lib/libGLESv2-fb.so \
+             usr/lib/libGLESv2.so* \
+             usr/lib/libGLSLC.so* \
+             usr/lib/libGAL-fb.so \
+             usr/lib/libGAL.so* \
+             usr/lib/libVIVANTE-fb.so \
+             usr/lib/libVIVANTE.so* \
+             usr/lib/libOpenCL.so"
 
   mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -PRv $FLOAT/usr/lib/libEGL-fb.so \
-            $FLOAT/usr/lib/libEGL.so* \
-            $FLOAT/usr/lib/libGLES_CL.so \
-            $FLOAT/usr/lib/libGLES_CM.so \
-            $FLOAT/usr/lib/libGLESv1_CL.so* \
-            $FLOAT/usr/lib/libGLESv1_CM.so* \
-            $FLOAT/usr/lib/libGLESv2-fb.so \
-            $FLOAT/usr/lib/libGLESv2.so* \
-            $FLOAT/usr/lib/libGAL-fb.so \
-            $FLOAT/usr/lib/libGAL.so* \
-            $FLOAT/usr/lib/libVIVANTE-fb.so \
-            $FLOAT/usr/lib/libVIVANTE.so* \
-            $FLOAT/usr/lib/libOpenCL.so \
-            $SYSROOT_PREFIX/usr/lib
+  cp -PRv $LIBS_COPY $SYSROOT_PREFIX/usr/lib
 
   mkdir -p $INSTALL/usr/lib
-    cp -PRv $FLOAT/usr/lib/libEGL-fb.so \
-            $FLOAT/usr/lib/libEGL.so* \
-            $FLOAT/usr/lib/libGLES_CL.so \
-            $FLOAT/usr/lib/libGLES_CM.so \
-            $FLOAT/usr/lib/libGLESv1_CL.so* \
-            $FLOAT/usr/lib/libGLESv1_CM.so* \
-            $FLOAT/usr/lib/libGLESv2-fb.so \
-            $FLOAT/usr/lib/libGLESv2.so* \
-            $FLOAT/usr/lib/libGLSLC.so* \
-            $FLOAT/usr/lib/libGAL-fb.so \
-            $FLOAT/usr/lib/libGAL.so* \
-            $FLOAT/usr/lib/libVIVANTE-fb.so \
-            $FLOAT/usr/lib/libVIVANTE.so* \
-            $FLOAT/usr/lib/libOpenCL.so \
-            $INSTALL/usr/lib
+  cp -PRv $LIBS_COPY $INSTALL/usr/lib
 }
 
 post_install() {

diff --git a/packages/graphics/imx-gpu-viv/package.mk b/packages/graphics/imx-gpu-viv/package.mk
@@ -0,0 +1,71 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2016 Stephan Raue ([email protected])
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="imx-gpu-viv"
+PKG_VERSION="5.0.11.p4.5-hfp"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="nonfree"
+PKG_SITE="http://www.freescale.com"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="imx-gpu-viv: OpenGL-ES and VIVANTE driver for imx6q"
+PKG_LONGDESC="imx-gpu-viv: OpenGL-ES and VIVANTE driver for imx6q"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_target() {
+ : # nothing to make
+}
+
+makeinstall_target() {
+  mkdir -p $SYSROOT_PREFIX/usr/include
+  cp -PRv gpu-core/usr/include/* $SYSROOT_PREFIX/usr/include
+  cp -PRv g2d/usr/include/* $SYSROOT_PREFIX/usr/include
+
+  LIBS_COPY="gpu-core/usr/lib/libEGL-fb.so \
+             gpu-core/usr/lib/libEGL.so* \
+             gpu-core/usr/lib/libGLES_CL.so* \
+             gpu-core/usr/lib/libGLES_CM.so* \
+             gpu-core/usr/lib/libGLESv1_CL.so* \
+             gpu-core/usr/lib/libGLESv1_CM.so* \
+             gpu-core/usr/lib/libGLESv2-fb.so \
+             gpu-core/usr/lib/libGLESv2.so* \
+             gpu-core/usr/lib/libGLSLC.so* \
+             gpu-core/usr/lib/libGAL-fb.so \
+             gpu-core/usr/lib/libGAL.so* \
+             gpu-core/usr/lib/libGAL_egl.fb.so \
+             gpu-core/usr/lib/libGAL_egl.so* \
+             gpu-core/usr/lib/libVIVANTE-fb.so \
+             gpu-core/usr/lib/libVIVANTE.so* \
+             gpu-core/usr/lib/libOpenCL.so \
+             gpu-core/usr/lib/libVSC.so \
+             g2d/usr/lib/libg2d*.so*"
+
+  mkdir -p $SYSROOT_PREFIX/usr/lib
+  cp -PRv $LIBS_COPY $SYSROOT_PREFIX/usr/lib
+
+  mkdir -p $INSTALL/usr/lib
+  cp -PRv $LIBS_COPY $INSTALL/usr/lib
+}
+
+post_install() {
+  enable_service unbind-console.service
+}
diff --git a/packages/graphics/imx-gpu-viv/system.d/unbind-console.service b/packages/graphics/imx-gpu-viv/system.d/unbind-console.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=unbind Framebuffer console
+
+ConditionPathExists=/sys/class/vtconsole/vtcon1/bind
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'echo 0 > /sys/class/vtconsole/vtcon1/bind'
+
+[Install]
+WantedBy=graphical.target
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
@@ -35,8 +35,11 @@ case "$LINUX" in
     PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
     ;;
   imx6)
-    PKG_VERSION="cuboxi-3.14-ea83bda"
-    PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+    PKG_VERSION="3.14-mx6-sr"
+    PKG_COMMIT="4386797"
+    PKG_SOURCE_DIR="$PKG_NAME-$PKG_VERSION-$PKG_COMMIT"
+    PKG_SOURCE_NAME="$PKG_SOURCE_DIR.tar.xz"
+    PKG_URL="$DISTRO_SRC/$PKG_SOURCE_NAME"
     PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan"
     ;;
   *)
@@ -55,8 +58,12 @@ if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
 fi
 
 post_patch() {
-  if [ -f $PROJECT_DIR/$PROJECT/$PKG_NAME/$PKG_NAME.$TARGET_ARCH.conf ]; then
+  if [ -f $PROJECT_DIR/$PROJECT/$PKG_NAME/$PKG_VERSION/$PKG_NAME.$TARGET_ARCH.conf ]; then
+    KERNEL_CFG_FILE=$PROJECT_DIR/$PROJECT/$PKG_NAME/$PKG_VERSION/$PKG_NAME.$TARGET_ARCH.conf
+  elif [ -f $PROJECT_DIR/$PROJECT/$PKG_NAME/$PKG_NAME.$TARGET_ARCH.conf ]; then
     KERNEL_CFG_FILE=$PROJECT_DIR/$PROJECT/$PKG_NAME/$PKG_NAME.$TARGET_ARCH.conf
+  elif [ -f $PKG_DIR/config/$PKG_VERSION/$PKG_NAME.$TARGET_ARCH.conf ]; then
+    KERNEL_CFG_FILE=$PKG_DIR/config/$PKG_VERSION/$PKG_NAME.$TARGET_ARCH.conf
   else
     KERNEL_CFG_FILE=$PKG_DIR/config/$PKG_NAME.$TARGET_ARCH.conf
   fi

diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
@@ -201,7 +201,6 @@ if [ ! "$KODIPLAYER_DRIVER" = default ]; then
     KODI_CXXFLAGS="$KODI_CXXFLAGS $BCM2835_INCLUDES"
   elif [ "$KODIPLAYER_DRIVER" = libfslvpuwrap ]; then
     KODI_CODEC="--enable-codec=imxvpu"
-    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gpu-viv-g2d"
   elif [ "$KODIPLAYER_DRIVER" = libamcodec ]; then
     KODI_CODEC="--enable-codec=amcodec"
   else