archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54 from vpeter4/imx6.kernel

Browse Source 
imx6: update kernel, prepare for second kernel
This commit is contained in:
Lukas Rusak
2016-03-28 10:43:03 -07:00
parent 31aa77efc0 33c51330f7
commit ebbbbac3c0
84 changed files with 571 additions and 74944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/functions
View File

@@ -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

59
packages/graphics/gpu-viv-bin-mx6q/package.mk
View File

@@ -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() {

71
packages/graphics/imx-gpu-viv/package.mk Normal file
View File

@@ -0,0 +1,71 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
#
# 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
}

11
packages/graphics/imx-gpu-viv/system.d/unbind-console.service Normal file
View File

@@ -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

13
packages/linux/package.mk
View File

@@ -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

1
packages/mediacenter/kodi/package.mk
View File

@@ -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

221
projects/imx6/linux/linux.arm.conf → projects/imx6/linux/3.14-mx6-sr/linux.arm.conf
View File

File diff suppressed because it is too large Load Diff

17
projects/imx6/options
View File

@@ -54,15 +54,22 @@
# Kernel extra targets to build
KERNEL_UBOOT_EXTRA_TARGET="imx6q-cubox-i.dtb imx6dl-cubox-i.dtb"
KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-hummingboard.dtb imx6dl-hummingboard.dtb"
KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-hummingboard2.dtb imx6dl-hummingboard2.dtb"
KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-tbs2910.dtb"
KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-udoo.dtb imx6dl-udoo.dtb"
KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6q-udoo-15lvds.dtb imx6q-udoo-7lvds.dtb"
KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET imx6dl-udoo-15lvds.dtb imx6dl-udoo-7lvds.dtb"
# Additional kernel make parameters (for example to specify the u-boot loadaddress)
KERNEL_MAKE_EXTRACMD=""
# Kernel to use. values can be:
# default: default mainline kernel
LINUX="imx6"
if [ -z "$LINUX_VERSION" ]; then
LINUX="imx6"
else
LINUX="imx6-4.4-xbian"
fi
################################################################################
@@ -95,8 +102,12 @@
# OpenGL(X) implementation to use (no / mesa)
OPENGL="no"
# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q)
OPENGLES="gpu-viv-bin-mx6q"
# OpenGL-ES implementation to use (no / bcm2835-driver / imx-gpu-viv)
if [ "$LINUX" = "imx6" ]; then
OPENGLES="imx-gpu-viv"
else
OPENGLES="gpu-viv-bin-mx6q"
fi
# include uvesafb support (yes / no)
UVESAFB_SUPPORT="no"

0
projects/imx6/patches/linux/999.01-LLVMLinux_use_static_inline_in_ARM_ftrace.h.patch → projects/imx6/patches/linux/3.14-mx6-sr/999.01-LLVMLinux_use_static_inline_in_ARM_ftrace.h.patch
View File

0
projects/imx6/patches/linux/999.02-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch → projects/imx6/patches/linux/3.14-mx6-sr/999.02-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch
View File

0
projects/imx6/patches/linux/linux-002-rename-sgtl5000-codec.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-002-rename-sgtl5000-codec.patch
View File

0
projects/imx6/patches/linux/linux-003-no_dev_console.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-003-no_dev_console.patch
View File

0
projects/imx6/patches/linux/linux-004-fix-build-with-gcc-5.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-004-fix-build-with-gcc-5.patch
View File

0
projects/imx6/patches/linux/linux-007-config_cmdline.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-007-config_cmdline.patch
View File

0
projects/imx6/patches/linux/linux-010_tivo_slide_pro.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-010_tivo_slide_pro.patch
View File

0
projects/imx6/patches/linux/linux-051-ouya_controller_support.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-051-ouya_controller_support.patch
View File

0
projects/imx6/patches/linux/linux-052-XBOX_remote_support.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-052-XBOX_remote_support.patch
View File

0
projects/imx6/patches/linux/linux-053-spinelplus-remote-0.2.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-053-spinelplus-remote-0.2.patch
View File

0
projects/imx6/patches/linux/linux-055-add_Formosa_eHome_Infrared_Receiver.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
View File

0
projects/imx6/patches/linux/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch → projects/imx6/patches/linux/3.14-mx6-sr/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
View File

Some files were not shown because too many files have changed in this diff Show More