From 5036201925da2f4f4d48994d6c20513f683ea0ef Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 18 Feb 2019 09:37:10 +0100 Subject: tk1: drop meta-jetson-tk1 All of meta-jetson-tk1 has been moved into meta-toradex-tegra as updates were needed. Drop meta-jetson-tk1. Signed-off-by: Max Krummenacher --- .../binary-drivers/cudatoolkit6.5_21.5.0.bb | 41 --------- .../binary-drivers/linux-driver-package/nv | 87 ------------------ .../binary-drivers/linux-driver-package/nv.service | 18 ---- .../binary-drivers/linux-driver-package/nvfb | 25 ----- .../linux-driver-package/nvfb.service | 17 ---- .../linux-driver-package/tegra_xusb_firmware | Bin 124416 -> 0 bytes .../binary-drivers/linux-driver-package/xorg.conf | 22 ----- .../linux-driver-package/xorg.conf.add | 11 --- .../linux-driver-package_21.%.bbappend | 99 -------------------- .../binary-drivers/linux-driver-package_21.7.0.bb | 102 --------------------- .../binary-drivers/opencv4tegra_21.5.0.bb | 45 --------- ...-sysmacros.h-follow-changed-include-files.patch | 41 --------- .../xorg-xserver/xserver-xorg/macro_tweak.patch | 25 ----- .../xorg-xserver/xserver-xorg_1.17.4.bb | 43 --------- .../xorg-xserver/xserver-xorg_1.17.4.bbappend | 26 ------ .../binary-drivers/cudatoolkit6.5_21.5.0.bb | 41 +++++++++ recipes-bsp/binary-drivers/linux-driver-package/nv | 87 ++++++++++++++++++ .../binary-drivers/linux-driver-package/nv.service | 18 ++++ .../binary-drivers/linux-driver-package/nvfb | 25 +++++ .../linux-driver-package/nvfb.service | 17 ++++ .../linux-driver-package/tegra_xusb_firmware | Bin 0 -> 124416 bytes .../binary-drivers/linux-driver-package/xorg.conf | 22 +++++ .../linux-driver-package/xorg.conf.add | 11 +++ .../linux-driver-package_21.%.bbappend | 99 ++++++++++++++++++++ .../binary-drivers/linux-driver-package_21.7.0.bb | 102 +++++++++++++++++++++ recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb | 45 +++++++++ ...-sysmacros.h-follow-changed-include-files.patch | 41 +++++++++ .../xorg-xserver/xserver-xorg/macro_tweak.patch | 25 +++++ .../xorg-xserver/xserver-xorg_1.17.4.bb | 43 +++++++++ .../xorg-xserver/xserver-xorg_1.17.4.bbappend | 26 ++++++ 30 files changed, 602 insertions(+), 602 deletions(-) delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb delete mode 100755 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nv delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nv.service delete mode 100755 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nvfb delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend delete mode 100755 jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb delete mode 100644 jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb delete mode 100644 jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch delete mode 100755 jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch delete mode 100755 jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb delete mode 100644 jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend create mode 100644 recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb create mode 100755 recipes-bsp/binary-drivers/linux-driver-package/nv create mode 100644 recipes-bsp/binary-drivers/linux-driver-package/nv.service create mode 100755 recipes-bsp/binary-drivers/linux-driver-package/nvfb create mode 100644 recipes-bsp/binary-drivers/linux-driver-package/nvfb.service create mode 100644 recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware create mode 100644 recipes-bsp/binary-drivers/linux-driver-package/xorg.conf create mode 100644 recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add create mode 100644 recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend create mode 100755 recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb create mode 100644 recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch create mode 100755 recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch create mode 100755 recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend diff --git a/jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb b/jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb deleted file mode 100644 index 6bb8657..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "NVIDIA CUDA 6.5 Toolkit for L4T Rel 21.x Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "Proprietary" - -SRC_URI = "http://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/005/linux-x64/cuda-repo-l4t-r21.5-6-5-local_6.5-53_armhf.deb" - -LIC_FILES_CHKSUM = "file://usr/share/doc/cuda-repo-l4t-r21.5-6-5-local/copyright;md5=f87877410d6936081b0b8ddd124ca96d" - -SRC_URI[md5sum] = "93b5c6592292565c389c46a16b4cbf5d" -SRC_URI[sha256sum] = "4739c63e16b9a169f988c2b8f175c0182fa118833b49950fe72fe8c039ba1359" - -DEPENDS = "dpkg-native" - -INSANE_SKIP_${PN} = "ldflags" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/cuda6.5" - -INSANE_SKIP_${PN}-dev = "ldflags" - -FILES_${PN} = "${datadir}/lintian/* \ - ${base_prefix}/usr/local/cuda-6.5/* " - -INHIBIT_PACKAGE_STRIP = "1" - -INSANE_SKIP_${PN} += "already-stripped dev-so libdir" - -python do_unpack () { - locals = d.getVar('WORKDIR', True) - s = d.getVar('S', True) - d.setVar('WORKDIR', s) - d.setVar('S', s) - bb.build.exec_func('base_do_unpack', d) - d.setVar('WORKDIR', locals) -} - -do_install () { - cp -r ${WORKDIR}/cuda6.5/usr ${D} - dpkg -x ${WORKDIR}/cuda6.5/var/cuda-repo-6-5-local/cuda-cudart-6-5_6.5-53_armhf.deb ${D} -} diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nv b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nv deleted file mode 100755 index 2221688..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nv +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -#"NVIDIA specific init script" - -nvexec() { - # power state - if [ -e /sys/power/state ]; then - chmod 0666 /sys/power/state - fi - - # Set minimum cpu freq. - if [ -e /sys/devices/soc0/family ]; then - SOCFAMILY="`cat /sys/devices/soc0/family`" - fi - - if [ "$SOCFAMILY" = "Tegra13" ] && - [ -e /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq ]; then - sudo bash -c "echo -n 510000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq" - fi - - # CPU hotplugging - if [ -d /sys/devices/system/cpu/cpuquiet/tegra_cpuquiet ] ; then - echo 500 > /sys/devices/system/cpu/cpuquiet/tegra_cpuquiet/down_delay - echo 1 > /sys/devices/system/cpu/cpuquiet/tegra_cpuquiet/enable - elif [ -w /sys/module/cpu_tegra3/parameters/auto_hotplug ] ; then - # compatibility for prior kernels without cpuquiet support - echo 1 > /sys/module/cpu_tegra3/parameters/auto_hotplug - fi - - # lp2 idle state - if [ -e /sys/module/cpuidle/parameters/power_down_in_idle ] ; then - echo "Y" > /sys/module/cpuidle/parameters/power_down_in_idle - elif [ -e /sys/module/cpuidle/parameters/lp2_in_idle ] ; then - # compatibility for prior kernels - echo "Y" > /sys/module/cpuidle/parameters/lp2_in_idle - fi - - #FIXME remove once kernel CL merges into main Bug 1231069 - for uartInst in 0 1 2 3 - do - uartNode="/dev/ttyHS$uartInst" - if [ -e "$uartNode" ]; then - ln -s /dev/ttyHS$uartInst /dev/ttyTHS$uartInst - fi - done - # remove power to dc.0 for jetson-tk1 - machine=`cat /sys/devices/soc0/machine` - if [ "${machine}" = "jetson-tk1" ] ; then - echo 4 > /sys/class/graphics/fb0/blank - if [ -e /sys/devices/platform/tegra-otg/enable_device ] ; then - echo 0 > /sys/devices/platform/tegra-otg/enable_device - fi - if [ -e /sys/devices/platform/tegra-otg/enable_host ] ; then - echo 1 > /sys/devices/platform/tegra-otg/enable_host - fi - fi - - # CPU frequency governor - if [ -e /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors ]; then - read governors < /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors - case $governors in - *interactive*) - echo interactive > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - if [ -e /sys/devices/system/cpu/cpufreq/interactive ] ; then - echo "1224000" > /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq - echo "95" > /sys/devices/system/cpu/cpufreq/interactive/target_loads - echo "20000" > /sys/devices/system/cpu/cpufreq/interactive/min_sample_time - fi - ;; - *) - ;; - esac - fi - - # CPU frequency boost on input event - if [ -e /sys/module/input_cfboost/parameters/boost_freq ]; then - echo "1224000" > /sys/module/input_cfboost/parameters/boost_freq - fi -} - -case "$1" in - start) - nvexec - exit 0 - ;; - *) - exit 1 -esac diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nv.service b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nv.service deleted file mode 100644 index 3fab9b2..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nv.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Nvidia binary driver init script -After=nvfb.service - -[Install] -WantedBy=multi-user.target - -[Service] -Type=forking -Restart=no -TimeoutSec=5min -IgnoreSIGPIPE=no -KillMode=process -GuessMainPID=no -RemainAfterExit=yes -ExecStart=/etc/init.d/nv start -ExecStop=/etc/init.d/nv stop - diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nvfb b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nvfb deleted file mode 100755 index e5f4502..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nvfb +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -#"specific first-boot script" - -nvexec() { - RET=0 - if [ ! -e /etc/nv/nvfirstboot ]; then - RET=0 - else - echo "/usr/lib/arm-linux-gnueabihf/tegra" >> /etc/ld.so.conf - echo "/usr/lib/arm-linux-gnueabihf/tegra-egl" >> /etc/ld.so.conf - - ldconfig - rm -rf /etc/nv/nvfirstboot - fi - exit $RET -} - -case "$1" in - start) - nvexec - exit 0 - ;; - *) - exit 1 -esac diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service deleted file mode 100644 index 4d923da..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Nvidia binary driver first-boot script -Before=nv.service - -[Install] -WantedBy=multi-user.target - -[Service] -Type=forking -Restart=no -TimeoutSec=5min -IgnoreSIGPIPE=no -KillMode=process -GuessMainPID=no -RemainAfterExit=yes -ExecStart=/etc/init.d/nvfb start -ExecStop=/etc/init.d/nvfb stop diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware deleted file mode 100644 index 7a18086..0000000 Binary files a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware and /dev/null differ diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf deleted file mode 100644 index 68b7925..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2011-2013 NVIDIA CORPORATION. All Rights Reserved. - -# -# This is the minimal configuration necessary to use the Tegra driver. -# Please refer to the xorg.conf man page for more configuration -# options provided by the X server, including display-related options -# provided by RandR 1.2 and higher. - -# Disable extensions not useful on Tegra. -Section "Module" - Disable "dri" - SubSection "extmod" - Option "omit xfree86-dga" - EndSubSection -EndSection - -Section "Device" - Identifier "Tegra0" - Driver "nvidia" - Option "NoLogo" "true" -EndSection - diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add deleted file mode 100644 index 0abe390..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add +++ /dev/null @@ -1,11 +0,0 @@ -Section "Monitor" - Identifier "DSI-1" - Option "DPMS" "false" -EndSection - -Section "ServerLayout" - Identifier "ServerLayout0" - Option "StandbyTime" "0" - Option "SuspendTime" "0" - Option "OffTime" "0" -EndSection diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend deleted file mode 100644 index 90bc0ae..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend +++ /dev/null @@ -1,99 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-driver-package:" - -SRC_URI_append_apalis-tk1 = " \ - file://xorg.conf \ - file://nvfb.service \ - file://nv.service \ -" -inherit systemd - -do_install_append_apalis-tk1 () { - rm ${D}/usr/lib/libGL.so - ln -sf libGL.so.1 ${D}/usr/lib/arm-linux-gnueabihf/tegra/libGL.so - - cp ${WORKDIR}/xorg.conf ${D}/etc/X11/ - install -d ${D}${systemd_unitdir}/system/ - install -m 0755 ${WORKDIR}/nvfb.service ${D}${systemd_unitdir}/system - install -m 0755 ${WORKDIR}/nv.service ${D}${systemd_unitdir}/system -} - -# deploy additional binaries from the nv_gst_apps tarball -PACKAGES_prepend = "${PN}-gstnvcamera ${PN}-gstnvvidconv-1.0 ${PN}-nvgstjpeg-1.0 ${PN}-gstnvvidconv-0.10 ${PN}-nvgstjpeg-0.10 ${PN}-nvgstapps " -RRECOMMENDS_${PN}_append = " ${PN}-gstnvcamera ${PN}-gstnvvidconv-1.0 ${PN}-nvgstjpeg-1.0 ${PN}-gstnvvidconv-0.10 ${PN}-nvgstjpeg-0.10 ${PN}-nvgstapps" - -DEPENDS = "gst-plugins-base" - -RDEPENDS_${PN}-gstnvcamera = "libgstvideo-1.0" -RDEPENDS_${PN}-gstnvvidconv-1.0 = "libgstvideo-1.0" -RDEPENDS_${PN}-gstnvvidconv-0.10 = "gstreamer" -RDEPENDS_${PN}-nvgstjpeg-1.0 = "libgstvideo-1.0" -RDEPENDS_${PN}-nvgstjpeg-0.10 = "gstreamer" -RDEPENDS_${PN}-nvgstapps = "libgstpbutils-1.0 gstreamer" - -FILES_${PN}-gstnvcamera = " \ - ${libdir}/gstreamer-1.0/libgstnvcamera.so \ -" - -FILES_${PN}-gstnvvidconv-1.0 = " \ - ${libdir}/gstreamer-1.0/libgstnvvidconv.so \ -" -FILES_${PN}-gstnvvidconv-0.10 = " \ - ${libdir}/gstreamer-0.10/libgstnvvidconv.so \ -" - -FILES_${PN}-nvgstjpeg-1.0 = " \ - ${libdir}/gstreamer-1.0/libnvgstjpeg.so \ -" -FILES_${PN}-nvgstjpeg-0.10 = " \ - ${libdir}/gstreamer-0.10/libnvgstjpeg.so \ -" - -FILES_${PN}-nvgstapps = " \ - ${bindir}/nvgstcapture-1.0 \ - ${bindir}/nvgstplayer-1.0 \ - ${bindir}/nvgstcapture-0.10 \ - ${bindir}/nvgstplayer-0.10 \ - ${docdir}/nvgst*README.txt \ -" - -FILES_${PN}-boot += " \ - ${systemd_unitdir}/system/nv.service \ -" - -FILES_${PN}-firstboot += "\ - ${systemd_unitdir}/system/nvfb.service \ -" - -#no gnu_hash in NVIDIA binaries, skip QA dev-so for this package -#we have symlinks ending in .so, skip QA ldflags for this package -#inhibit warnings about files being stripped -INSANE_SKIP_${PN} = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-gstnvcamera = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-gstnvvidconv-1.0 = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-nvgstjpeg-1.0 = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-gstnvvidconv-0.10 = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-nvgstjpeg-0.10 = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-nvgstapps = "build-deps dev-so ldflags already-stripped textrel" - -do_install_append () { - NV_SAMPLE=${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps - tar xjf ${NV_SAMPLE}/nvgstapps.tbz2 -C ${NV_SAMPLE} - install -d ${D}${bindir} ${D}${libdir}/gstreamer-1.0 ${D}${docdir} - install -d ${D}${libdir}/gstreamer-0.10 - install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstcapture-1.0 ${D}${bindir} - install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstplayer-1.0 ${D}${bindir} - install -m 0755 ${NV_SAMPLE}/nvgstcapture-1.0_README.txt ${D}${docdir} - install -m 0755 ${NV_SAMPLE}/nvgstplayer-1.0_README.txt ${D}${docdir} - install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstcapture-0.10 ${D}${bindir} - install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstplayer-0.10 ${D}${bindir} - install -m 0755 ${NV_SAMPLE}/nvgstcapture-0.10_README.txt ${D}${docdir} - install -m 0755 ${NV_SAMPLE}/nvgstplayer-0.10_README.txt ${D}${docdir} - - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvcamera.so ${D}${libdir}/gstreamer-1.0 - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvvidconv.so ${D}${libdir}/gstreamer-1.0 - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libnvgstjpeg.so ${D}${libdir}/gstreamer-1.0 - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-0.10/libgstnvvidconv.so ${D}${libdir}/gstreamer-0.10 - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-0.10/libnvgstjpeg.so ${D}${libdir}/gstreamer-0.10 -} - -SYSTEMD_SERVICE_${PN} = "nvfb.service nv.service" diff --git a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb b/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb deleted file mode 100755 index ab12b2d..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb +++ /dev/null @@ -1,102 +0,0 @@ -DESCRIPTION = "NVIDIA Linux Driver Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "Proprietary" - -SRC_URI = "http://developer.download.nvidia.com/embedded/L4T/r21_Release_v7.0/Tegra124_Linux_R21.7.0_armhf.tbz2 \ - file://xorg.conf.add \ - file://nv \ - file://nvfb \ - file://tegra_xusb_firmware \ - " - -LIC_FILES_CHKSUM = "file://nv_tegra/LICENSE;md5=60ad17cc726658e8cf73578bea47b85f" - -SRC_URI[md5sum] = "2139c0c7ecff94da68aef8a6ad0df20b" -SRC_URI[sha256sum] = "676add1e8e6b2fcf76d97f22f38c9d0cbbe8a92342039a85c8a4c87e8c1ce824" - -PR = "r7" - -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'update-rc.d', d)} - -INITSCRIPT_PACKAGES = "${PN}-boot ${PN}-firstboot" - -INITSCRIPT_NAME_${PN}-boot = "nv" -INITSCRIPT_PARAMS_${PN}-boot = "start 41 S . " - -INITSCRIPT_NAME_${PN}-firstboot = "nvfb" -INITSCRIPT_PARAMS_${PN}-firstboot = "start 40 S . " - -DEPENDS = "virtual/libx11 alsa-lib libxext" - -INSANE_SKIP_${PN} = "ldflags" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/Linux_for_Tegra" - - -PACKAGES =+ "${PN}-firmware ${PN}-boot ${PN}-firstboot" - -INSANE_SKIP_${PN}-dev = "ldflags" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${sysconfdir}/* ${sysconfdir}/*/*" -RRECOMMENDS_${PN} = "xserver-xorg-module-libwfb" -RDEPENDS_${PN} = "xserver-xorg bash" - -FILES_${PN}-firmware = "${base_libdir}/firmware/* ${base_libdir}/firmware/tegra12x/* " - -INHIBIT_PACKAGE_STRIP = "1" -#INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -INSANE_SKIP_${PN} += "dev-so" - -do_patch () { - mkdir -p ${WORKDIR}/l4tdrv - tar xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/config.tbz2 -C ${WORKDIR}/l4tdrv -} - -do_install () { - tar xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2 -C ${D} - cp -r ${WORKDIR}/tegra_xusb_firmware ${D}/lib/firmware/ - ln -sf ./libcuda.so.1.1 ${D}/usr/lib/arm-linux-gnueabihf/tegra/libcuda.so - ln -sf ./arm-linux-gnueabihf/tegra/libcuda.so ${D}/usr/lib/libcuda.so - ln -sf ./arm-linux-gnueabihf/tegra/libGL.so.1 ${D}/usr/lib/libGL.so - cp ${WORKDIR}/l4tdrv/etc/asound* ${D}/etc/ - cp -r ${WORKDIR}/l4tdrv/etc/udev ${D}/etc/ - mkdir ${D}/etc/X11/ - cp ${WORKDIR}/l4tdrv/etc/X11/xorg.conf* ${D}/etc/X11/ - cat ${WORKDIR}/l4tdrv/etc/X11/xorg.conf.jetson-tk1 ${WORKDIR}/xorg.conf.add > ${D}/etc/X11/xorg.conf.jetson-tk1 - - # install init scripts - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/nv ${D}${sysconfdir}/init.d/nv - install -m 0755 ${WORKDIR}/nvfb ${D}${sysconfdir}/init.d/nvfb - install -d ${D}${sysconfdir}/nv - touch ${D}${sysconfdir}/nv/nvfirstboot -} - -do_populate_sysroot () { - tar xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2 -C ${WORKDIR}/sysroot-destdir/ - rm ${WORKDIR}/sysroot-destdir/usr/lib/xorg/modules/extensions/libglx.so - mkdir ${WORKDIR}/sysroot-destdir/sysroot-providers - touch ${WORKDIR}/sysroot-destdir/sysroot-providers/${PN} -} - -# Function to add the relevant ABI dependency to drivers, which should be called# from a PACKAGEFUNC. -python add_xorg_abi_depends() { - mlprefix = d.getVar('MLPREFIX', True) or '' - abi = "%sxorg-abi-%s-%s" % (mlprefix, "video", "19") - - pn = d.getVar("PN", True) - d.appendVar('RDEPENDS_' + pn, ' ' + abi) -} -PACKAGEFUNCS =+ "add_xorg_abi_depends" - -FILES_${PN}-boot = " \ - ${sysconfdir}/init.d/nv \ -" - -FILES_${PN}-firstboot = "\ - ${sysconfdir}/init.d/nvfb \ - ${sysconfdir}/nv/nvfirstboot \ -" diff --git a/jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb b/jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb deleted file mode 100644 index b12c501..0000000 --- a/jetson-tk1/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "NVIDIA OpenCV4Tegra for L4T 21.x Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "Proprietary" - -SRC_URI = "http://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/003/linux-x64/libopencv4tegra-repo_2.4.13_armhf_l4t-r21.deb" - -LIC_FILES_CHKSUM = "file://usr/share/doc/libopencv4tegra-repo/copyright;md5=99d8c0c1313afdf990f6407c07a88407" - -SRC_URI[md5sum] = "0db305a4d24a9211606bb1fb8ec2d480" -SRC_URI[sha256sum] = "9bfa9d5df0c3218f5b4000c8d9d50d136cd8e6ad82384b7781719deb7093ae21" - -DEPENDS = "dpkg-native tiff zlib jpeg glib-2.0 python gtk+ libpng12 jasper libav cudatoolkit6.5" - -INSANE_SKIP_${PN} = "ldflags" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/opencv4tegra" - -INSANE_SKIP_${PN}-dev = "ldflags" - -FILES_${PN} = "${bindir}/* \ - ${datadir}/OpenCV/* \ - ${datadir}/lintian/* \ - ${libdir}/*" - -INHIBIT_PACKAGE_STRIP = "1" - -INSANE_SKIP_${PN} += "already-stripped dev-so" - -python do_unpack () { - locals = d.getVar('WORKDIR', True) - s = d.getVar('S', True) - d.setVar('WORKDIR', s) - d.setVar('S', s) - bb.build.exec_func('base_do_unpack', d) - d.setVar('WORKDIR', locals) -} - -do_install () { - cp -r ${WORKDIR}/opencv4tegra/usr ${D} - dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra_2.4.13_armhf.deb ${D} - dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra-dev_2.4.13_armhf.deb ${D} - dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra-python_2.4.13_armhf.deb ${D} -} diff --git a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch b/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch deleted file mode 100644 index 87a3112..0000000 --- a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ee80095e03efcb6ff62983939c3f7c49c291f12e Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Wed, 19 Sep 2018 20:37:47 +0000 -Subject: [PATCH] sysmacros.h: follow changed include files - -minor/major is no longer provided by sys/types.h. -explicitely include sysmacros.h where needed. - -Signed-off-by: Max Krummenacher ---- - hw/xfree86/common/xf86Xinput.c | 1 + - hw/xfree86/os-support/linux/lnx_init.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c -index 1fb5b16..4fc5a65 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -82,6 +82,7 @@ - #include - #include /* for int64_t */ - #include -+#include - #include - #include - #ifdef HAVE_SYS_MKDEV_H -diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c -index 4acaf33..ceae0f1 100644 ---- a/hw/xfree86/os-support/linux/lnx_init.c -+++ b/hw/xfree86/os-support/linux/lnx_init.c -@@ -37,6 +37,7 @@ - #include "xf86_OSlib.h" - - #include -+#include - - #ifndef K_OFF - #define K_OFF 0x4 --- -2.13.6 - diff --git a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch deleted file mode 100755 index ec0eea6..0000000 --- a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch +++ /dev/null @@ -1,25 +0,0 @@ -This is the revised version of files/macro_tweak.patch for -xorg-server 1.8.99.904 and newer. - -Upstream-Status: Pending - -Signed-off-by: Yu Ke - -diff --git a/xorg-server.m4 b/xorg-server.m4 -index bdecf62..040fdb8 100644 ---- a/xorg-server.m4 -+++ b/xorg-server.m4 -@@ -28,10 +28,12 @@ dnl - # Checks for the $1 define in xorg-server.h (from the sdk). If it - # is defined, then add $1 to $REQUIRED_MODULES. - -+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) -+ - AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" -+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "xorg-server.h" - #if !defined $1 diff --git a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb b/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb deleted file mode 100755 index 06632b6..0000000 --- a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb +++ /dev/null @@ -1,43 +0,0 @@ -require recipes-graphics/xorg-xserver/xserver-xorg.inc - -SRC_URI[md5sum] = "1509a9daae713895e7f5bcba8bcc05b2" -SRC_URI[sha256sum] = "0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457" - -SRC_URI += "file://0001-sysmacros.h-follow-changed-include-files.patch" - -# These extensions are now integrated into the server, so declare the migration -# path for in-place upgrades. - -RREPLACES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RPROVIDES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RCONFLICTS_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -# provided by xf86-input-evdev_2.10.0 -do_install_append () { - rm -f ${D}/usr/share/X11/xorg.conf.d/10-evdev.conf -} - -# override setting from xserver-xorg.inc which only applies to version 1.18. -#| checking for PIXMAN... yes -#| checking for SYSTEMD_DAEMON... no -#| configure: error: systemd support requested but no library has been found -#| ERROR: Function failed: do_configure (log file is located at /build/krm/oe-core_V2.6.2/build/tmp-glibc/work/armv7at2hf-neon-angstrom-linux-gnueabi/xserver-xorg/2_1.17.2-r0/temp/log.do_configure.2158) - -PACKAGECONFIG ?= "dri2 udev ${XORG_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ -" diff --git a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend b/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend deleted file mode 100644 index 9a577a8..0000000 --- a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend +++ /dev/null @@ -1,26 +0,0 @@ -# always latest and greatest. -PE_tegra124 = "99" - -PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" - -COMPATIBLE_MACHINE = "(apalis-tk1|jetson-tk1|jetson-tk1-l4t)" - -DEPENDS_append = " libxfont" - -# provided by xf86-input-evdev_2.10.0 -do_install_append () { - rm -f ${D}/usr/share/X11/xorg.conf.d/10-evdev.conf -} - -#| checking for PIXMAN... yes -#| checking for SYSTEMD_DAEMON... no -#| configure: error: systemd support requested but no library has been found -#| ERROR: Function failed: do_configure (log file is located at .../xserver-xorg/2_1.17.2-r0/temp/log.do_configure.2158) - -PACKAGECONFIG ?= "dri2 udev ${XORG_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ -" - -# The NVidia driver needs this enabled. -PACKAGECONFIG_append = " xinerama " diff --git a/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb b/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb new file mode 100644 index 0000000..6bb8657 --- /dev/null +++ b/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "NVIDIA CUDA 6.5 Toolkit for L4T Rel 21.x Packages" +HOMEPAGE = "https://developer.nvidia.com/" +LICENSE = "Proprietary" + +SRC_URI = "http://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/005/linux-x64/cuda-repo-l4t-r21.5-6-5-local_6.5-53_armhf.deb" + +LIC_FILES_CHKSUM = "file://usr/share/doc/cuda-repo-l4t-r21.5-6-5-local/copyright;md5=f87877410d6936081b0b8ddd124ca96d" + +SRC_URI[md5sum] = "93b5c6592292565c389c46a16b4cbf5d" +SRC_URI[sha256sum] = "4739c63e16b9a169f988c2b8f175c0182fa118833b49950fe72fe8c039ba1359" + +DEPENDS = "dpkg-native" + +INSANE_SKIP_${PN} = "ldflags" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +S = "${WORKDIR}/cuda6.5" + +INSANE_SKIP_${PN}-dev = "ldflags" + +FILES_${PN} = "${datadir}/lintian/* \ + ${base_prefix}/usr/local/cuda-6.5/* " + +INHIBIT_PACKAGE_STRIP = "1" + +INSANE_SKIP_${PN} += "already-stripped dev-so libdir" + +python do_unpack () { + locals = d.getVar('WORKDIR', True) + s = d.getVar('S', True) + d.setVar('WORKDIR', s) + d.setVar('S', s) + bb.build.exec_func('base_do_unpack', d) + d.setVar('WORKDIR', locals) +} + +do_install () { + cp -r ${WORKDIR}/cuda6.5/usr ${D} + dpkg -x ${WORKDIR}/cuda6.5/var/cuda-repo-6-5-local/cuda-cudart-6-5_6.5-53_armhf.deb ${D} +} diff --git a/recipes-bsp/binary-drivers/linux-driver-package/nv b/recipes-bsp/binary-drivers/linux-driver-package/nv new file mode 100755 index 0000000..2221688 --- /dev/null +++ b/recipes-bsp/binary-drivers/linux-driver-package/nv @@ -0,0 +1,87 @@ +#!/bin/sh +#"NVIDIA specific init script" + +nvexec() { + # power state + if [ -e /sys/power/state ]; then + chmod 0666 /sys/power/state + fi + + # Set minimum cpu freq. + if [ -e /sys/devices/soc0/family ]; then + SOCFAMILY="`cat /sys/devices/soc0/family`" + fi + + if [ "$SOCFAMILY" = "Tegra13" ] && + [ -e /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq ]; then + sudo bash -c "echo -n 510000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq" + fi + + # CPU hotplugging + if [ -d /sys/devices/system/cpu/cpuquiet/tegra_cpuquiet ] ; then + echo 500 > /sys/devices/system/cpu/cpuquiet/tegra_cpuquiet/down_delay + echo 1 > /sys/devices/system/cpu/cpuquiet/tegra_cpuquiet/enable + elif [ -w /sys/module/cpu_tegra3/parameters/auto_hotplug ] ; then + # compatibility for prior kernels without cpuquiet support + echo 1 > /sys/module/cpu_tegra3/parameters/auto_hotplug + fi + + # lp2 idle state + if [ -e /sys/module/cpuidle/parameters/power_down_in_idle ] ; then + echo "Y" > /sys/module/cpuidle/parameters/power_down_in_idle + elif [ -e /sys/module/cpuidle/parameters/lp2_in_idle ] ; then + # compatibility for prior kernels + echo "Y" > /sys/module/cpuidle/parameters/lp2_in_idle + fi + + #FIXME remove once kernel CL merges into main Bug 1231069 + for uartInst in 0 1 2 3 + do + uartNode="/dev/ttyHS$uartInst" + if [ -e "$uartNode" ]; then + ln -s /dev/ttyHS$uartInst /dev/ttyTHS$uartInst + fi + done + # remove power to dc.0 for jetson-tk1 + machine=`cat /sys/devices/soc0/machine` + if [ "${machine}" = "jetson-tk1" ] ; then + echo 4 > /sys/class/graphics/fb0/blank + if [ -e /sys/devices/platform/tegra-otg/enable_device ] ; then + echo 0 > /sys/devices/platform/tegra-otg/enable_device + fi + if [ -e /sys/devices/platform/tegra-otg/enable_host ] ; then + echo 1 > /sys/devices/platform/tegra-otg/enable_host + fi + fi + + # CPU frequency governor + if [ -e /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors ]; then + read governors < /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors + case $governors in + *interactive*) + echo interactive > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + if [ -e /sys/devices/system/cpu/cpufreq/interactive ] ; then + echo "1224000" > /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq + echo "95" > /sys/devices/system/cpu/cpufreq/interactive/target_loads + echo "20000" > /sys/devices/system/cpu/cpufreq/interactive/min_sample_time + fi + ;; + *) + ;; + esac + fi + + # CPU frequency boost on input event + if [ -e /sys/module/input_cfboost/parameters/boost_freq ]; then + echo "1224000" > /sys/module/input_cfboost/parameters/boost_freq + fi +} + +case "$1" in + start) + nvexec + exit 0 + ;; + *) + exit 1 +esac diff --git a/recipes-bsp/binary-drivers/linux-driver-package/nv.service b/recipes-bsp/binary-drivers/linux-driver-package/nv.service new file mode 100644 index 0000000..3fab9b2 --- /dev/null +++ b/recipes-bsp/binary-drivers/linux-driver-package/nv.service @@ -0,0 +1,18 @@ +[Unit] +Description=Nvidia binary driver init script +After=nvfb.service + +[Install] +WantedBy=multi-user.target + +[Service] +Type=forking +Restart=no +TimeoutSec=5min +IgnoreSIGPIPE=no +KillMode=process +GuessMainPID=no +RemainAfterExit=yes +ExecStart=/etc/init.d/nv start +ExecStop=/etc/init.d/nv stop + diff --git a/recipes-bsp/binary-drivers/linux-driver-package/nvfb b/recipes-bsp/binary-drivers/linux-driver-package/nvfb new file mode 100755 index 0000000..e5f4502 --- /dev/null +++ b/recipes-bsp/binary-drivers/linux-driver-package/nvfb @@ -0,0 +1,25 @@ +#!/bin/sh +#"specific first-boot script" + +nvexec() { + RET=0 + if [ ! -e /etc/nv/nvfirstboot ]; then + RET=0 + else + echo "/usr/lib/arm-linux-gnueabihf/tegra" >> /etc/ld.so.conf + echo "/usr/lib/arm-linux-gnueabihf/tegra-egl" >> /etc/ld.so.conf + + ldconfig + rm -rf /etc/nv/nvfirstboot + fi + exit $RET +} + +case "$1" in + start) + nvexec + exit 0 + ;; + *) + exit 1 +esac diff --git a/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service b/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service new file mode 100644 index 0000000..4d923da --- /dev/null +++ b/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service @@ -0,0 +1,17 @@ +[Unit] +Description=Nvidia binary driver first-boot script +Before=nv.service + +[Install] +WantedBy=multi-user.target + +[Service] +Type=forking +Restart=no +TimeoutSec=5min +IgnoreSIGPIPE=no +KillMode=process +GuessMainPID=no +RemainAfterExit=yes +ExecStart=/etc/init.d/nvfb start +ExecStop=/etc/init.d/nvfb stop diff --git a/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware b/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware new file mode 100644 index 0000000..7a18086 Binary files /dev/null and b/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware differ diff --git a/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf b/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf new file mode 100644 index 0000000..68b7925 --- /dev/null +++ b/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf @@ -0,0 +1,22 @@ +# Copyright (c) 2011-2013 NVIDIA CORPORATION. All Rights Reserved. + +# +# This is the minimal configuration necessary to use the Tegra driver. +# Please refer to the xorg.conf man page for more configuration +# options provided by the X server, including display-related options +# provided by RandR 1.2 and higher. + +# Disable extensions not useful on Tegra. +Section "Module" + Disable "dri" + SubSection "extmod" + Option "omit xfree86-dga" + EndSubSection +EndSection + +Section "Device" + Identifier "Tegra0" + Driver "nvidia" + Option "NoLogo" "true" +EndSection + diff --git a/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add b/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add new file mode 100644 index 0000000..0abe390 --- /dev/null +++ b/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add @@ -0,0 +1,11 @@ +Section "Monitor" + Identifier "DSI-1" + Option "DPMS" "false" +EndSection + +Section "ServerLayout" + Identifier "ServerLayout0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" +EndSection diff --git a/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend b/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend new file mode 100644 index 0000000..90bc0ae --- /dev/null +++ b/recipes-bsp/binary-drivers/linux-driver-package_21.%.bbappend @@ -0,0 +1,99 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-driver-package:" + +SRC_URI_append_apalis-tk1 = " \ + file://xorg.conf \ + file://nvfb.service \ + file://nv.service \ +" +inherit systemd + +do_install_append_apalis-tk1 () { + rm ${D}/usr/lib/libGL.so + ln -sf libGL.so.1 ${D}/usr/lib/arm-linux-gnueabihf/tegra/libGL.so + + cp ${WORKDIR}/xorg.conf ${D}/etc/X11/ + install -d ${D}${systemd_unitdir}/system/ + install -m 0755 ${WORKDIR}/nvfb.service ${D}${systemd_unitdir}/system + install -m 0755 ${WORKDIR}/nv.service ${D}${systemd_unitdir}/system +} + +# deploy additional binaries from the nv_gst_apps tarball +PACKAGES_prepend = "${PN}-gstnvcamera ${PN}-gstnvvidconv-1.0 ${PN}-nvgstjpeg-1.0 ${PN}-gstnvvidconv-0.10 ${PN}-nvgstjpeg-0.10 ${PN}-nvgstapps " +RRECOMMENDS_${PN}_append = " ${PN}-gstnvcamera ${PN}-gstnvvidconv-1.0 ${PN}-nvgstjpeg-1.0 ${PN}-gstnvvidconv-0.10 ${PN}-nvgstjpeg-0.10 ${PN}-nvgstapps" + +DEPENDS = "gst-plugins-base" + +RDEPENDS_${PN}-gstnvcamera = "libgstvideo-1.0" +RDEPENDS_${PN}-gstnvvidconv-1.0 = "libgstvideo-1.0" +RDEPENDS_${PN}-gstnvvidconv-0.10 = "gstreamer" +RDEPENDS_${PN}-nvgstjpeg-1.0 = "libgstvideo-1.0" +RDEPENDS_${PN}-nvgstjpeg-0.10 = "gstreamer" +RDEPENDS_${PN}-nvgstapps = "libgstpbutils-1.0 gstreamer" + +FILES_${PN}-gstnvcamera = " \ + ${libdir}/gstreamer-1.0/libgstnvcamera.so \ +" + +FILES_${PN}-gstnvvidconv-1.0 = " \ + ${libdir}/gstreamer-1.0/libgstnvvidconv.so \ +" +FILES_${PN}-gstnvvidconv-0.10 = " \ + ${libdir}/gstreamer-0.10/libgstnvvidconv.so \ +" + +FILES_${PN}-nvgstjpeg-1.0 = " \ + ${libdir}/gstreamer-1.0/libnvgstjpeg.so \ +" +FILES_${PN}-nvgstjpeg-0.10 = " \ + ${libdir}/gstreamer-0.10/libnvgstjpeg.so \ +" + +FILES_${PN}-nvgstapps = " \ + ${bindir}/nvgstcapture-1.0 \ + ${bindir}/nvgstplayer-1.0 \ + ${bindir}/nvgstcapture-0.10 \ + ${bindir}/nvgstplayer-0.10 \ + ${docdir}/nvgst*README.txt \ +" + +FILES_${PN}-boot += " \ + ${systemd_unitdir}/system/nv.service \ +" + +FILES_${PN}-firstboot += "\ + ${systemd_unitdir}/system/nvfb.service \ +" + +#no gnu_hash in NVIDIA binaries, skip QA dev-so for this package +#we have symlinks ending in .so, skip QA ldflags for this package +#inhibit warnings about files being stripped +INSANE_SKIP_${PN} = "build-deps dev-so ldflags already-stripped textrel" +INSANE_SKIP_${PN}-gstnvcamera = "build-deps dev-so ldflags already-stripped textrel" +INSANE_SKIP_${PN}-gstnvvidconv-1.0 = "build-deps dev-so ldflags already-stripped textrel" +INSANE_SKIP_${PN}-nvgstjpeg-1.0 = "build-deps dev-so ldflags already-stripped textrel" +INSANE_SKIP_${PN}-gstnvvidconv-0.10 = "build-deps dev-so ldflags already-stripped textrel" +INSANE_SKIP_${PN}-nvgstjpeg-0.10 = "build-deps dev-so ldflags already-stripped textrel" +INSANE_SKIP_${PN}-nvgstapps = "build-deps dev-so ldflags already-stripped textrel" + +do_install_append () { + NV_SAMPLE=${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps + tar xjf ${NV_SAMPLE}/nvgstapps.tbz2 -C ${NV_SAMPLE} + install -d ${D}${bindir} ${D}${libdir}/gstreamer-1.0 ${D}${docdir} + install -d ${D}${libdir}/gstreamer-0.10 + install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstcapture-1.0 ${D}${bindir} + install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstplayer-1.0 ${D}${bindir} + install -m 0755 ${NV_SAMPLE}/nvgstcapture-1.0_README.txt ${D}${docdir} + install -m 0755 ${NV_SAMPLE}/nvgstplayer-1.0_README.txt ${D}${docdir} + install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstcapture-0.10 ${D}${bindir} + install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstplayer-0.10 ${D}${bindir} + install -m 0755 ${NV_SAMPLE}/nvgstcapture-0.10_README.txt ${D}${docdir} + install -m 0755 ${NV_SAMPLE}/nvgstplayer-0.10_README.txt ${D}${docdir} + + install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvcamera.so ${D}${libdir}/gstreamer-1.0 + install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvvidconv.so ${D}${libdir}/gstreamer-1.0 + install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libnvgstjpeg.so ${D}${libdir}/gstreamer-1.0 + install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-0.10/libgstnvvidconv.so ${D}${libdir}/gstreamer-0.10 + install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-0.10/libnvgstjpeg.so ${D}${libdir}/gstreamer-0.10 +} + +SYSTEMD_SERVICE_${PN} = "nvfb.service nv.service" diff --git a/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb b/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb new file mode 100755 index 0000000..ab12b2d --- /dev/null +++ b/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb @@ -0,0 +1,102 @@ +DESCRIPTION = "NVIDIA Linux Driver Packages" +HOMEPAGE = "https://developer.nvidia.com/" +LICENSE = "Proprietary" + +SRC_URI = "http://developer.download.nvidia.com/embedded/L4T/r21_Release_v7.0/Tegra124_Linux_R21.7.0_armhf.tbz2 \ + file://xorg.conf.add \ + file://nv \ + file://nvfb \ + file://tegra_xusb_firmware \ + " + +LIC_FILES_CHKSUM = "file://nv_tegra/LICENSE;md5=60ad17cc726658e8cf73578bea47b85f" + +SRC_URI[md5sum] = "2139c0c7ecff94da68aef8a6ad0df20b" +SRC_URI[sha256sum] = "676add1e8e6b2fcf76d97f22f38c9d0cbbe8a92342039a85c8a4c87e8c1ce824" + +PR = "r7" + +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'update-rc.d', d)} + +INITSCRIPT_PACKAGES = "${PN}-boot ${PN}-firstboot" + +INITSCRIPT_NAME_${PN}-boot = "nv" +INITSCRIPT_PARAMS_${PN}-boot = "start 41 S . " + +INITSCRIPT_NAME_${PN}-firstboot = "nvfb" +INITSCRIPT_PARAMS_${PN}-firstboot = "start 40 S . " + +DEPENDS = "virtual/libx11 alsa-lib libxext" + +INSANE_SKIP_${PN} = "ldflags" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +S = "${WORKDIR}/Linux_for_Tegra" + + +PACKAGES =+ "${PN}-firmware ${PN}-boot ${PN}-firstboot" + +INSANE_SKIP_${PN}-dev = "ldflags" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${sysconfdir}/* ${sysconfdir}/*/*" +RRECOMMENDS_${PN} = "xserver-xorg-module-libwfb" +RDEPENDS_${PN} = "xserver-xorg bash" + +FILES_${PN}-firmware = "${base_libdir}/firmware/* ${base_libdir}/firmware/tegra12x/* " + +INHIBIT_PACKAGE_STRIP = "1" +#INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +INSANE_SKIP_${PN} += "dev-so" + +do_patch () { + mkdir -p ${WORKDIR}/l4tdrv + tar xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/config.tbz2 -C ${WORKDIR}/l4tdrv +} + +do_install () { + tar xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2 -C ${D} + cp -r ${WORKDIR}/tegra_xusb_firmware ${D}/lib/firmware/ + ln -sf ./libcuda.so.1.1 ${D}/usr/lib/arm-linux-gnueabihf/tegra/libcuda.so + ln -sf ./arm-linux-gnueabihf/tegra/libcuda.so ${D}/usr/lib/libcuda.so + ln -sf ./arm-linux-gnueabihf/tegra/libGL.so.1 ${D}/usr/lib/libGL.so + cp ${WORKDIR}/l4tdrv/etc/asound* ${D}/etc/ + cp -r ${WORKDIR}/l4tdrv/etc/udev ${D}/etc/ + mkdir ${D}/etc/X11/ + cp ${WORKDIR}/l4tdrv/etc/X11/xorg.conf* ${D}/etc/X11/ + cat ${WORKDIR}/l4tdrv/etc/X11/xorg.conf.jetson-tk1 ${WORKDIR}/xorg.conf.add > ${D}/etc/X11/xorg.conf.jetson-tk1 + + # install init scripts + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/nv ${D}${sysconfdir}/init.d/nv + install -m 0755 ${WORKDIR}/nvfb ${D}${sysconfdir}/init.d/nvfb + install -d ${D}${sysconfdir}/nv + touch ${D}${sysconfdir}/nv/nvfirstboot +} + +do_populate_sysroot () { + tar xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2 -C ${WORKDIR}/sysroot-destdir/ + rm ${WORKDIR}/sysroot-destdir/usr/lib/xorg/modules/extensions/libglx.so + mkdir ${WORKDIR}/sysroot-destdir/sysroot-providers + touch ${WORKDIR}/sysroot-destdir/sysroot-providers/${PN} +} + +# Function to add the relevant ABI dependency to drivers, which should be called# from a PACKAGEFUNC. +python add_xorg_abi_depends() { + mlprefix = d.getVar('MLPREFIX', True) or '' + abi = "%sxorg-abi-%s-%s" % (mlprefix, "video", "19") + + pn = d.getVar("PN", True) + d.appendVar('RDEPENDS_' + pn, ' ' + abi) +} +PACKAGEFUNCS =+ "add_xorg_abi_depends" + +FILES_${PN}-boot = " \ + ${sysconfdir}/init.d/nv \ +" + +FILES_${PN}-firstboot = "\ + ${sysconfdir}/init.d/nvfb \ + ${sysconfdir}/nv/nvfirstboot \ +" diff --git a/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb b/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb new file mode 100644 index 0000000..b12c501 --- /dev/null +++ b/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "NVIDIA OpenCV4Tegra for L4T 21.x Packages" +HOMEPAGE = "https://developer.nvidia.com/" +LICENSE = "Proprietary" + +SRC_URI = "http://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/003/linux-x64/libopencv4tegra-repo_2.4.13_armhf_l4t-r21.deb" + +LIC_FILES_CHKSUM = "file://usr/share/doc/libopencv4tegra-repo/copyright;md5=99d8c0c1313afdf990f6407c07a88407" + +SRC_URI[md5sum] = "0db305a4d24a9211606bb1fb8ec2d480" +SRC_URI[sha256sum] = "9bfa9d5df0c3218f5b4000c8d9d50d136cd8e6ad82384b7781719deb7093ae21" + +DEPENDS = "dpkg-native tiff zlib jpeg glib-2.0 python gtk+ libpng12 jasper libav cudatoolkit6.5" + +INSANE_SKIP_${PN} = "ldflags" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +S = "${WORKDIR}/opencv4tegra" + +INSANE_SKIP_${PN}-dev = "ldflags" + +FILES_${PN} = "${bindir}/* \ + ${datadir}/OpenCV/* \ + ${datadir}/lintian/* \ + ${libdir}/*" + +INHIBIT_PACKAGE_STRIP = "1" + +INSANE_SKIP_${PN} += "already-stripped dev-so" + +python do_unpack () { + locals = d.getVar('WORKDIR', True) + s = d.getVar('S', True) + d.setVar('WORKDIR', s) + d.setVar('S', s) + bb.build.exec_func('base_do_unpack', d) + d.setVar('WORKDIR', locals) +} + +do_install () { + cp -r ${WORKDIR}/opencv4tegra/usr ${D} + dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra_2.4.13_armhf.deb ${D} + dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra-dev_2.4.13_armhf.deb ${D} + dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra-python_2.4.13_armhf.deb ${D} +} diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch new file mode 100644 index 0000000..87a3112 --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch @@ -0,0 +1,41 @@ +From ee80095e03efcb6ff62983939c3f7c49c291f12e Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Wed, 19 Sep 2018 20:37:47 +0000 +Subject: [PATCH] sysmacros.h: follow changed include files + +minor/major is no longer provided by sys/types.h. +explicitely include sysmacros.h where needed. + +Signed-off-by: Max Krummenacher +--- + hw/xfree86/common/xf86Xinput.c | 1 + + hw/xfree86/os-support/linux/lnx_init.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c +index 1fb5b16..4fc5a65 100644 +--- a/hw/xfree86/common/xf86Xinput.c ++++ b/hw/xfree86/common/xf86Xinput.c +@@ -82,6 +82,7 @@ + #include + #include /* for int64_t */ + #include ++#include + #include + #include + #ifdef HAVE_SYS_MKDEV_H +diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c +index 4acaf33..ceae0f1 100644 +--- a/hw/xfree86/os-support/linux/lnx_init.c ++++ b/hw/xfree86/os-support/linux/lnx_init.c +@@ -37,6 +37,7 @@ + #include "xf86_OSlib.h" + + #include ++#include + + #ifndef K_OFF + #define K_OFF 0x4 +-- +2.13.6 + diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch new file mode 100755 index 0000000..ec0eea6 --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch @@ -0,0 +1,25 @@ +This is the revised version of files/macro_tweak.patch for +xorg-server 1.8.99.904 and newer. + +Upstream-Status: Pending + +Signed-off-by: Yu Ke + +diff --git a/xorg-server.m4 b/xorg-server.m4 +index bdecf62..040fdb8 100644 +--- a/xorg-server.m4 ++++ b/xorg-server.m4 +@@ -28,10 +28,12 @@ dnl + # Checks for the $1 define in xorg-server.h (from the sdk). If it + # is defined, then add $1 to $REQUIRED_MODULES. + ++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) ++ + AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" ++ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "xorg-server.h" + #if !defined $1 diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb new file mode 100755 index 0000000..06632b6 --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb @@ -0,0 +1,43 @@ +require recipes-graphics/xorg-xserver/xserver-xorg.inc + +SRC_URI[md5sum] = "1509a9daae713895e7f5bcba8bcc05b2" +SRC_URI[sha256sum] = "0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457" + +SRC_URI += "file://0001-sysmacros.h-follow-changed-include-files.patch" + +# These extensions are now integrated into the server, so declare the migration +# path for in-place upgrades. + +RREPLACES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RPROVIDES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RCONFLICTS_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +# provided by xf86-input-evdev_2.10.0 +do_install_append () { + rm -f ${D}/usr/share/X11/xorg.conf.d/10-evdev.conf +} + +# override setting from xserver-xorg.inc which only applies to version 1.18. +#| checking for PIXMAN... yes +#| checking for SYSTEMD_DAEMON... no +#| configure: error: systemd support requested but no library has been found +#| ERROR: Function failed: do_configure (log file is located at /build/krm/oe-core_V2.6.2/build/tmp-glibc/work/armv7at2hf-neon-angstrom-linux-gnueabi/xserver-xorg/2_1.17.2-r0/temp/log.do_configure.2158) + +PACKAGECONFIG ?= "dri2 udev ${XORG_CRYPTO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ +" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend new file mode 100644 index 0000000..9a577a8 --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend @@ -0,0 +1,26 @@ +# always latest and greatest. +PE_tegra124 = "99" + +PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" + +COMPATIBLE_MACHINE = "(apalis-tk1|jetson-tk1|jetson-tk1-l4t)" + +DEPENDS_append = " libxfont" + +# provided by xf86-input-evdev_2.10.0 +do_install_append () { + rm -f ${D}/usr/share/X11/xorg.conf.d/10-evdev.conf +} + +#| checking for PIXMAN... yes +#| checking for SYSTEMD_DAEMON... no +#| configure: error: systemd support requested but no library has been found +#| ERROR: Function failed: do_configure (log file is located at .../xserver-xorg/2_1.17.2-r0/temp/log.do_configure.2158) + +PACKAGECONFIG ?= "dri2 udev ${XORG_CRYPTO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ +" + +# The NVidia driver needs this enabled. +PACKAGECONFIG_append = " xinerama " -- cgit v1.2.3