diff options
164 files changed, 832 insertions, 1565 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf index 98fb5294..b4f4eef4 100644 --- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf +++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf @@ -44,7 +44,3 @@ SERIAL_CONSOLES = "115200;ttymxc0 \ 115200;ttymxc1" KERNEL_MODULE_AUTOLOAD += "atmel_mxt_ts" - -PREFERRED_VERSION_imx-gpu-viv = "6.2.4.p1.2-aarch32" -PREFERRED_VERSION_imx-gpu-g2d = "6.2.4.p1.2" -PREFERRED_VERSION_kernel-module-imx-gpu-viv = "6.2.4.p1.2" diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf index 1fade70d..265d24f8 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf @@ -40,6 +40,3 @@ IMAGE_BOOT_FILES += " \ SPL-${MACHINE}-spl;${MACHINEDIR}/SPL \ " -PREFERRED_VERSION_imx-gpu-viv = "6.2.4.p1.2-aarch32" -PREFERRED_VERSION_imx-gpu-g2d = "6.2.4.p1.2" -PREFERRED_VERSION_kernel-module-imx-gpu-viv = "6.2.4.p1.2" diff --git a/meta-boot2qt-distro/conf/distro/include/draak.conf b/meta-boot2qt-distro/conf/distro/include/draak.conf index daf68f78..4d9db182 100644 --- a/meta-boot2qt-distro/conf/distro/include/draak.conf +++ b/meta-boot2qt-distro/conf/distro/include/draak.conf @@ -32,7 +32,7 @@ include conf/distro/include/rcar-gen3.inc DEPLOY_CONF_NAME = "Renesas R-Car-D3 (Draak)" PREFERRED_PROVIDER_virtual/egl = "gles-user-module" -PREFERRED_VERSION_libdrm = "2.4.91" +PREFERRED_VERSION_libdrm = "2.4.94" KERNEL_DEVICETREE += "renesas/r8a77995-draak-lvds.dtb" @@ -41,9 +41,10 @@ QBSP_IMAGE_CONTENT_remove = "tee-${MACHINE}.srec" BBMASK += "\ meta-rcar-gen3/recipes-connectivity/ppp \ + meta-rcar-gen3/recipes-graphics/wayland/wayland_1.11.0.bb \ meta-rcar-gen3/recipes-graphics/wayland/wayland-protocols \ meta-rcar-gen3/recipes-multimedia/gstreamer \ meta-rcar-gen3/recipes-multimedia/webp \ meta-renesas/meta-rcar-gen3/recipes-graphics/drm \ - meta-renesas-extras/recipes/arm-trusted-firmware \ + meta-renesas-extras/recipes-bsp/arm-trusted-firmware \ " diff --git a/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf index ddb40e01..2c73a11a 100644 --- a/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf +++ b/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -30,3 +30,5 @@ include conf/distro/include/rcar-gen3.inc DEPLOY_CONF_NAME = "Renesas R-Car-H3 Starter Kit Premier" + +UBOOT_MACHINE = "r8a7795_ulcb_defconfig" diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc index 3212cb96..b2b38ffc 100644 --- a/meta-boot2qt-distro/conf/distro/include/jetson.inc +++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -41,3 +41,6 @@ QBSP_IMAGE_CONTENT = "\ ${IMAGE_LINK_NAME}.conf \ ${IMAGE_LINK_NAME}.flasher.tar.gz \ " + +# NVIDIA's Vulkan support is for X only +DISTRO_FEATURES_remove = "vulkan" diff --git a/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf index cff78935..d886adda 100644 --- a/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf +++ b/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -30,3 +30,5 @@ include conf/distro/include/rcar-gen3.inc DEPLOY_CONF_NAME = "Renesas R-Car-M3 Starter Kit Pro" + +UBOOT_MACHINE = "r8a7796_ulcb_defconfig" diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc index 65faba43..4fa2e4c9 100644 --- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc +++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc @@ -53,3 +53,5 @@ KERNEL_DEVICETREE += "\ overlays/mcp2515-can0.dtbo \ overlays/mcp2515-can1.dtbo \ " + +BBMASK += "dynamic-layers/qt5-layer/recipes-qt/qt5" diff --git a/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc index 6b99603f..bcf2268b 100644 --- a/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc +++ b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -74,4 +74,11 @@ FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen3/${PN}:" BBMASK += "\ meta-linaro/meta-optee/recipes-security/optee \ meta-rcar-gen3/recipes-core/packagegroups \ + meta-rcar-gen3/recipes-devtools/perl \ + meta-rcar-gen3/recipes-graphics/wayland/weston \ + meta-rcar-gen3/recipes-graphics/xorg-xserver \ + meta-rcar-gen3/recipes-multimedia/alsa \ + meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bbappend \ + meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bbappend \ + meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bbappend \ " diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index 9a252d08..95a52eee 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -34,8 +34,10 @@ require conf/machine/include/${MACHINE}.inc BBMASK += "\ meta-toradex-nxp/recipes-graphics/xorg-xserver \ + meta-toradex-nxp/recipes-multimedia/gstreamer \ meta-toradex-bsp-common/recipes-devtools/python \ meta-toradex-bsp-common/recipes-devtools/e2fsprogs \ + meta-toradex-bsp-common/recipes-core/systemd \ " PREFERRED_PROVIDER_u-boot = "u-boot-toradex" @@ -49,3 +51,11 @@ IMAGE_BOOT_FILES += " \ fwd_mmc.img;flash_mmc.img \ ${MACHINE}/*;${MACHINEDIR}/ \ " + +# use 1.14.0 that matches the imx version of gstreamer +PREFERRED_VERSION_gstreamer1.0-plugins-ugly = "1.14.0" +PREFERRED_VERSION_gstreamer1.0-libav = "1.14.0" + +# override tezi bbclass +IMAGE_CLASSES_remove = " image_type_tezi" +IMAGE_CLASSES_append = " image_type_tezi_thud" diff --git a/meta-boot2qt-distro/conf/layer.conf b/meta-boot2qt-distro/conf/layer.conf index d9ededa1..4a6a22e5 100644 --- a/meta-boot2qt-distro/conf/layer.conf +++ b/meta-boot2qt-distro/conf/layer.conf @@ -34,10 +34,9 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ ${LAYERDIR}/recipes*/*/*.bbappend \ " -BBMASK += "meta-qt5/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_%.bbappend" BBFILE_COLLECTIONS += "b2qt-distro" BBFILE_PATTERN_b2qt-distro := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt-distro = "20" -LAYERSERIES_COMPAT_b2qt-distro = "sumo" +LAYERSERIES_COMPAT_b2qt-distro = "thud" diff --git a/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend index 4e55e66f..57bb05c9 100644 --- a/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend +++ b/meta-boot2qt-distro/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend @@ -53,4 +53,5 @@ EOF do_install_append_sdkmingw32() { ln -s ../python35.dll ${D}${bindir}/ ln -s ../python35.zip ${D}${bindir}/ + ln -s ../libwinpthread-1.dll ${D}${bindir}/ } diff --git a/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg index aba82daa..81f7be96 100644 --- a/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg +++ b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg @@ -1 +1 @@ -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y diff --git a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index 0271b6d5..37c9ca74 100644 --- a/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/meta-boot2qt-distro/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -28,19 +28,3 @@ ############################################################################ PACKAGECONFIG_append = " faad" - -inherit qmake5_paths - -PACKAGECONFIG[qt5] = '--enable-qt \ - --with-moc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc" \ - --with-uic="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic" \ - --with-rcc="${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc" \ - ,--disable-qt,qtbase qtdeclarative qtbase-native' - -# The GStreamer Qt5 plugin needs desktop OpenGL or OpenGL ES to work, so make sure it is enabled -python() { - cur_packageconfig = d.getVar('PACKAGECONFIG',True).split() - if 'qt5' in cur_packageconfig and not (('opengl' in cur_packageconfig) or ('gles2' in cur_packageconfig)): - gl_packageconfig = d.getVar('PACKAGECONFIG_GL',True) - d.appendVar('PACKAGECONFIG', ' ' + gl_packageconfig) -} diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 9fac3f68..e661154e 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -37,17 +37,20 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" MACHINE_EXTRA_INSTALL_SDK ?= "" +GCC-SANITIZERS ?= "gcc-sanitizers" +GCC-SANITIZERS_mipsarch = "" +GCC-SANITIZERS_libc-musl = "" + RDEPENDS_${PN} += " \ ${MACHINE_EXTRA_INSTALL_SDK} \ packagegroup-core-standalone-sdk-target \ - ${@contains_regex('MACHINEOVERRIDES', '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64)', 'gcc-sanitizers', '', d)} \ + ${GCC-SANITIZERS} \ \ qt3d-dev \ qt3d-runtime-dev \ qtbase-dev \ qtbase-staticdev \ qtbase-doc \ - qtcanvas3d-dev \ qtcharts-dev \ qtconnectivity-dev \ qtdatavis3d-dev \ diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 6b78a823..95086995 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -39,7 +39,6 @@ RDEPENDS_${PN} += " \ qt3d-runtime \ qt3d-runtime-tools \ qtbase \ - qtcanvas3d \ qtcharts \ qtconnectivity \ qtdatavis3d \ diff --git a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 36b44097..1296c18b 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -38,11 +38,10 @@ PACKAGECONFIG_remove_mingw32 += "openssl" PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" -FILES_${PN}-dev += " \ - ${datadir}/cmake \ -" - fakeroot do_generate_qt_environment_file_mingw32() { } SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch" + +# qdatetime.cpp: error: 'localtime_r' was not declared in this scope +QT_CONFIG_FLAGS_append_mingw32 = " -D_POSIX_C_SOURCE" diff --git a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass index 6278d11d..c5611f7c 100644 --- a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass +++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass @@ -56,6 +56,14 @@ EOF echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH}" >> ${SDK_DEVICE_PRI} echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI} + # Move FORTIFY_SOURCE to release flags + if [ -n "${lcl_maybe_fortify}" ]; then + sed -i -e 's/${lcl_maybe_fortify}//' ${SDK_DEVICE_PRI} + echo "QMAKE_CFLAGS_RELEASE *= ${lcl_maybe_fortify}" >> ${SDK_DEVICE_PRI} + echo "QMAKE_CXXFLAGS_RELEASE *= ${lcl_maybe_fortify}" >> ${SDK_DEVICE_PRI} + echo "QMAKE_LFLAGS_RELEASE *= ${lcl_maybe_fortify}" >> ${SDK_DEVICE_PRI} + fi + # Setup qt.conf to point at the device mkspec by default qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf echo 'HostSpec = linux-g++' >> $qtconf diff --git a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass index ad863da4..ff4b677c 100644 --- a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass +++ b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass @@ -57,6 +57,6 @@ fakeroot tar_sdk_sdkmingw32() { if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z fi - 7zr a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z * + 7za a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z * } diff --git a/meta-boot2qt/classes/qbsp-image.bbclass b/meta-boot2qt/classes/qbsp-image.bbclass index 71d1d455..42551948 100644 --- a/meta-boot2qt/classes/qbsp-image.bbclass +++ b/meta-boot2qt/classes/qbsp-image.bbclass @@ -53,7 +53,7 @@ fakeroot do_qbsp_image () { done cd ${S}/qbsp - 7zr a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z . + 7za a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z . rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z ln -s ${IMAGE_NAME}.7z ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass index d61e12b0..c5916ceb 100644 --- a/meta-boot2qt/classes/qbsp.bbclass +++ b/meta-boot2qt/classes/qbsp.bbclass @@ -109,13 +109,13 @@ prepare_qbsp() { mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain if [ "${SDK_POSTFIX}" = "7z" ]; then - 7zr x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ + 7za x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ else cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ fi cd ${B}/toolchain - 7zr a ${COMPONENT_PATH}/data/toolchain.7z * + 7za a ${COMPONENT_PATH}/data/toolchain.7z * # Image component COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system" @@ -126,10 +126,10 @@ prepare_qbsp() { patch_installer_files ${COMPONENT_PATH}/meta mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images - 7zr x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ + 7za x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ cd ${B}/images - 7zr a ${COMPONENT_PATH}/data/image.7z * + 7za a ${COMPONENT_PATH}/data/image.7z * # License component if [ -n "${QBSP_LICENSE_FILE}" ]; then @@ -160,7 +160,7 @@ create_qbsp() { rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp cd ${B}/repository - 7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp * + 7za a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp * } python do_qbsp() { diff --git a/meta-boot2qt/conf/layer.conf b/meta-boot2qt/conf/layer.conf index c51ea680..fb879754 100644 --- a/meta-boot2qt/conf/layer.conf +++ b/meta-boot2qt/conf/layer.conf @@ -44,4 +44,4 @@ B2QTBASE = "${LAYERDIR}" HOSTTOOLS += "git-lfs" -LAYERSERIES_COMPAT_b2qt = "sumo" +LAYERSERIES_COMPAT_b2qt = "thud" diff --git a/meta-boot2qt/recipes-core/ostree/ostree/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch b/meta-boot2qt/recipes-core/ostree/ostree/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch new file mode 100644 index 00000000..f7be40ee --- /dev/null +++ b/meta-boot2qt/recipes-core/ostree/ostree/0001-libglnx.m4-Include-stdio.h-for-renameat2.patch @@ -0,0 +1,26 @@ +From aa04ed9af553b979b19ef31a9ea2241789a15a60 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Wed, 11 Jul 2018 14:56:32 -0400 +Subject: [PATCH] libglnx.m4: Include stdio.h for renameat2 + +glibc added it upstream: +https://sourceware.org/git/?p=glibc.git;a=commit;h=d6da5cb6a8e0e8a9ce92b7d951a254cf325248d7 + +But we need the right header. +Ref: https://github.com/flatpak/flatpak/issues/1890 +--- + libglnx.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libglnx.m4 b/libglnx.m4 +index 43dff97..fd68717 100644 +--- a/libglnx.m4 ++++ b/libglnx.m4 +@@ -6,6 +6,7 @@ AC_CHECK_DECLS([ + [], [], [[ + #include <sys/types.h> + #include <unistd.h> ++#include <stdio.h> + #include <sys/mount.h> + #include <fcntl.h> + #include <sched.h> diff --git a/meta-boot2qt/recipes-core/ostree/ostree_git.bb b/meta-boot2qt/recipes-core/ostree/ostree_git.bb index e4c80760..30b94b3e 100644 --- a/meta-boot2qt/recipes-core/ostree/ostree_git.bb +++ b/meta-boot2qt/recipes-core/ostree/ostree_git.bb @@ -32,6 +32,9 @@ SUMMARY = "Shared library with a reference command line tool for managing bootab LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" +SRC_URI[libglnx.md5sum] = "110edb31abcea2fbdacbe0b3adf7eee4" +SRC_URI[libglnx.sha256sum] = "b2de841b0efe12803930f5e21fe46ef4f4c5180fb59576feb5902c944761d27a" + inherit autotools pkgconfig systemd SRC_URI = " \ @@ -47,12 +50,19 @@ SRC_URI = " \ file://Workaround-the-SIGCHLD-handler-issue.patch \ file://workaround-gtkdocize-configure-issue-in-autog.patch \ " +SRC_URI += " \ + git://gitlab.gnome.org/GNOME/libglnx;name=libglnx;branch=master;protocol=https;destsuffix=git/libglnx \ + file://0001-libglnx.m4-Include-stdio.h-for-renameat2.patch;patchdir=libglnx \ + " -SRCREV = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0" +SRCREV_ostree = "8ece4d6d51bdbe3e41ab318259276bb83e553aa0" +SRCREV_libglnx = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db" +SRCREV = "${SRCREV_ostree}" S = "${WORKDIR}/git" -DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd" +DEPENDS = "glib-2.0 glib-2.0-native e2fsprogs gpgme attr libsoup-2.4 libassuan xz systemd bison-native" + # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image. # The production image do not require bash for proper working. RDEPENDS_${PN} += "bash" diff --git a/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.26.bb index 6dba6615..c03236d9 100644 --- a/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb +++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.26.bb @@ -36,8 +36,8 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar. file://mount-vboxsf.service \ " -SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce" -SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf" +SRC_URI[md5sum] = "4e84cd1aecb67e3f59b3ee06292bb2d0" +SRC_URI[sha256sum] = "4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467" S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders" diff --git a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.26.bb index a727c6f7..5151cc21 100644 --- a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb +++ b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.26.bb @@ -38,8 +38,8 @@ PR = "${MACHINE_KERNEL_PR}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2" -SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce" -SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf" +SRC_URI[md5sum] = "4e84cd1aecb67e3f59b3ee06292bb2d0" +SRC_URI[sha256sum] = "4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467" S = "${WORKDIR}/vbox" @@ -48,10 +48,12 @@ export KERN_VER="${KERNEL_VERSION}" export KBUILD_VERBOSE="1" export BUILD_TARGET_ARCH="${ARCH}" -do_compile_prepend() { +do_compile() { ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules.sh ${WORKDIR}/vbox.tar.gz tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox find ${WORKDIR}/vbox -name Makefile.include.header | xargs sed -i -e '/KERN_DIR :=/d' + + oe_runmake all || die "make failed" } do_install() { diff --git a/meta-boot2qt/recipes-graphics/fonts/otf-noto-arabic_git.bb b/meta-boot2qt/recipes-graphics/fonts/otf-noto-arabic_git.bb new file mode 100644 index 00000000..da5147e8 --- /dev/null +++ b/meta-boot2qt/recipes-graphics/fonts/otf-noto-arabic_git.bb @@ -0,0 +1,51 @@ +############################################################################ +## +## Copyright (C) 2019 Luxoft Sweden AB. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +SUMMARY = "Noto Sans Arabic" +SECTION = "fonts" +HOMEPAGE = "https://www.google.com/get/noto/" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fce5baa9b16328f04e2afc29f6e4e882" + +SRC_URI = "git://github.com/googlei18n/noto-fonts.git;protocol=https" +SRCREV = "4bff97c612daf65d4409c9ebc26dfbd6a3d83a7e" + +INHIBIT_DEFAULT_DEPS = "1" + +inherit allarch fontcache + +S = "${WORKDIR}/git" + +do_install() { + install -m 0755 -d ${D}${datadir}/fonts/otf/noto + install -m 0644 ${S}/hinted/NotoSansArabic-Regular.ttf ${D}${datadir}/fonts/otf/noto +} + +PACKAGES = "${PN}" +FILES_${PN} += "${datadir}/fonts/otf/noto" diff --git a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb index 2bccdca6..9fb7ae86 100644 --- a/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/gammaray_git.bb @@ -2,14 +2,14 @@ SUMMARY = "GammaRay Qt introspection probe" HOMEPAGE = "http://www.kdab.com/gammaray" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=a5b28ec9718d4516f7a621cd0232afc1" +LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=c50976002ebbff1d426f08a9ea6d6df9" inherit cmake_qt5 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" -BRANCH = "5.12" -SRCREV = "79a38d681fca747280eea885ac33d0193a4f5c9b" +BRANCH = "5.13" +SRCREV = "d9edfdaa469deea873c97fd77ff6b9bc428ad319" PV = "${BRANCH}+git${SRCPV}" DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml qtscxml-native \ diff --git a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb index eac6bed3..a00fc155 100644 --- a/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/neptune3-ui_git.bb @@ -45,7 +45,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "544a0f1b7493c28c3667e2cc18c4927af9ac2756" +SRCREV = "7175428236b75f30825b879206fa5fa1ae0cc9e9" QMAKE_PROFILES = "${S}/neptune3-ui.pro" @@ -60,7 +60,7 @@ DEPENDS = "\ " RDEPENDS_${PN} = "\ dbus \ - otf-noto ttf-opensans \ + otf-noto otf-noto-arabic ttf-opensans \ qtapplicationmanager qtapplicationmanager-tools \ qtvirtualkeyboard \ qtquickcontrols2-qmlplugins \ diff --git a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb index 70bc71ac..1d0e1445 100644 --- a/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qmllive_git.bb @@ -37,7 +37,7 @@ require recipes-qt/qt5/qt5-git.inc QT_GIT_PROJECT = "qt-apps" -SRCREV = "8d4da00654b0ad7c7f73bedb33480d0dfbad8926" +SRCREV = "36a4a3bafc2aec416c1803796357b2f1d2ee4237" DEPENDS = "qtbase qtdeclarative" diff --git a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb index ef356ba0..8c996a3c 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -35,7 +35,7 @@ inherit qt5-module require recipes-qt/qt5/qt5-git.inc QT_MODULE_BRANCH = "dev" -SRCREV = "7a2543e5d81c315b7075ee4b5401becb199ae5e6" +SRCREV = "388443cc3e7fc7a9f34fa99dacff148a5671573a" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland qtwayland-native", "", d)}" diff --git a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb index 067c3b4a..d0f7c65f 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtivi_git.bb @@ -35,7 +35,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02" -DEPENDS = "qtbase qtdeclarative qtmultimedia qtivi-native" +DEPENDS = "qtbase qtdeclarative qtmultimedia qtivi-native qtquickcontrols2" DEPENDS_class-native = "qtbase" DEPENDS_class-nativesdk = "qtbase qtivi-native" @@ -51,7 +51,7 @@ SRC_URI += " \ file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "9f86bd27564ada6bcd8e200f347b642578935934" +SRCREV_qtivi = "e95bf04999acd225f77891daf637a020a76a3240" SRCREV_qface = "0a3ae7686e1100be452b8c435bdcd84ec242340e" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" @@ -64,9 +64,7 @@ PACKAGECONFIG[geniviextras-only] = "QMAKE_EXTRA_ARGS+=--geniviextras-only" PACKAGECONFIG[ivigenerator] = "QMAKE_EXTRA_ARGS+=-system-ivigenerator" PACKAGECONFIG[ivigenerator-native] = "QMAKE_EXTRA_ARGS+=-qt-ivigenerator,,python3 python3-virtualenv" PACKAGECONFIG[host-tools-only] = "QMAKE_EXTRA_ARGS+=-host-tools-only" -PACKAGECONFIG[simulator] = "QMAKE_EXTRA_ARGS+=-feature-simulator,QMAKE_EXTRA_ARGS+=-no-feature-simulator,qtsimulator" -PACKAGECONFIG[simulator-native] = "QMAKE_EXTRA_ARGS+=-feature-simulator QMAKE_EXTRA_ARGS+=--force-ivigenerator-qtsimulator" -PACKAGECONFIG[remoteobjects] = "QMAKE_EXTRA_ARGS+=-feature-remoteobjects,QMAKE_EXTRA_ARGS+=-no-feature-simulator,qtremoteobjects" +PACKAGECONFIG[remoteobjects] = "QMAKE_EXTRA_ARGS+=-feature-remoteobjects,,qtremoteobjects qtremoteobjects-native" PACKAGECONFIG[remoteobjects-native] = "QMAKE_EXTRA_ARGS+=-feature-remoteobjects QMAKE_EXTRA_ARGS+=--force-ivigenerator-qtremoteobjects" PACKAGECONFIG_class-native ??= "host-tools-only ivigenerator-native remoteobjects-native" diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc index 4aec2ca1..40fb8753 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demo.inc @@ -37,11 +37,11 @@ SRC_URI = " \ ${QT_GIT}qt-apps/boot2qt-demos.git;branch=${BRANCH} \ " -PV = "5.12.3+git${SRCPV}" +PV = "5.13.0+git${SRCPV}" -BRANCH = "5.12" +BRANCH = "5.13" -SRCREV = "34310ed69919f452dbcdae42f350254a40a06113" +SRCREV = "c10b4e842adaf096bf46ed5f98e236f3fee87870" FILES_${PN} += " \ /data/user \ diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb index 99bba1e6..68fcdb9f 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -42,7 +42,7 @@ SRC_URI += " \ file://b2qt.service \ " -SRCREV = "8d82e92fcb04d42fa5efbd23e155ac9f076c7c9c" +SRCREV = "04cecef50d9316d98c11e8b82be5a492ef9bde70" DEPENDS = "\ qtbase qtdeclarative qtquickcontrols2 \ diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb index cc05383c..64d95f5d 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/democompositor_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -37,7 +37,7 @@ require recipes-qt/qt5/qt5-git.inc QT_GIT_PROJECT = "qt-apps" QT_MODULE = "boot2qt-demos" -SRCREV = "b9585b440819e1444b20f30435f81c46801158c5" +SRCREV = "0ea39397893edb54454bfceabde4b83fc5b60a2e" S = "${WORKDIR}/git/wayland/democompositor/" diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb index b8860998..de2931ee 100644 --- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb +++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -39,7 +39,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "76ab4f6568e7c81bfc1b2e53ed7a33898e086f8a" +SRCREV = "0b7e135bfbe8fbb40ec97ed1d643429418a93f61" DEPENDS = "\ qtbase qtdeclarative qtconnectivity qtdeclarative-native \ diff --git a/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb b/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb index a28022db..aab72f90 100644 --- a/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/meta-boot2qt/recipes-qt/qt5/qtquicktimeline_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -42,4 +42,4 @@ DEPENDS = "qtbase qtdeclarative" QT_MODULE_BRANCH = "dev" -SRCREV = "42415a5b7a13b92701ccc7be70f9cdb7e522a3ea" +SRCREV = "149b6cd3e46aa6b1ba76cf1ccc6d0510c5ff94b4" diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf index 74e2652a..4ddfd499 100644 --- a/meta-fsl-extras/conf/layer.conf +++ b/meta-fsl-extras/conf/layer.conf @@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_fsl" BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_fsl = "20" -LAYERSERIES_COMPAT_b2qt_fsl = "sumo" +LAYERSERIES_COMPAT_b2qt_fsl = "thud" diff --git a/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend b/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bbappend index 068b9fa9..068b9fa9 100644 --- a/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend +++ b/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bbappend diff --git a/meta-fsl-extras/recipes/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt b/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt index 6183cca2..6183cca2 100644 --- a/meta-fsl-extras/recipes/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt +++ b/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch index 123782e3..9378f0a6 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch @@ -1,21 +1,21 @@ -From 07234c1c0f991a560010672a619740e385778f90 Mon Sep 17 00:00:00 2001 +From ea15ee300074cb1453dce6a068feec0771a28418 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Thu, 11 Feb 2016 10:17:51 +0200 Subject: [PATCH] Add support for KOE tx31d200vm0baa display Used for the cluster demo --- - arch/arm/include/asm/imx-common/fbpanel.h | 27 ++++++++++++++++++++ - board/boundary/nitrogen6_max/nitrogen6_max.c | 1 + - board/boundary/nitrogen6sx/nitrogen6sx.c | 1 + - board/boundary/nitrogen6x/nitrogen6x.c | 1 + - 4 files changed, 30 insertions(+) + arch/arm/include/asm/mach-imx/fbpanel.h | 27 ++++++++++++++++++++ + board/boundary/nitrogen6_max/nitrogen6_max.c | 3 ++- + board/boundary/nitrogen6sx/nitrogen6sx.c | 3 ++- + board/boundary/nitrogen6x/nitrogen6x.c | 3 ++- + 4 files changed, 33 insertions(+), 3 deletions(-) -diff --git a/arch/arm/include/asm/imx-common/fbpanel.h b/arch/arm/include/asm/imx-common/fbpanel.h -index f5465c3c80..643cd86e29 100644 ---- a/arch/arm/include/asm/imx-common/fbpanel.h -+++ b/arch/arm/include/asm/imx-common/fbpanel.h -@@ -116,6 +116,33 @@ void fbp_setup_display(const struct display_info_t *displays, int cnt); +diff --git a/arch/arm/include/asm/mach-imx/fbpanel.h b/arch/arm/include/asm/mach-imx/fbpanel.h +index 4b924d2ac8..d4ef998faf 100644 +--- a/arch/arm/include/asm/mach-imx/fbpanel.h ++++ b/arch/arm/include/asm/mach-imx/fbpanel.h +@@ -174,6 +174,33 @@ void fbp_setup_env_cmds(void); .fbtype = FB_##_mode,\ .fbflags = _flags @@ -50,38 +50,44 @@ index f5465c3c80..643cd86e29 100644 #define VDF_1280_720M_60(_mode, _name, _fmt, _flags, _detect, _bus, _addr) \ {\ diff --git a/board/boundary/nitrogen6_max/nitrogen6_max.c b/board/boundary/nitrogen6_max/nitrogen6_max.c -index 1c4106e735..51bc0bd8f3 100644 +index 12e3af89d0..3be475efc0 100644 --- a/board/boundary/nitrogen6_max/nitrogen6_max.c +++ b/board/boundary/nitrogen6_max/nitrogen6_max.c -@@ -497,6 +497,7 @@ int fbp_detect_serializer(struct display_info_t const *di) +@@ -499,7 +499,8 @@ int fbp_detect_serializer(struct display_info_t const *di) } static const struct display_info_t displays[] = { +- /* hdmi */ + IMX_VD_KOE(LVDS, 0, 2), - /* hdmi */ ++ /* hdmi */ VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50), VD_1920_1080M_60(HDMI, NULL, 1, 0x50), + VD_1024_768M_60(HDMI, NULL, 1, 0x50), diff --git a/board/boundary/nitrogen6sx/nitrogen6sx.c b/board/boundary/nitrogen6sx/nitrogen6sx.c -index dc05042add..3725d63cf3 100644 +index 5581637424..5ded443c78 100644 --- a/board/boundary/nitrogen6sx/nitrogen6sx.c +++ b/board/boundary/nitrogen6sx/nitrogen6sx.c -@@ -436,6 +436,7 @@ void board_enable_lcd(const struct display_info_t *di, int enable) +@@ -435,7 +435,8 @@ void board_enable_lcd(const struct display_info_t *di, int enable) } static const struct display_info_t displays[] = { +- /* hdmi/lcd via tfp410 */ + IMX_VD_KOE(LVDS, 0, 2), - /* hdmi/lcd via tfp410 */ ++ /* hdmi/lcd via tfp410 */ VDF_1280_720M_60(LCD, "1280x720M@60", RGB24, 0, fbp_detect_i2c, 2, 0x50), VDF_1920_1080M_60(LCD, "1920x1080M@60", RGB24, 0, NULL, 2, 0x50), + VDF_1024_768M_60(LCD, "1024x768M@60", RGB24, 0, NULL, 2, 0x50), diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c -index d9f6a829f1..80b102e206 100644 +index 8ee7f641bf..dbf1bd4a99 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c -@@ -359,6 +359,7 @@ void board_pre_enable(const struct display_info_t *di) +@@ -362,7 +362,8 @@ void board_pre_enable(const struct display_info_t *di) } static const struct display_info_t displays[] = { +- /* hdmi */ + IMX_VD_KOE(LVDS, 0, 2), - /* hdmi */ ++ /* hdmi */ VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50), VD_1920_1080M_60(HDMI, NULL, 1, 0x50), + VD_1024_768M_60(HDMI, NULL, 1, 0x50), diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch index b0791e96..d730e60a 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch @@ -1,4 +1,4 @@ -From fa2e83db63fe5abdfa00d205301d12e1a271a291 Mon Sep 17 00:00:00 2001 +From e21337ad1663e6fd6da4a5175ad72e629c62bab5 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff <mikko.gronoff@qt.io> Date: Sun, 23 Apr 2017 21:47:01 +0300 Subject: [PATCH] set CMA reserved size to 384MB @@ -10,14 +10,14 @@ video decoding cannot work for high resolution videos. 1 file changed, 1 insertion(+) diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h -index bd4e54cb67..48114d5739 100644 +index 62708b839b..eb3b30b2ce 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h -@@ -33,6 +33,7 @@ +@@ -26,6 +26,7 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define BD_I2C_MASK 7 +#define BD_CMA "384M" #if defined(CONFIG_SABRELITE) - #define CONFIG_ENV_IS_IN_MMC + #include "boundary.h" diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch index c5fa9231..49af5e54 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0003-Disable-build-for-tools.patch @@ -1,4 +1,4 @@ -From 22c5a278b98cf6ea4e4a402bca19d1354ab3c431 Mon Sep 17 00:00:00 2001 +From baed831959ba41b8d1cebfb5d960ddfa847ae915 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Tue, 25 Sep 2018 16:05:17 +0300 Subject: [PATCH] Disable build for tools and use mkimage from sysroot @@ -11,10 +11,10 @@ fails when trying to compile with host gcc: unable to execute 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 119ad49eec..022690e26e 100644 +index 7d5f801eea..d5d44c5def 100644 --- a/Makefile +++ b/Makefile -@@ -698,7 +698,7 @@ libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/) +@@ -730,7 +730,7 @@ libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/) libs-y := $(sort $(libs-y)) @@ -24,13 +24,15 @@ index 119ad49eec..022690e26e 100644 u-boot-alldirs := $(sort $(u-boot-dirs) $(patsubst %/,%,$(filter %/, $(libs-)))) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 80ddb08474..e86c949f08 100644 +index f8c3fff1d1..f24ea9cc25 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -493,5 +493,5 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ +@@ -508,7 +508,7 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \ # --------------------------------------------------------------------------- MKIMAGEOUTPUT ?= /dev/null quiet_cmd_mkimage = MKIMAGE $@ -cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ +cmd_mkimage = mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ - $(if $(KBUILD_VERBOSE:1=), >$(MKIMAGEOUTPUT)) + >$(MKIMAGEOUTPUT) $(if $(KBUILD_VERBOSE:0=), && cat $(MKIMAGEOUTPUT)) + + # fdtgrep diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_%.bbappend b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary_%.bbappend index 3b5235f9..3b5235f9 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_%.bbappend +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary_%.bbappend diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch index fbf83da3..fbf83da3 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch index 2c1c70d8..2c1c70d8 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc_%.bbappend index 815244f6..815244f6 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc_%.bbappend diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch index 02a1e33a..02a1e33a 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_%.bbappend b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary_%.bbappend index e4b37308..e4b37308 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_%.bbappend +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary_%.bbappend diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb index ff25ec51..ff25ec51 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch index 999828ea..999828ea 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr index b8b8a930..b8b8a930 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr index c65c1d3d..c65c1d3d 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch index e69de29b..e69de29b 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr index 8524cef8..8524cef8 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr index 8524cef8..8524cef8 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch index 2235fae3..2235fae3 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr index 9fa6296c..9fa6296c 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr index 20244d71..20244d71 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch index 2aa8421a..2aa8421a 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr index ae0fd5c1..ae0fd5c1 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr index b0e4904e..b0e4904e 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_blk.scr index 7af72e6d..7af72e6d 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_blk.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_eth.scr index d7ea35c2..d7ea35c2 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_eth.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_mmc.scr index 4c8f666f..4c8f666f 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_mmc.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch index 91aa2bc5..91aa2bc5 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_blk.scr index 12d89cf4..12d89cf4 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_blk.scr diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_eth.scr index ee915232..ee915232 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_eth.scr +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_eth.scr diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch new file mode 100644 index 00000000..df1429b0 --- /dev/null +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch @@ -0,0 +1,71 @@ +From 74ffd57e80fd3f4e2d2d0b60e42a3b570aeb9c97 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Mon, 15 May 2017 15:31:36 +0300 +Subject: [PATCH] Make sdboot default on all boards + +... and remove console=tty1 from kernel args +--- + include/configs/apalis_imx6.h | 5 +++-- + include/configs/colibri_imx6.h | 5 +++-- + include/configs/colibri_imx7.h | 2 +- + include/configs/colibri_vf.h | 2 +- + 4 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index fa40c629c3..ad0284de8a 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -177,8 +177,9 @@ + #ifdef CONFIG_TDX_EASY_INSTALLER + #define CONFIG_BOOTCOMMAND "run distro_bootcmd" + #else +-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \ +- "run distro_bootcmd; usb start; " \ ++#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \ ++ "run emmcboot; echo; echo emmcboot failed; " \ ++ "run distro_bootcmd; usb start; " \ + "setenv stdout serial,vga; setenv stdin serial,usbkbd" + #endif + +diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h +index fda171bd9e..df49efc9ef 100644 +--- a/include/configs/colibri_imx6.h ++++ b/include/configs/colibri_imx6.h +@@ -157,8 +157,9 @@ + #ifdef CONFIG_TDX_EASY_INSTALLER + #define CONFIG_BOOTCOMMAND "run distro_bootcmd" + #else +-#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \ +- "run distro_bootcmd; usb start; " \ ++#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \ ++ "run emmcboot ; echo ; echo emmcboot failed ; " \ ++ "run distro_bootcmd; usb start; " \ + "setenv stdout serial,vga; setenv stdin serial,usbkbd" + #endif + +diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h +index 6c91951878..4200512fea 100644 +--- a/include/configs/colibri_imx7.h ++++ b/include/configs/colibri_imx7.h +@@ -128,7 +128,7 @@ + #define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \ + "run bootcmd_mmc0; run ubiboot; run distro_bootcmd" + #else +-#define CONFIG_BOOTCOMMAND "run ubiboot; " \ ++#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ + "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd" + #endif + +diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h +index 0579bfdc4e..65a5dada5f 100644 +--- a/include/configs/colibri_vf.h ++++ b/include/configs/colibri_vf.h +@@ -155,7 +155,7 @@ + "ubi read ${fdt_addr_r} dtb && " \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + +-#define CONFIG_BOOTCOMMAND "run ubiboot; " \ ++#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ + "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" + + #define BOOTENV_RUN_NET_USB_START "" diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch index 080a8b59..080a8b59 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch new file mode 100644 index 00000000..8d28abe6 --- /dev/null +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch @@ -0,0 +1,35 @@ +From 166dae45bcfcd92cd2802db785a30072f65c0900 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Thu, 12 Oct 2017 11:02:54 +0300 +Subject: [PATCH] apalis-imx6: Ixora v1.0 support + +Add sddrive variable that can be changed to boot from different mmc card +slot when using different versions of ixora carrier board. +Default to drive 1, which is correct for Ixora v1.1. +--- + include/configs/apalis_imx6.h | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index 3f224e54b8..9e1b5a0f75 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -238,12 +238,14 @@ + "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define SD_BOOTCMD \ +- "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \ +- "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ ++ "sddrive=1\0" \ ++ "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 rootwait\0" \ ++ "sdboot=run setup; run sdsetup; " \ ++ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ + "${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \ +- "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \ ++ "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} ${boot_file} " \ + "&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \ +- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ ++ "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define USB_BOOTCMD \ diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch index acc5a164..acc5a164 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex_%.bbappend index 55a4c2bc..55a4c2bc 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend +++ b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex_%.bbappend diff --git a/meta-fsl-extras/recipes/imx-dpu-g2d/imx-dpu-g2d_%.bbappend b/meta-fsl-extras/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_%.bbappend index 4a998742..4a998742 100644 --- a/meta-fsl-extras/recipes/imx-dpu-g2d/imx-dpu-g2d_%.bbappend +++ b/meta-fsl-extras/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_%.bbappend diff --git a/meta-fsl-extras/recipes/libsdl2/libsdl2_%.bbappend b/meta-fsl-extras/recipes-graphics/libsdl2/libsdl2_%.bbappend index 4d6a52be..4d6a52be 100644 --- a/meta-fsl-extras/recipes/libsdl2/libsdl2_%.bbappend +++ b/meta-fsl-extras/recipes-graphics/libsdl2/libsdl2_%.bbappend diff --git a/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch b/meta-fsl-extras/recipes-kernel/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch index 7851ca43..7851ca43 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch +++ b/meta-fsl-extras/recipes-kernel/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-boundary_4.%.bbappend index ff0a0d28..ff0a0d28 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend +++ b/meta-fsl-extras/recipes-kernel/linux/linux-boundary_4.%.bbappend diff --git a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-fslc-imx_4.%.bbappend index a6685754..a6685754 100644 --- a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend +++ b/meta-fsl-extras/recipes-kernel/linux/linux-fslc-imx_4.%.bbappend diff --git a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-imx_4.%.bbappend index 9b4cc9b9..9b4cc9b9 100644 --- a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend +++ b/meta-fsl-extras/recipes-kernel/linux/linux-imx_4.%.bbappend diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-toradex_4.%.bbappend index 8760ee8a..8760ee8a 100644 --- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend +++ b/meta-fsl-extras/recipes-kernel/linux/linux-toradex_4.%.bbappend diff --git a/meta-fsl-extras/recipes/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch b/meta-fsl-extras/recipes-kernel/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch index dbb7995c..dbb7995c 100644 --- a/meta-fsl-extras/recipes/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch +++ b/meta-fsl-extras/recipes-kernel/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch diff --git a/meta-fsl-extras/recipes/linux/linux-warp7/defconfig b/meta-fsl-extras/recipes-kernel/linux/linux-warp7/defconfig index 267fa977..267fa977 100644 --- a/meta-fsl-extras/recipes/linux/linux-warp7/defconfig +++ b/meta-fsl-extras/recipes-kernel/linux/linux-warp7/defconfig diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bb b/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bb index 71341dc2..71341dc2 100644 --- a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bb +++ b/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bb diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bbappend index 3b9fc50f..3b9fc50f 100644 --- a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend +++ b/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bbappend diff --git a/meta-fsl-extras/recipes/perf/perf.bbappend b/meta-fsl-extras/recipes-kernel/perf/perf.bbappend index c4bd322e..c4bd322e 100644 --- a/meta-fsl-extras/recipes/perf/perf.bbappend +++ b/meta-fsl-extras/recipes-kernel/perf/perf.bbappend diff --git a/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb index dc421e57..52b52781 100644 --- a/meta-raspberrypi-extras/recipes/userland/userland_git.bbappend +++ b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,9 +27,9 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +require recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.4.bb -SRC_URI += "file://0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch" +FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:" -SRCREV = "2448644657e5fbfd82299416d218396ee1115ece" -PV = "20180511" +SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d" +SRC_URI[sha256sum] = "fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89" diff --git a/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb new file mode 100644 index 00000000..ebc1da0f --- /dev/null +++ b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb @@ -0,0 +1,35 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.4.bb + +FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:" + +SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88" +SRC_URI[sha256sum] = "3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1" diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch deleted file mode 100644 index 2e5382f9..00000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 1abe757120dd19518fd09d2013f518fba46c4d06 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Mon, 15 May 2017 15:31:36 +0300 -Subject: [PATCH] Make sdboot default on all boards - -... and remove console=tty1 from kernel args ---- - include/configs/apalis_imx6.h | 3 ++- - include/configs/colibri_imx6.h | 3 ++- - include/configs/colibri_imx7.h | 2 +- - include/configs/colibri_vf.h | 2 +- - 4 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index 71dfeb56f5..8dcb5cc5e4 100644 ---- a/include/configs/apalis_imx6.h -+++ b/include/configs/apalis_imx6.h -@@ -256,7 +256,8 @@ - #endif - #define CONFIG_EXTRA_ENV_SETTINGS \ - BOOTENV \ -- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ -+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ -+ "run emmcboot ; echo ; echo emmcboot failed ; " \ - "run distro_bootcmd ; " \ - "usb start ;" \ - "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h -index f1fd5b422e..ae0f3c9bfa 100644 ---- a/include/configs/colibri_imx6.h -+++ b/include/configs/colibri_imx6.h -@@ -231,7 +231,8 @@ - #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" - #define CONFIG_EXTRA_ENV_SETTINGS \ - BOOTENV \ -- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ -+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ -+ "run emmcboot ; echo ; echo emmcboot failed ; " \ - "run distro_bootcmd ; " \ - "usb start ;" \ - "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h -index ea04762b49..47e8bd266d 100644 ---- a/include/configs/colibri_imx7.h -+++ b/include/configs/colibri_imx7.h -@@ -104,7 +104,7 @@ - "ubi read ${fdt_addr_r} dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ - --#define CONFIG_BOOTCOMMAND "run ubiboot; " \ -+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ - "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" - - #define BOOTENV_RUN_NET_USB_START "" -diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h -index db610d53f1..a2c942cafe 100644 ---- a/include/configs/colibri_vf.h -+++ b/include/configs/colibri_vf.h -@@ -155,7 +155,7 @@ - "ubi read ${fdt_addr_r} dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ - --#define CONFIG_BOOTCOMMAND "run ubiboot; " \ -+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \ - "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" - - #define BOOTENV_RUN_NET_USB_START "" diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch deleted file mode 100644 index d2e82a79..00000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ccbaab75abc8d5f5cbadc6a0285dd496a45252cf Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Thu, 12 Oct 2017 11:02:54 +0300 -Subject: [PATCH] apalis-imx6: Ixora v1.0 support - -Add sddrive variable that can be changed to boot from different mmc card -slot when using different versions of ixora carrier board. -Default to drive 1, which is correct for Ixora v1.1. ---- - include/configs/apalis_imx6.h | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index 3351a18e4c..7aabb1334b 100644 ---- a/include/configs/apalis_imx6.h -+++ b/include/configs/apalis_imx6.h -@@ -226,15 +226,16 @@ - "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - - #define SD_BOOTCMD \ -- "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \ -+ "sddrive=1\0" \ -+ "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 " \ - "rootwait\0" \ -- "sdboot=run setup; " \ -+ "sdboot=run setup; run sdsetup; " \ - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ - "${vidargs}; echo Booting from SD card; " \ -- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ -+ "run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} " \ - "${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} ${dtbparam}\0" \ -- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ -+ "sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \ - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - - #define USB_BOOTCMD \ diff --git a/meta-intel-extras/conf/layer.conf b/meta-intel-extras/conf/layer.conf index ef83d53c..038539fc 100644 --- a/meta-intel-extras/conf/layer.conf +++ b/meta-intel-extras/conf/layer.conf @@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_intel" BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_intel = "20" -LAYERSERIES_COMPAT_b2qt_intel = "sumo" +LAYERSERIES_COMPAT_b2qt_intel = "thud" diff --git a/meta-intel-extras/recipes/images/core-image-minimal-initramfs.bbappend b/meta-intel-extras/recipes-core/images/core-image-minimal-initramfs.bbappend index fd7559ab..fd7559ab 100644 --- a/meta-intel-extras/recipes/images/core-image-minimal-initramfs.bbappend +++ b/meta-intel-extras/recipes-core/images/core-image-minimal-initramfs.bbappend diff --git a/meta-intel-extras/recipes/initrdscripts/initramfs-framework/network b/meta-intel-extras/recipes-core/initrdscripts/initramfs-framework/network index 134a70a6..134a70a6 100644 --- a/meta-intel-extras/recipes/initrdscripts/initramfs-framework/network +++ b/meta-intel-extras/recipes-core/initrdscripts/initramfs-framework/network diff --git a/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rootfs b/meta-intel-extras/recipes-core/initrdscripts/initramfs-framework/rootfs index c93c9c20..c93c9c20 100755 --- a/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rootfs +++ b/meta-intel-extras/recipes-core/initrdscripts/initramfs-framework/rootfs diff --git a/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rtsx_pci_sdmmc b/meta-intel-extras/recipes-core/initrdscripts/initramfs-framework/rtsx_pci_sdmmc index dd14d6d2..dd14d6d2 100644 --- a/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rtsx_pci_sdmmc +++ b/meta-intel-extras/recipes-core/initrdscripts/initramfs-framework/rtsx_pci_sdmmc diff --git a/meta-intel-extras/recipes/initrdscripts/initramfs-framework_1.0.bbappend b/meta-intel-extras/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend index 2a8ac895..2a8ac895 100644 --- a/meta-intel-extras/recipes/initrdscripts/initramfs-framework_1.0.bbappend +++ b/meta-intel-extras/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend diff --git a/meta-intel-extras/recipes/microcode-initramfs/microcode-initramfs.bb b/meta-intel-extras/recipes-core/microcode-initramfs/microcode-initramfs.bb index 8682c274..8682c274 100644 --- a/meta-intel-extras/recipes/microcode-initramfs/microcode-initramfs.bb +++ b/meta-intel-extras/recipes-core/microcode-initramfs/microcode-initramfs.bb diff --git a/meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg b/meta-intel-extras/recipes-kernel/linux/linux-intel/b2qt.cfg index af765b53..af765b53 100644 --- a/meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg +++ b/meta-intel-extras/recipes-kernel/linux/linux-intel/b2qt.cfg diff --git a/meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg b/meta-intel-extras/recipes-kernel/linux/linux-intel/wlan-realtek.cfg index 65ac2485..65ac2485 100644 --- a/meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg +++ b/meta-intel-extras/recipes-kernel/linux/linux-intel/wlan-realtek.cfg diff --git a/meta-intel-extras/recipes/linux/linux-intel_%.bbappend b/meta-intel-extras/recipes-kernel/linux/linux-intel_%.bbappend index a61cf4d5..a61cf4d5 100644 --- a/meta-intel-extras/recipes/linux/linux-intel_%.bbappend +++ b/meta-intel-extras/recipes-kernel/linux/linux-intel_%.bbappend diff --git a/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf index c2615adc..c2615adc 100644 --- a/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf +++ b/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf diff --git a/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/kms.conf b/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf index d6da06c4..d6da06c4 100644 --- a/meta-intel-extras/recipes/qt5/boot2qt-appcontroller/kms.conf +++ b/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf diff --git a/meta-intel-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend b/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend index 708ed85e..708ed85e 100644 --- a/meta-intel-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend +++ b/meta-intel-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend diff --git a/meta-intel-extras/recipes/qt5/qtbase_git.bbappend b/meta-intel-extras/recipes-qt/qt5/qtbase_git.bbappend index 602782e2..602782e2 100644 --- a/meta-intel-extras/recipes/qt5/qtbase_git.bbappend +++ b/meta-intel-extras/recipes-qt/qt5/qtbase_git.bbappend diff --git a/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch deleted file mode 100644 index a50d2a2b..00000000 --- a/meta-intel-extras/recipes/mesa/files/0001-Simplify-wayland-scanner-lookup.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Tue, 15 Nov 2016 15:20:49 +0200 -Subject: [PATCH 1/6] Simplify wayland-scanner lookup -Organization: O.S. Systems Software LTDA. - -Don't use pkg-config to lookup the path of a binary that's in the path. - -Alternatively we'd have to prefix the path returned by pkg-config with -PKG_CONFIG_SYSROOT_DIR. - -Upstream-Status: Pending -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - configure.ac | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 14f1af2b2f..916d0bd207 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1825,12 +1825,7 @@ for plat in $platforms; do - PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - -- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, -- WAYLAND_SCANNER='') -- if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -- fi -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) - - if test "x$WAYLAND_SCANNER" = "x:"; then - AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) --- -2.18.0 - diff --git a/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch b/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch deleted file mode 100644 index ffb3bf7a..00000000 --- a/meta-intel-extras/recipes/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 16 Aug 2017 18:58:20 -0700 -Subject: [PATCH 2/6] winsys/svga/drm: Include sys/types.h -Organization: O.S. Systems Software LTDA. - -vmw_screen.h uses dev_t which is defines in sys/types.h -this header is required to be included for getting dev_t -definition. This issue happens on musl C library, it is hidden -on glibc since sys/types.h is included through another -system headers - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport [7dfdfbf8c37e52e7b9b09f7d1d434edad3ebc864] -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - src/gallium/winsys/svga/drm/vmw_screen.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h -index f21cabb51f..4c972fdaa9 100644 ---- a/src/gallium/winsys/svga/drm/vmw_screen.h -+++ b/src/gallium/winsys/svga/drm/vmw_screen.h -@@ -41,6 +41,7 @@ - #include "svga_winsys.h" - #include "pipebuffer/pb_buffer_fenced.h" - #include <os/os_thread.h> -+#include <sys/types.h> - - #define VMW_GMR_POOL_SIZE (16*1024*1024) - #define VMW_QUERY_POOL_SIZE (8192) --- -2.18.0 - diff --git a/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch b/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch deleted file mode 100644 index 5e735ca1..00000000 --- a/meta-intel-extras/recipes/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Tue, 5 Jun 2018 11:11:10 -0300 -Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases -Organization: O.S. Systems Software LTDA. - -$ llvm-config-host --version -5.0.0git-9a5c333388c - -We need to ignore everything after 5.0.0 which is what the cut cmd is -doing - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 916d0bd207..dd172f1ebe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1090,7 +1090,7 @@ strip_unwanted_llvm_flags() { - - llvm_set_environment_variables() { - if test "x$LLVM_CONFIG" != xno; then -- LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` -+ LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5` - LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` - LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` - LLVM_LIBDIR=`$LLVM_CONFIG --libdir` -@@ -2808,7 +2808,7 @@ detect_old_buggy_llvm() { - dnl ourselves. - dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) - dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, -- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` -+ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5` - AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) - - if test "x$llvm_have_one_so" = xyes; then --- -2.18.0 - diff --git a/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch b/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch deleted file mode 100644 index 8953c4a1..00000000 --- a/meta-intel-extras/recipes/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ebe6077a1d74e56b28249f71e8760295fa846ed2 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Fri, 29 Dec 2017 10:27:59 -0200 -Subject: [PATCH 4/6] Use Python 3 to execute the scripts -Organization: O.S. Systems Software LTDA. - -The MESA build system uses Python 2 but as OE-Core has moved away from -it, we change it to use Python 3 instead. - -Upstream-Status: Inappropriate [ configuration ] - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dd172f1ebe..40cac36ac2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -122,7 +122,7 @@ AM_PROG_CC_C_O - AC_PROG_NM - AM_PROG_AS - AX_CHECK_GNU_MAKE --AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python]) -+AC_CHECK_PROGS([PYTHON2], [python3.5 python3 python]) - AC_PROG_SED - AC_PROG_MKDIR_P - --- -2.18.0 - diff --git a/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch b/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch deleted file mode 100644 index d40e7b58..00000000 --- a/meta-intel-extras/recipes/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9e0368af471af3a36e0eb526453f892598120065 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Wed, 6 Jun 2018 09:50:35 -0300 -Subject: [PATCH 5/6] dri: i965: Add missing time.h include -Organization: O.S. Systems Software LTDA. - -This fixes a build error when using musl: - -,---- -| In file included from .../src/mesa/drivers/dri/i965/intel_upload.c:33:0: -| .../src/mesa/drivers/dri/i965/brw_bufmgr.h:132:4: error: unknown type name 'time_t' -| time_t free_time; -| ^~~~~~ -`---- - -Upstream-Status: Backport [3c288da5eec81ee58b85927df18d9194ead8f5c2] -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h -index 68f5e0c2c8..5b60a23763 100644 ---- a/src/mesa/drivers/dri/i965/brw_bufmgr.h -+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h -@@ -37,6 +37,7 @@ - #include <stdbool.h> - #include <stdint.h> - #include <stdio.h> -+#include <time.h> - #include "util/u_atomic.h" - #include "util/list.h" - --- -2.18.0 - diff --git a/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch deleted file mode 100644 index 0212922c..00000000 --- a/meta-intel-extras/recipes/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 754ccf89a732fc3da6e9bc62ebd6b28686ff3d26 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Wed, 29 Aug 2018 22:10:30 -0300 -Subject: [PATCH 6/6] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR -Organization: O.S. Systems Software LTDA. - -This allows to override the wayland-protocols pkgdatadir with the -WAYLAND_PROTOCOLS_DATADIR from environment. - -pkgconfig would return an absolute path in -/usr/share/wayland-protocols -for the pkgdatadir value, which is not suitable for cross-compiling. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 40cac36ac2..728bbdcbc4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1823,7 +1823,7 @@ for plat in $platforms; do - PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED]) - PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED]) - PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) -- WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` -+ PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) - - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) - --- -2.18.0 - diff --git a/meta-intel-extras/recipes/mesa/mesa.inc b/meta-intel-extras/recipes/mesa/mesa.inc deleted file mode 100644 index 0219ded2..00000000 --- a/meta-intel-extras/recipes/mesa/mesa.inc +++ /dev/null @@ -1,233 +0,0 @@ -SUMMARY = "A free implementation of the OpenGL API" -DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \ -a system for rendering interactive 3D graphics. \ -A variety of device drivers allows Mesa to be used in many different environments \ -ranging from software emulation to complete hardware acceleration for modern GPUs. \ -Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \ -environment." - -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4" - -PE = "2" - -DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native" -EXTRANATIVEPATH += "chrpath-native" -PROVIDES = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \ - virtual/mesa \ - " - -inherit autotools pkgconfig python3native gettext distro_features_check - -ANY_OF_DISTRO_FEATURES = "opengl vulkan" - -PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \ - surfaceless" - -export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}" -export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE}/llvm-config" -export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}" -EXTRA_OECONF = "--enable-shared-glapi \ - --disable-opencl \ - --enable-glx-read-only-text \ - PYTHON2=python2 \ - --with-llvm-prefix=${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE} \ - --with-platforms='${PLATFORMS}'" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ - " - -# "gbm" requires "dri", "opengl" -PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" - -X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" -# "x11" requires "opengl" -PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" -PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" -PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" - -DRIDRIVERS = "swrast" -DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" -DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" -# "dri" requires "opengl" -PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm" -PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence" - -# Vulkan drivers need dri3 enabled -# radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9 -VULKAN_DRIVERS = "" -VULKAN_DRIVERS_append_x86 = ",intel" -VULKAN_DRIVERS_append_x86-64 = ",intel" -PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=${VULKAN_DRIVERS}, --without-vulkan-drivers, python3-mako-native" - -PACKAGECONFIG[opengl] = "--enable-opengl, --disable-opengl" - -# "gles" requires "opengl" -PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" - -# "egl" requires "dri", "opengl" -PACKAGECONFIG[egl] = "--enable-egl, --disable-egl" - -PACKAGECONFIG[etnaviv] = "" -PACKAGECONFIG[imx] = "" - -GALLIUMDRIVERS = "swrast" -GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" -GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'imx', ',imx', '', d)}" -GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" -PACKAGECONFIG[r600] = "" -GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" -GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" -GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" -GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" -GALLIUMDRIVERS_append_qemux86 = ",virgl" -GALLIUMDRIVERS_append_qemux86-64 = ",virgl" -# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers -PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" -MESA_LLVM_RELEASE ?= "6.0" -PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \ - ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" -export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" -PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" - -OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}" -PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}" - -PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" - -EXTRA_OECONF_remove_libc-musl = "--enable-glx-tls" -EXTRA_OECONF_append_libc-musl = " --disable-glx-tls" -EXTRA_OECONF_append_libc-musl_x86 = " --disable-asm" - -# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) -FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" - -CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" -EXTRA_OEMAKE += "WAYLAND_PROTOCOLS_DATADIR=${STAGING_DATADIR}/wayland-protocols" - -# Remove the mesa dependency on mesa-dev, as mesa is empty -RDEPENDS_${PN}-dev = "" - -# Add dependency so that GLES3 header don't need to be added manually -RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev" - -PACKAGES =+ "libegl-mesa libegl-mesa-dev \ - libosmesa libosmesa-dev \ - libgl-mesa libgl-mesa-dev \ - libglapi libglapi-dev \ - libgbm libgbm-dev \ - libgles1-mesa libgles1-mesa-dev \ - libgles2-mesa libgles2-mesa-dev \ - libgles3-mesa libgles3-mesa-dev \ - libwayland-egl libwayland-egl-dev \ - libxatracker libxatracker-dev \ - mesa-megadriver mesa-vulkan-drivers \ - " - -do_install_append () { - # Drivers never need libtool .la files - rm -f ${D}${libdir}/dri/*.la - rm -f ${D}${libdir}/egl/*.la - rm -f ${D}${libdir}/gallium-pipe/*.la - rm -f ${D}${libdir}/gbm/*.la - - # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used - rm -f ${D}${sysconfdir}/drirc - chrpath --delete ${D}${libdir}/dri/*_dri.so || true -} - -# For the packages that make up the OpenGL interfaces, inject variables so that -# they don't get Debian-renamed (which would remove the -mesa suffix), and -# RPROVIDEs/RCONFLICTs on the generic libgl name. -python __anonymous() { - pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() - for p in (("egl", "libegl", "libegl1"), - ("dri", "libgl", "libgl1"), - ("gles", "libgles1", "libglesv1-cm1"), - ("gles", "libgles2", "libglesv2-2"), - ("gles", "libgles3",)): - if not p[0] in pkgconfig: - continue - fullp = p[1] + "-mesa" - pkgs = " ".join(p[1:]) - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) - - d.appendVar("RRECOMMENDS_" + fullp, " mesa-megadriver") - - # For -dev, the first element is both the Debian and original name - fullp += "-dev" - pkgs = p[1] + "-dev" - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) -} - -python mesa_populate_packages() { - pkgs = ['mesa', 'mesa-dev', 'mesa-dbg'] - for pkg in pkgs: - d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) - d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) - d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) - - import re - dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri") - if os.path.isdir(dri_drivers_root): - dri_pkgs = os.listdir(dri_drivers_root) - lib_name = d.expand("${MLPREFIX}mesa-megadriver") - for p in dri_pkgs: - m = re.match('^(.*)_dri\.so$', p) - if m: - pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1)) - d.appendVar("RPROVIDES_%s" % lib_name, pkg_name) - d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) - d.appendVar("RREPLACES_%s" % lib_name, pkg_name) - - pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe") - do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') -} - -PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " - -PACKAGES_DYNAMIC += "^mesa-driver-.*" - -FILES_${PN} += "${sysconfdir}/drirc" -FILES_mesa-megadriver = "${libdir}/dri/*" -FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" -FILES_libegl-mesa = "${libdir}/libEGL.so.*" -FILES_libgbm = "${libdir}/libgbm.so.*" -FILES_libgles1-mesa = "${libdir}/libGLESv1*.so.*" -FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*" -FILES_libgl-mesa = "${libdir}/libGL.so.*" -FILES_libglapi = "${libdir}/libglapi.so.*" -FILES_libosmesa = "${libdir}/libOSMesa.so.*" -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" -FILES_libxatracker = "${libdir}/libxatracker.so.*" - -FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan" -FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" -FILES_libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" -FILES_libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" -FILES_libglapi-dev = "${libdir}/libglapi.*" -FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" -FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" -FILES_libgles3-mesa-dev = "${includedir}/GLES3" -FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" -FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ - ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ - ${libdir}/pkgconfig/xatracker.pc" diff --git a/meta-intel-extras/recipes/mesa/mesa_18.1.9.bb b/meta-intel-extras/recipes/mesa/mesa_18.1.9.bb deleted file mode 100644 index 86d6a6bf..00000000 --- a/meta-intel-extras/recipes/mesa/mesa_18.1.9.bb +++ /dev/null @@ -1,21 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://0001-Simplify-wayland-scanner-lookup.patch \ - file://0002-winsys-svga-drm-Include-sys-types.h.patch \ - file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \ - file://0004-Use-Python-3-to-execute-the-scripts.patch \ - file://0005-dri-i965-Add-missing-time.h-include.patch \ - file://0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ -" - -SRC_URI[md5sum] = "2f8d2098ab478bc3907e42130577b54a" -SRC_URI[sha256sum] = "55f5778d58a710a63d6635f000535768faf7db9e8144dc0f4fd1989f936c1a83" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf index 0e85afe7..6b2e55a2 100644 --- a/meta-raspberrypi-extras/conf/layer.conf +++ b/meta-raspberrypi-extras/conf/layer.conf @@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_rpi" BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_rpi = "20" -LAYERSERIES_COMPAT_b2qt_rpi = "sumo" +LAYERSERIES_COMPAT_b2qt_rpi = "thud" diff --git a/meta-raspberrypi-extras/recipes/wayland/weston_%.bbappend b/meta-raspberrypi-extras/recipes-graphics/wayland/weston_%.bbappend index 25ec2642..25ec2642 100644 --- a/meta-raspberrypi-extras/recipes/wayland/weston_%.bbappend +++ b/meta-raspberrypi-extras/recipes-graphics/wayland/weston_%.bbappend diff --git a/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_%.bbappend b/meta-raspberrypi-extras/recipes-kernel/linux/linux-raspberrypi_%.bbappend index d6ea12fa..067d2b9b 100644 --- a/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_%.bbappend +++ b/meta-raspberrypi-extras/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -28,5 +28,5 @@ ############################################################################ do_configure_prepend() { - echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig + echo "CONFIG_UPROBE_EVENTS=y" >> ${WORKDIR}/defconfig } diff --git a/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch b/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch deleted file mode 100644 index d21fd097..00000000 --- a/meta-raspberrypi-extras/recipes/userland/userland/0001-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e977e56df364e3a89e08bd7b8a27d30360b0ccc7 Mon Sep 17 00:00:00 2001 -From: Hugo Hromic <hhromic@gmail.com> -Date: Sun, 13 May 2018 10:49:04 +0100 -Subject: [PATCH] khronos: backport typedef for EGL_EXT_image_dma_buf_import - -The `gstreamer1.0-plugins-base` package version `1.14` uses `EGL_EXT_image_dma_buf_import`, which -expects the `EGLuint64KHR` typedef that is present in recent versions of Khronos. -However, the older version included in userland does not provide it. - -This patch backports the missing typedef from recent Khronos into userland. -See: <https://www.khronos.org/registry/EGL/api/EGL/eglext.h> - -Submitted to userland in <https://github.com/raspberrypi/userland/pull/467> - -Upstream-Status: Submitted ---- - interface/khronos/include/EGL/eglext.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/interface/khronos/include/EGL/eglext.h b/interface/khronos/include/EGL/eglext.h -index 89a3369..87cf7d2 100755 ---- a/interface/khronos/include/EGL/eglext.h -+++ b/interface/khronos/include/EGL/eglext.h -@@ -190,6 +190,10 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSy - typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value); - #endif - -+#ifndef EGL_KHR_uint64_typedef -+#define EGL_KHR_uint64_typedef 1 -+typedef khronos_uint64_t EGLuint64KHR; -+#endif /* EGL_KHR_uint64_typedef */ - - #ifdef __cplusplus - } diff --git a/meta-renesas-extras/conf/layer.conf b/meta-renesas-extras/conf/layer.conf index 83dde0ec..6379f674 100644 --- a/meta-renesas-extras/conf/layer.conf +++ b/meta-renesas-extras/conf/layer.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -39,4 +39,7 @@ BBFILE_COLLECTIONS += "b2qt_renesas" BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_renesas = "20" -LAYERSERIES_COMPAT_b2qt_renesas = "sumo" +LAYERSERIES_COMPAT_b2qt_renesas = "thud" + +# override meta-renesas layer COMPAT +LAYERSERIES_COMPAT_rcar-gen3 = "thud" diff --git a/meta-renesas-extras/recipes/arm-trusted-firmware/arm-trusted-firmware_git.bbappend b/meta-renesas-extras/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend index 8a62d828..8a62d828 100644 --- a/meta-renesas-extras/recipes/arm-trusted-firmware/arm-trusted-firmware_git.bbappend +++ b/meta-renesas-extras/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend diff --git a/meta-renesas-extras/recipes-bsp/optee/optee-os_git.bbappend b/meta-renesas-extras/recipes-bsp/optee/optee-os_git.bbappend new file mode 100644 index 00000000..98990256 --- /dev/null +++ b/meta-renesas-extras/recipes-bsp/optee/optee-os_git.bbappend @@ -0,0 +1,31 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +# disable -Werror=cast-function-type +EXTRA_OEMAKE += "NOWERROR=1" diff --git a/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend b/meta-renesas-extras/recipes-bsp/u-boot/u-boot_%.bbappend index 3a7bb526..8511d33b 100644 --- a/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend +++ b/meta-renesas-extras/recipes-bsp/u-boot/u-boot_%.bbappend @@ -29,7 +29,11 @@ FILESEXTRAPATHS_prepend_draak := "${THISDIR}/${PN}:" -SRC_URI_append_draak = " file://0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch" +DEPENDS += "bison-native" + +BRANCH = "v2018.09/rcar-3.9.1" +SRCREV = "4d322dccdcf49c0aab18eb703663128aec81cffc" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" LICENSE_draak = "GPLv2+" diff --git a/meta-renesas-extras/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch b/meta-renesas-extras/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch new file mode 100644 index 00000000..1d6174fc --- /dev/null +++ b/meta-renesas-extras/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch @@ -0,0 +1,23 @@ +From c8b5b91b8a794719280b313e7dd844c3c2142668 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Fri, 22 Feb 2019 15:10:24 +0200 +Subject: [PATCH] statx: don't redefine if structs are available from + sys/stat.h + +--- + src/basic/missing.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/basic/missing.h b/src/basic/missing.h +index dddc6de05c..d6ff612680 100644 +--- a/src/basic/missing.h ++++ b/src/basic/missing.h +@@ -1405,7 +1405,7 @@ struct fib_rule_uid_range { + #define PF_KTHREAD 0x00200000 + #endif + +-#if ! HAVE_STRUCT_STATX ++#if ! HAVE_STRUCT_STATX && !HAVE_STRUCT_STATX_IN_SYS_STAT_H + struct statx_timestamp { + int64_t tv_sec; + uint32_t tv_nsec; diff --git a/meta-renesas-extras/recipes-core/systemd/systemd_%.bbappend b/meta-renesas-extras/recipes-core/systemd/systemd_%.bbappend new file mode 100644 index 00000000..3967e5ff --- /dev/null +++ b/meta-renesas-extras/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,33 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-statx-don-t-redefine-if-structs-are-available-from-s.patch \ + " diff --git a/meta-renesas-extras/recipes/gles-module/gles-user-module.bbappend b/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module.bbappend index 9806a3cc..9806a3cc 100644 --- a/meta-renesas-extras/recipes/gles-module/gles-user-module.bbappend +++ b/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module.bbappend diff --git a/meta-renesas-extras/recipes/gles-module/gles-user-module/gl3ext.h b/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module/gl3ext.h index 4d4ea96c..4d4ea96c 100644 --- a/meta-renesas-extras/recipes/gles-module/gles-user-module/gl3ext.h +++ b/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module/gl3ext.h diff --git a/meta-renesas-extras/recipes/mesa/mesa_%.bbappend b/meta-renesas-extras/recipes-graphics/mesa/mesa_%.bbappend index 1da45477..ff73b22d 100644 --- a/meta-renesas-extras/recipes/mesa/mesa_%.bbappend +++ b/meta-renesas-extras/recipes-graphics/mesa/mesa_%.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -29,3 +29,11 @@ # pick random header to make build work INSTALLED_HEADER_draak = "src/egl/wayland/wayland-egl/wayland-egl-backend.h" + +do_install_append() { + # ... and remove it + rm ${D}${includedir}/wayland-egl-backend.h +} + +# previously in libwayland-egl +FILES_${PN}-dev_append_draak = " ${includedir}/EGL/eglmesaext.h" diff --git a/meta-renesas-extras/recipes/wayland/libgbm.bbappend b/meta-renesas-extras/recipes-graphics/wayland/libgbm.bbappend index 502c7cce..502c7cce 100644 --- a/meta-renesas-extras/recipes/wayland/libgbm.bbappend +++ b/meta-renesas-extras/recipes-graphics/wayland/libgbm.bbappend diff --git a/meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend b/meta-renesas-extras/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend index 1330d5fb..1330d5fb 100644 --- a/meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend +++ b/meta-renesas-extras/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend diff --git a/meta-renesas-extras/recipes/wayland/weston_%.bbappend b/meta-renesas-extras/recipes-graphics/wayland/weston_%.bbappend index 9385f7a6..9385f7a6 100644 --- a/meta-renesas-extras/recipes/wayland/weston_%.bbappend +++ b/meta-renesas-extras/recipes-graphics/wayland/weston_%.bbappend diff --git a/meta-renesas-extras/recipes/kernel-module-gles/kernel-module-gles.bbappend b/meta-renesas-extras/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend index ad0959f3..e6e89eb4 100644 --- a/meta-renesas-extras/recipes/kernel-module-gles/kernel-module-gles.bbappend +++ b/meta-renesas-extras/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,4 +27,4 @@ ## ############################################################################ -EXTRA_OEMAKE_append_draak = " COMMON_FLAGS="-Wno-error=expansion-to-defined"" +EXTRA_OEMAKE += "COMMON_FLAGS="-Wno-error=expansion-to-defined -Wno-error=cast-function-type -Wno-error=sizeof-pointer-div -Wno-error=stringop-truncation -Wno-error=packed-not-aligned"" diff --git a/meta-renesas-extras/recipes/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend b/meta-renesas-extras/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend index 19fbff62..19fbff62 100644 --- a/meta-renesas-extras/recipes/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend +++ b/meta-renesas-extras/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend diff --git a/meta-renesas-extras/recipes/kernel-module-vspm/kernel-module-vspm.bbappend b/meta-renesas-extras/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend index 19fbff62..19fbff62 100644 --- a/meta-renesas-extras/recipes/kernel-module-vspm/kernel-module-vspm.bbappend +++ b/meta-renesas-extras/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend diff --git a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend b/meta-renesas-extras/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend index e1022d86..e4021368 100644 --- a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend +++ b/meta-renesas-extras/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend @@ -27,6 +27,8 @@ ## ############################################################################ +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" + # override to remove asm/bpf_perf_event.h do_install_armmultilib_draak () { oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch b/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch index a3a3624c..a3a3624c 100644 --- a/meta-renesas-extras/recipes/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch +++ b/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch b/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch index f7e0c486..f7e0c486 100644 --- a/meta-renesas-extras/recipes/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch +++ b/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch diff --git a/meta-renesas-extras/recipes/linux/linux-renesas_%.bbappend b/meta-renesas-extras/recipes-kernel/linux/linux-renesas_%.bbappend index edabc4b8..edabc4b8 100644 --- a/meta-renesas-extras/recipes/linux/linux-renesas_%.bbappend +++ b/meta-renesas-extras/recipes-kernel/linux/linux-renesas_%.bbappend diff --git a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index 9658abf2..9658abf2 100644 --- a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend diff --git a/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend new file mode 100644 index 00000000..ef8dcdfd --- /dev/null +++ b/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +DEPENDS_append_draak = " wayland-kms libgbm" diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf index 60ee1f17..60ee1f17 100644 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/draak/kms.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf index 4cbbf498..4cbbf498 100644 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/draak/kms.conf +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/ebisu/kms.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf index 4cbbf498..4cbbf498 100644 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/ebisu/kms.conf +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/kms.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf index db7a5032..db7a5032 100644 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/kms.conf +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend index 708ed85e..708ed85e 100644 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend diff --git a/meta-renesas-extras/recipes/qt5/qtbase/oe-device-extra.pri b/meta-renesas-extras/recipes-qt/qt5/qtbase/oe-device-extra.pri index c6f88adc..c6f88adc 100644 --- a/meta-renesas-extras/recipes/qt5/qtbase/oe-device-extra.pri +++ b/meta-renesas-extras/recipes-qt/qt5/qtbase/oe-device-extra.pri diff --git a/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend b/meta-renesas-extras/recipes-qt/qt5/qtbase_git.bbappend index ecba1f14..ecba1f14 100644 --- a/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend +++ b/meta-renesas-extras/recipes-qt/qt5/qtbase_git.bbappend diff --git a/meta-renesas-extras/recipes/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch b/meta-renesas-extras/recipes-qt/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch index ed1339b6..ed1339b6 100644 --- a/meta-renesas-extras/recipes/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch +++ b/meta-renesas-extras/recipes-qt/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch diff --git a/meta-renesas-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-renesas-extras/recipes-qt/qt5/qtwebengine_git.bbappend index cc13b746..cc13b746 100644 --- a/meta-renesas-extras/recipes/qt5/qtwebengine_git.bbappend +++ b/meta-renesas-extras/recipes-qt/qt5/qtwebengine_git.bbappend diff --git a/meta-renesas-extras/recipes/u-boot/u-boot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch b/meta-renesas-extras/recipes/u-boot/u-boot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch deleted file mode 100644 index 639f67da..00000000 --- a/meta-renesas-extras/recipes/u-boot/u-boot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch +++ /dev/null @@ -1,808 +0,0 @@ -From 9b2c282b348dfe966bbba967dc7a45ce817cce50 Mon Sep 17 00:00:00 2001 -From: Tom Rini <trini@konsulko.com> -Date: Mon, 29 Feb 2016 11:34:15 -0500 -Subject: [PATCH] compiler*.h: sync include/linux/compiler*.h with Linux - 4.5-rc6 - -Copy these from Linux v4.5-rc6 tag. - -This is needed so that we can keep up with newer gcc versions. Note -that we don't have the uapi/ hierarchy from the kernel so continue to -use <linux/types.h> - -Signed-off-by: Tom Rini <trini@konsulko.com> ---- - include/linux/compiler-gcc.h | 259 ++++++++++++++++++++++++++++++++--------- - include/linux/compiler-gcc3.h | 23 ---- - include/linux/compiler-gcc4.h | 88 -------------- - include/linux/compiler-gcc5.h | 65 ----------- - include/linux/compiler-intel.h | 5 + - include/linux/compiler.h | 178 ++++++++++++++++++++++++++-- - 6 files changed, 383 insertions(+), 235 deletions(-) - delete mode 100644 include/linux/compiler-gcc3.h - delete mode 100644 include/linux/compiler-gcc4.h - delete mode 100644 include/linux/compiler-gcc5.h - -diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h -index e057bd2..22ab246 100644 ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -5,14 +5,28 @@ - /* - * Common definitions for all gcc versions go here. - */ --#define GCC_VERSION (__GNUC__ * 10000 \ -- + __GNUC_MINOR__ * 100 \ -- + __GNUC_PATCHLEVEL__) -- -+#define GCC_VERSION (__GNUC__ * 10000 \ -+ + __GNUC_MINOR__ * 100 \ -+ + __GNUC_PATCHLEVEL__) - - /* Optimization barrier */ -+ - /* The "volatile" is due to gcc bugs */ - #define barrier() __asm__ __volatile__("": : :"memory") -+/* -+ * This version is i.e. to prevent dead stores elimination on @ptr -+ * where gcc and llvm may behave differently when otherwise using -+ * normal barrier(): while gcc behavior gets along with a normal -+ * barrier(), llvm needs an explicit input variable to be assumed -+ * clobbered. The issue is as follows: while the inline asm might -+ * access any memory it wants, the compiler could have fit all of -+ * @ptr into memory registers instead, and since @ptr never escaped -+ * from that, it proofed that the inline asm wasn't touching any of -+ * it. This version works well with both compilers, i.e. we're telling -+ * the compiler that the inline asm absolutely may see the contents -+ * of @ptr. See also: https://llvm.org/bugs/show_bug.cgi?id=15495 -+ */ -+#define barrier_data(ptr) __asm__ __volatile__("": :"r"(ptr) :"memory") - - /* - * This macro obfuscates arithmetic on a variable address so that gcc -@@ -32,58 +46,63 @@ - * the inline assembly constraint from =g to =r, in this particular - * case either is valid. - */ --#define RELOC_HIDE(ptr, off) \ -- ({ unsigned long __ptr; \ -- __asm__ ("" : "=r"(__ptr) : "0"(ptr)); \ -- (typeof(ptr)) (__ptr + (off)); }) -+#define RELOC_HIDE(ptr, off) \ -+({ \ -+ unsigned long __ptr; \ -+ __asm__ ("" : "=r"(__ptr) : "0"(ptr)); \ -+ (typeof(ptr)) (__ptr + (off)); \ -+}) - - /* Make the optimizer believe the variable can be manipulated arbitrarily. */ --#define OPTIMIZER_HIDE_VAR(var) __asm__ ("" : "=r" (var) : "0" (var)) -+#define OPTIMIZER_HIDE_VAR(var) \ -+ __asm__ ("" : "=r" (var) : "0" (var)) - - #ifdef __CHECKER__ --#define __must_be_array(arr) 0 -+#define __must_be_array(a) 0 - #else - /* &a[0] degrades to a pointer: a different type from an array */ --#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) -+#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) - #endif - - /* - * Force always-inline if the user requests it so via the .config, - * or if gcc is too old: - */ --#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ -+#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ - !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) --# define inline inline __attribute__((always_inline)) notrace --# define __inline__ __inline__ __attribute__((always_inline)) notrace --# define __inline __inline __attribute__((always_inline)) notrace -+#define inline inline __attribute__((always_inline)) notrace -+#define __inline__ __inline__ __attribute__((always_inline)) notrace -+#define __inline __inline __attribute__((always_inline)) notrace - #else - /* A lot of inline functions can cause havoc with function tracing */ --# define inline inline notrace --# define __inline__ __inline__ notrace --# define __inline __inline notrace -+#define inline inline notrace -+#define __inline__ __inline__ notrace -+#define __inline __inline notrace - #endif - --#define __deprecated __attribute__((deprecated)) --#ifndef __packed --#define __packed __attribute__((packed)) --#endif --#ifndef __weak --#define __weak __attribute__((weak)) --#endif -+#define __always_inline inline __attribute__((always_inline)) -+#define noinline __attribute__((noinline)) -+ -+#define __deprecated __attribute__((deprecated)) -+#define __packed __attribute__((packed)) -+#define __weak __attribute__((weak)) -+#define __alias(symbol) __attribute__((alias(#symbol))) - - /* -- * it doesn't make sense on ARM (currently the only user of __naked) to trace -- * naked functions because then mcount is called without stack and frame pointer -- * being set up and there is no chance to restore the lr register to the value -- * before mcount was called. -+ * it doesn't make sense on ARM (currently the only user of __naked) -+ * to trace naked functions because then mcount is called without -+ * stack and frame pointer being set up and there is no chance to -+ * restore the lr register to the value before mcount was called. -+ * -+ * The asm() bodies of naked functions often depend on standard calling -+ * conventions, therefore they must be noinline and noclone. - * -- * The asm() bodies of naked functions often depend on standard calling conventions, -- * therefore they must be noinline and noclone. GCC 4.[56] currently fail to enforce -- * this, so we must do so ourselves. See GCC PR44290. -+ * GCC 4.[56] currently fail to enforce this, so we must do so ourselves. -+ * See GCC PR44290. - */ --#define __naked __attribute__((naked)) noinline __noclone notrace -+#define __naked __attribute__((naked)) noinline __noclone notrace - --#define __noreturn __attribute__((noreturn)) -+#define __noreturn __attribute__((noreturn)) - - /* - * From the GCC manual: -@@ -95,34 +114,170 @@ - * would be. - * [...] - */ --#ifndef __pure --#define __pure __attribute__((pure)) -+#define __pure __attribute__((pure)) -+#define __aligned(x) __attribute__((aligned(x))) -+#define __printf(a, b) __attribute__((format(printf, a, b))) -+#define __scanf(a, b) __attribute__((format(scanf, a, b))) -+#define __attribute_const__ __attribute__((__const__)) -+#define __maybe_unused __attribute__((unused)) -+#define __always_unused __attribute__((unused)) -+ -+/* gcc version specific checks */ -+ -+#if GCC_VERSION < 30200 -+# error Sorry, your compiler is too old - please upgrade it. -+#endif -+ -+#if GCC_VERSION < 30300 -+# define __used __attribute__((__unused__)) -+#else -+# define __used __attribute__((__used__)) -+#endif -+ -+#ifdef CONFIG_GCOV_KERNEL -+# if GCC_VERSION < 30400 -+# error "GCOV profiling support for gcc versions below 3.4 not included" -+# endif /* __GNUC_MINOR__ */ -+#endif /* CONFIG_GCOV_KERNEL */ -+ -+#if GCC_VERSION >= 30400 -+#define __must_check __attribute__((warn_unused_result)) -+#endif -+ -+#if GCC_VERSION >= 40000 -+ -+/* GCC 4.1.[01] miscompiles __weak */ -+#ifdef __KERNEL__ -+# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101 -+# error Your version of gcc miscompiles the __weak directive -+# endif -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __compiler_offsetof(a, b) \ -+ __builtin_offsetof(a, b) -+ -+#if GCC_VERSION >= 40100 && GCC_VERSION < 40600 -+# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) -+#endif -+ -+#if GCC_VERSION >= 40300 -+/* Mark functions as cold. gcc will assume any path leading to a call -+ * to them will be unlikely. This means a lot of manual unlikely()s -+ * are unnecessary now for any paths leading to the usual suspects -+ * like BUG(), printk(), panic() etc. [but let's keep them for now for -+ * older compilers] -+ * -+ * Early snapshots of gcc 4.3 don't support this and we can't detect this -+ * in the preprocessor, but we can live with this because they're unreleased. -+ * Maketime probing would be overkill here. -+ * -+ * gcc also has a __attribute__((__hot__)) to move hot functions into -+ * a special section, but I don't see any sense in this right now in -+ * the kernel context -+ */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+#endif /* GCC_VERSION >= 40300 */ -+ -+#if GCC_VERSION >= 40500 -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+#endif /* GCC_VERSION >= 40500 */ -+ -+#if GCC_VERSION >= 40600 -+/* -+ * When used with Link Time Optimization, gcc can optimize away C functions or -+ * variables which are referenced only from assembly code. __visible tells the -+ * optimizer that something else uses this function or variable, thus preventing -+ * this. -+ */ -+#define __visible __attribute__((externally_visible)) - #endif --#ifndef __aligned --#define __aligned(x) __attribute__((aligned(x))) -+ -+ -+#if GCC_VERSION >= 40900 && !defined(__CHECKER__) -+/* -+ * __assume_aligned(n, k): Tell the optimizer that the returned -+ * pointer can be assumed to be k modulo n. The second argument is -+ * optional (default 0), so we use a variadic macro to make the -+ * shorthand. -+ * -+ * Beware: Do not apply this to functions which may return -+ * ERR_PTRs. Also, it is probably unwise to apply it to functions -+ * returning extra information in the low bits (but in that case the -+ * compiler should see some alignment anyway, when the return value is -+ * massaged by 'flags = ptr & 3; ptr &= ~3;'). -+ */ -+#define __assume_aligned(a, ...) __attribute__((__assume_aligned__(a, ## __VA_ARGS__))) - #endif --#define __printf(a, b) __attribute__((format(printf, a, b))) --#define __scanf(a, b) __attribute__((format(scanf, a, b))) --#define noinline __attribute__((noinline)) --#define __attribute_const__ __attribute__((__const__)) --#define __maybe_unused __attribute__((unused)) --#define __always_unused __attribute__((unused)) - --#define __gcc_header(x) #x --#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) --#define gcc_header(x) _gcc_header(x) --#include gcc_header(__GNUC__) -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#if GCC_VERSION >= 40400 -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#endif -+#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600) -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ -+ -+#if GCC_VERSION >= 50000 -+#define KASAN_ABI_VERSION 4 -+#elif GCC_VERSION >= 40902 -+#define KASAN_ABI_VERSION 3 -+#endif -+ -+#if GCC_VERSION >= 40902 -+/* -+ * Tell the compiler that address safety instrumentation (KASAN) -+ * should not be applied to that function. -+ * Conflicts with inlining: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368 -+ */ -+#define __no_sanitize_address __attribute__((no_sanitize_address)) -+#endif -+ -+#endif /* gcc version >= 40000 specific checks */ - - #if !defined(__noclone) - #define __noclone /* not needed */ - #endif - -+#if !defined(__no_sanitize_address) -+#define __no_sanitize_address -+#endif -+ - /* - * A trick to suppress uninitialized variable warning without generating any - * code - */ - #define uninitialized_var(x) x = x -- --#ifndef __always_inline --#define __always_inline inline __attribute__((always_inline)) --#endif -diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h -deleted file mode 100644 -index 7d89feb..0000000 ---- a/include/linux/compiler-gcc3.h -+++ /dev/null -@@ -1,23 +0,0 @@ --#ifndef __LINUX_COMPILER_H --#error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead." --#endif -- --#if GCC_VERSION < 30200 --# error Sorry, your compiler is too old - please upgrade it. --#endif -- --#if GCC_VERSION >= 30300 --# define __used __attribute__((__used__)) --#else --# define __used __attribute__((__unused__)) --#endif -- --#if GCC_VERSION >= 30400 --#define __must_check __attribute__((warn_unused_result)) --#endif -- --#ifdef CONFIG_GCOV_KERNEL --# if GCC_VERSION < 30400 --# error "GCOV profiling support for gcc versions below 3.4 not included" --# endif /* __GNUC_MINOR__ */ --#endif /* CONFIG_GCOV_KERNEL */ -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -deleted file mode 100644 -index 2507fd2..0000000 ---- a/include/linux/compiler-gcc4.h -+++ /dev/null -@@ -1,88 +0,0 @@ --#ifndef __LINUX_COMPILER_H --#error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead." --#endif -- --/* GCC 4.1.[01] miscompiles __weak */ --#ifdef __KERNEL__ --# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101 --# error Your version of gcc miscompiles the __weak directive --# endif --#endif -- --#define __used __attribute__((__used__)) --#define __must_check __attribute__((warn_unused_result)) --#define __compiler_offsetof(a,b) __builtin_offsetof(a,b) -- --#if GCC_VERSION >= 40100 && GCC_VERSION < 40600 --# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) --#endif -- --#if GCC_VERSION >= 40300 --/* Mark functions as cold. gcc will assume any path leading to a call -- to them will be unlikely. This means a lot of manual unlikely()s -- are unnecessary now for any paths leading to the usual suspects -- like BUG(), printk(), panic() etc. [but let's keep them for now for -- older compilers] -- -- Early snapshots of gcc 4.3 don't support this and we can't detect this -- in the preprocessor, but we can live with this because they're unreleased. -- Maketime probing would be overkill here. -- -- gcc also has a __attribute__((__hot__)) to move hot functions into -- a special section, but I don't see any sense in this right now in -- the kernel context */ --#define __cold __attribute__((__cold__)) -- --#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -- --#ifndef __CHECKER__ --# define __compiletime_warning(message) __attribute__((warning(message))) --# define __compiletime_error(message) __attribute__((error(message))) --#endif /* __CHECKER__ */ --#endif /* GCC_VERSION >= 40300 */ -- --#if GCC_VERSION >= 40500 --/* -- * Mark a position in code as unreachable. This can be used to -- * suppress control flow warnings after asm blocks that transfer -- * control elsewhere. -- * -- * Early snapshots of gcc 4.5 don't support this and we can't detect -- * this in the preprocessor, but we can live with this because they're -- * unreleased. Really, we need to have autoconf for the kernel. -- */ --#define unreachable() __builtin_unreachable() -- --/* Mark a function definition as prohibited from being cloned. */ --#define __noclone __attribute__((__noclone__)) -- --#endif /* GCC_VERSION >= 40500 */ -- --#if GCC_VERSION >= 40600 --/* -- * Tell the optimizer that something else uses this function or variable. -- */ --#define __visible __attribute__((externally_visible)) --#endif -- --/* -- * GCC 'asm goto' miscompiles certain code sequences: -- * -- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -- * -- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -- * Fixed in GCC 4.8.2 and later versions. -- * -- * (asm goto is automatically volatile - the naming reflects this.) -- */ --#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -- --#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP --#if GCC_VERSION >= 40400 --#define __HAVE_BUILTIN_BSWAP32__ --#define __HAVE_BUILTIN_BSWAP64__ --#endif --#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600) --#define __HAVE_BUILTIN_BSWAP16__ --#endif --#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ -diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h -deleted file mode 100644 -index c8c5659..0000000 ---- a/include/linux/compiler-gcc5.h -+++ /dev/null -@@ -1,65 +0,0 @@ --#ifndef __LINUX_COMPILER_H --#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." --#endif -- --#define __used __attribute__((__used__)) --#define __must_check __attribute__((warn_unused_result)) --#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -- --/* Mark functions as cold. gcc will assume any path leading to a call -- to them will be unlikely. This means a lot of manual unlikely()s -- are unnecessary now for any paths leading to the usual suspects -- like BUG(), printk(), panic() etc. [but let's keep them for now for -- older compilers] -- -- Early snapshots of gcc 4.3 don't support this and we can't detect this -- in the preprocessor, but we can live with this because they're unreleased. -- Maketime probing would be overkill here. -- -- gcc also has a __attribute__((__hot__)) to move hot functions into -- a special section, but I don't see any sense in this right now in -- the kernel context */ --#define __cold __attribute__((__cold__)) -- --#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -- --#ifndef __CHECKER__ --# define __compiletime_warning(message) __attribute__((warning(message))) --# define __compiletime_error(message) __attribute__((error(message))) --#endif /* __CHECKER__ */ -- --/* -- * Mark a position in code as unreachable. This can be used to -- * suppress control flow warnings after asm blocks that transfer -- * control elsewhere. -- * -- * Early snapshots of gcc 4.5 don't support this and we can't detect -- * this in the preprocessor, but we can live with this because they're -- * unreleased. Really, we need to have autoconf for the kernel. -- */ --#define unreachable() __builtin_unreachable() -- --/* Mark a function definition as prohibited from being cloned. */ --#define __noclone __attribute__((__noclone__)) -- --/* -- * Tell the optimizer that something else uses this function or variable. -- */ --#define __visible __attribute__((externally_visible)) -- --/* -- * GCC 'asm goto' miscompiles certain code sequences: -- * -- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -- * -- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -- * -- * (asm goto is automatically volatile - the naming reflects this.) -- */ --#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -- --#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP --#define __HAVE_BUILTIN_BSWAP32__ --#define __HAVE_BUILTIN_BSWAP64__ --#define __HAVE_BUILTIN_BSWAP16__ --#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ -diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h -index ba147a1..d4c7113 100644 ---- a/include/linux/compiler-intel.h -+++ b/include/linux/compiler-intel.h -@@ -13,9 +13,14 @@ - /* Intel ECC compiler doesn't support gcc specific asm stmts. - * It uses intrinsics to do the equivalent things. - */ -+#undef barrier -+#undef barrier_data - #undef RELOC_HIDE - #undef OPTIMIZER_HIDE_VAR - -+#define barrier() __memory_barrier() -+#define barrier_data(ptr) barrier() -+ - #define RELOC_HIDE(ptr, off) \ - ({ unsigned long __ptr; \ - __ptr = (unsigned long) (ptr); \ -diff --git a/include/linux/compiler.h b/include/linux/compiler.h -index d5ad7b1..020ad16 100644 ---- a/include/linux/compiler.h -+++ b/include/linux/compiler.h -@@ -17,6 +17,7 @@ - # define __release(x) __context__(x,-1) - # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0) - # define __percpu __attribute__((noderef, address_space(3))) -+# define __pmem __attribute__((noderef, address_space(5))) - #ifdef CONFIG_SPARSE_RCU_POINTER - # define __rcu __attribute__((noderef, address_space(4))) - #else -@@ -42,6 +43,7 @@ extern void __chk_io_ptr(const volatile void __iomem *); - # define __cond_lock(x,c) (c) - # define __percpu - # define __rcu -+# define __pmem - #endif - - /* Indirect macros required for expanded argument pasting, eg. __LINE__. */ -@@ -54,7 +56,11 @@ extern void __chk_io_ptr(const volatile void __iomem *); - #include <linux/compiler-gcc.h> - #endif - -+#if defined(CC_USING_HOTPATCH) && !defined(__CHECKER__) -+#define notrace __attribute__((hotpatch(0,0))) -+#else - #define notrace __attribute__((no_instrument_function)) -+#endif - - /* Intel compiler defines __GNUC__. So we will overwrite implementations - * coming from above header files here -@@ -138,7 +144,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - */ - #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) ) - #define __trace_if(cond) \ -- if (__builtin_constant_p((cond)) ? !!(cond) : \ -+ if (__builtin_constant_p(!!(cond)) ? !!(cond) : \ - ({ \ - int ______r; \ - static struct ftrace_branch_data \ -@@ -165,6 +171,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - # define barrier() __memory_barrier() - #endif - -+#ifndef barrier_data -+# define barrier_data(ptr) barrier() -+#endif -+ - /* Unreachable code */ - #ifndef unreachable - # define unreachable() do { } while (1) -@@ -186,6 +196,126 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - # define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __LINE__) - #endif - -+#include <linux/types.h> -+ -+#define __READ_ONCE_SIZE \ -+({ \ -+ switch (size) { \ -+ case 1: *(__u8 *)res = *(volatile __u8 *)p; break; \ -+ case 2: *(__u16 *)res = *(volatile __u16 *)p; break; \ -+ case 4: *(__u32 *)res = *(volatile __u32 *)p; break; \ -+ case 8: *(__u64 *)res = *(volatile __u64 *)p; break; \ -+ default: \ -+ barrier(); \ -+ __builtin_memcpy((void *)res, (const void *)p, size); \ -+ barrier(); \ -+ } \ -+}) -+ -+static __always_inline -+void __read_once_size(const volatile void *p, void *res, int size) -+{ -+ __READ_ONCE_SIZE; -+} -+ -+#ifdef CONFIG_KASAN -+/* -+ * This function is not 'inline' because __no_sanitize_address confilcts -+ * with inlining. Attempt to inline it may cause a build failure. -+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368 -+ * '__maybe_unused' allows us to avoid defined-but-not-used warnings. -+ */ -+static __no_sanitize_address __maybe_unused -+void __read_once_size_nocheck(const volatile void *p, void *res, int size) -+{ -+ __READ_ONCE_SIZE; -+} -+#else -+static __always_inline -+void __read_once_size_nocheck(const volatile void *p, void *res, int size) -+{ -+ __READ_ONCE_SIZE; -+} -+#endif -+ -+static __always_inline void __write_once_size(volatile void *p, void *res, int size) -+{ -+ switch (size) { -+ case 1: *(volatile __u8 *)p = *(__u8 *)res; break; -+ case 2: *(volatile __u16 *)p = *(__u16 *)res; break; -+ case 4: *(volatile __u32 *)p = *(__u32 *)res; break; -+ case 8: *(volatile __u64 *)p = *(__u64 *)res; break; -+ default: -+ barrier(); -+ __builtin_memcpy((void *)p, (const void *)res, size); -+ barrier(); -+ } -+} -+ -+/* -+ * Prevent the compiler from merging or refetching reads or writes. The -+ * compiler is also forbidden from reordering successive instances of -+ * READ_ONCE, WRITE_ONCE and ACCESS_ONCE (see below), but only when the -+ * compiler is aware of some particular ordering. One way to make the -+ * compiler aware of ordering is to put the two invocations of READ_ONCE, -+ * WRITE_ONCE or ACCESS_ONCE() in different C statements. -+ * -+ * In contrast to ACCESS_ONCE these two macros will also work on aggregate -+ * data types like structs or unions. If the size of the accessed data -+ * type exceeds the word size of the machine (e.g., 32 bits or 64 bits) -+ * READ_ONCE() and WRITE_ONCE() will fall back to memcpy and print a -+ * compile-time warning. -+ * -+ * Their two major use cases are: (1) Mediating communication between -+ * process-level code and irq/NMI handlers, all running on the same CPU, -+ * and (2) Ensuring that the compiler does not fold, spindle, or otherwise -+ * mutilate accesses that either do not require ordering or that interact -+ * with an explicit memory barrier or atomic instruction that provides the -+ * required ordering. -+ */ -+ -+#define __READ_ONCE(x, check) \ -+({ \ -+ union { typeof(x) __val; char __c[1]; } __u; \ -+ if (check) \ -+ __read_once_size(&(x), __u.__c, sizeof(x)); \ -+ else \ -+ __read_once_size_nocheck(&(x), __u.__c, sizeof(x)); \ -+ __u.__val; \ -+}) -+#define READ_ONCE(x) __READ_ONCE(x, 1) -+ -+/* -+ * Use READ_ONCE_NOCHECK() instead of READ_ONCE() if you need -+ * to hide memory access from KASAN. -+ */ -+#define READ_ONCE_NOCHECK(x) __READ_ONCE(x, 0) -+ -+#define WRITE_ONCE(x, val) \ -+({ \ -+ union { typeof(x) __val; char __c[1]; } __u = \ -+ { .__val = (__force typeof(x)) (val) }; \ -+ __write_once_size(&(x), __u.__c, sizeof(x)); \ -+ __u.__val; \ -+}) -+ -+/** -+ * smp_cond_acquire() - Spin wait for cond with ACQUIRE ordering -+ * @cond: boolean expression to wait for -+ * -+ * Equivalent to using smp_load_acquire() on the condition variable but employs -+ * the control dependency of the wait to reduce the barrier on many platforms. -+ * -+ * The control dependency provides a LOAD->STORE order, the additional RMB -+ * provides LOAD->LOAD order, together they provide LOAD->{LOAD,STORE} order, -+ * aka. ACQUIRE. -+ */ -+#define smp_cond_acquire(cond) do { \ -+ while (!(cond)) \ -+ cpu_relax(); \ -+ smp_rmb(); /* ctrl + rmb := acquire */ \ -+} while (0) -+ - #endif /* __KERNEL__ */ - - #endif /* __ASSEMBLY__ */ -@@ -304,6 +434,14 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - #define __visible - #endif - -+/* -+ * Assume alignment of return value. -+ */ -+#ifndef __assume_aligned -+#define __assume_aligned(a, ...) -+#endif -+ -+ - /* Are two types/vars the same type (ignoring qualifiers)? */ - #ifndef __same_type - # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b)) -@@ -311,7 +449,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - - /* Is this type a native word size -- useful for atomic operations */ - #ifndef __native_word --# define __native_word(t) (sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long)) -+# define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long)) - #endif - - /* Compile time object size, -1 for unknown */ -@@ -373,12 +511,38 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - * to make the compiler aware of ordering is to put the two invocations of - * ACCESS_ONCE() in different C statements. - * -- * This macro does absolutely -nothing- to prevent the CPU from reordering, -- * merging, or refetching absolutely anything at any time. Its main intended -- * use is to mediate communication between process-level code and irq/NMI -- * handlers, all running on the same CPU. -+ * ACCESS_ONCE will only work on scalar types. For union types, ACCESS_ONCE -+ * on a union member will work as long as the size of the member matches the -+ * size of the union and the size is smaller than word size. -+ * -+ * The major use cases of ACCESS_ONCE used to be (1) Mediating communication -+ * between process-level code and irq/NMI handlers, all running on the same CPU, -+ * and (2) Ensuring that the compiler does not fold, spindle, or otherwise -+ * mutilate accesses that either do not require ordering or that interact -+ * with an explicit memory barrier or atomic instruction that provides the -+ * required ordering. -+ * -+ * If possible use READ_ONCE()/WRITE_ONCE() instead. -+ */ -+#define __ACCESS_ONCE(x) ({ \ -+ __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \ -+ (volatile typeof(x) *)&(x); }) -+#define ACCESS_ONCE(x) (*__ACCESS_ONCE(x)) -+ -+/** -+ * lockless_dereference() - safely load a pointer for later dereference -+ * @p: The pointer to load -+ * -+ * Similar to rcu_dereference(), but for situations where the pointed-to -+ * object's lifetime is managed by something other than RCU. That -+ * "something other" might be reference counting or simple immortality. - */ --#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x)) -+#define lockless_dereference(p) \ -+({ \ -+ typeof(p) _________p1 = READ_ONCE(p); \ -+ smp_read_barrier_depends(); /* Dependency order vs. p above. */ \ -+ (_________p1); \ -+}) - - /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */ - #ifdef CONFIG_KPROBES --- -2.7.4 - diff --git a/meta-tegra-extras/conf/layer.conf b/meta-tegra-extras/conf/layer.conf index f5b4906b..190f188f 100644 --- a/meta-tegra-extras/conf/layer.conf +++ b/meta-tegra-extras/conf/layer.conf @@ -39,4 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_tegra" BBFILE_PATTERN_b2qt_tegra := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_tegra = "20" -LAYERSERIES_COMPAT_b2qt_tegra = "sumo" +LAYERSERIES_COMPAT_b2qt_tegra = "thud" diff --git a/meta-tegra-extras/recipes/initscripts/tegra210-minimal-init/init-boot.sh b/meta-tegra-extras/recipes-core/initscripts/tegra210-minimal-init/init-boot.sh index 3e43b607..3e43b607 100644 --- a/meta-tegra-extras/recipes/initscripts/tegra210-minimal-init/init-boot.sh +++ b/meta-tegra-extras/recipes-core/initscripts/tegra210-minimal-init/init-boot.sh diff --git a/meta-tegra-extras/recipes/initscripts/tegra210-minimal-init_%.bbappend b/meta-tegra-extras/recipes-core/initscripts/tegra210-minimal-init_%.bbappend index 788524a6..788524a6 100644 --- a/meta-tegra-extras/recipes/initscripts/tegra210-minimal-init_%.bbappend +++ b/meta-tegra-extras/recipes-core/initscripts/tegra210-minimal-init_%.bbappend diff --git a/meta-tegra-extras/recipes/jpeg/libjpeg-turbo_%.bbappend b/meta-tegra-extras/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend index c92eafa3..c92eafa3 100644 --- a/meta-tegra-extras/recipes/jpeg/libjpeg-turbo_%.bbappend +++ b/meta-tegra-extras/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend diff --git a/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch b/meta-tegra-extras/recipes-kernel/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch index dd58eeda..dd58eeda 100644 --- a/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch +++ b/meta-tegra-extras/recipes-kernel/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch diff --git a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend b/meta-tegra-extras/recipes-kernel/linux/linux-tegra_%.bbappend index 14506228..14506228 100644 --- a/meta-tegra-extras/recipes/linux/linux-tegra_%.bbappend +++ b/meta-tegra-extras/recipes-kernel/linux/linux-tegra_%.bbappend diff --git a/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend b/meta-tegra-extras/recipes-qt/qt5/qtbase_git.bbappend index d48d6ac8..d48d6ac8 100644 --- a/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend +++ b/meta-tegra-extras/recipes-qt/qt5/qtbase_git.bbappend diff --git a/meta-toradex-extras/classes/image_type_tezi_thud.bbclass b/meta-toradex-extras/classes/image_type_tezi_thud.bbclass new file mode 100644 index 00000000..22af0713 --- /dev/null +++ b/meta-toradex-extras/classes/image_type_tezi_thud.bbclass @@ -0,0 +1,250 @@ +inherit image_types + +do_image_teziimg[depends] += "tezi-metadata:do_deploy virtual/bootloader:do_deploy" + +TEZI_ROOT_FSTYPE ??= "ext4" +UBOOT_BINARY ??= "u-boot.${UBOOT_SUFFIX}" +UBOOT_BINARY_TEZI = "${UBOOT_BINARY}" +UBOOT_BINARY_TEZI_apalis-t30 = "apalis_t30.img" +UBOOT_BINARY_TEZI_apalis-tk1 = "apalis-tk1.img" +UBOOT_BINARY_TEZI_apalis-tk1-mainline = "apalis-tk1.img" +UBOOT_ENV_TEZI = "uEnv.txt" + +def rootfs_get_size(d): + import subprocess + + # Calculate size of rootfs in kilobytes... + output = subprocess.check_output(['du', '-ks', + d.getVar('IMAGE_ROOTFS', True)]) + return int(output.split()[0]) + +def rootfs_tezi_emmc(d): + import subprocess + from collections import OrderedDict + deploydir = d.getVar('DEPLOY_DIR_IMAGE', True) + kernel = d.getVar('KERNEL_IMAGETYPE', True) + offset_bootrom = d.getVar('OFFSET_BOOTROM_PAYLOAD', True) + offset_spl = d.getVar('OFFSET_SPL_PAYLOAD', True) + imagename = d.getVar('IMAGE_NAME', True) + imagename_suffix = d.getVar('IMAGE_NAME_SUFFIX', True) + + # Calculate size of bootfs... + bootfiles = [ os.path.join(deploydir, kernel) ] + has_devicetree = d.getVar('KERNEL_DEVICETREE', True) + if has_devicetree: + for dtb in d.getVar('KERNEL_DEVICETREE', True).split(): + bootfiles.append(os.path.join(deploydir, dtb)) + + args = ['du', '-kLc'] + args.extend(bootfiles) + output = subprocess.check_output(args) + bootfssize_kb = int(output.splitlines()[-1].split()[0]) + + bootpart_rawfiles = [] + + has_spl = d.getVar('SPL_BINARY', True) + if has_spl: + bootpart_rawfiles.append( + { + "filename": d.getVar('SPL_BINARY', True), + "dd_options": "seek=" + offset_bootrom + }) + bootpart_rawfiles.append( + { + "filename": d.getVar('UBOOT_BINARY_TEZI', True), + "dd_options": "seek=" + (offset_spl if has_spl else offset_bootrom) + }) + + return [ + OrderedDict({ + "name": "mmcblk0", + "partitions": [ + { + "partition_size_nominal": 16, + "want_maximised": False, + "content": { + "label": "BOOT", + "filesystem_type": "FAT", + "mkfs_options": "", + "filename": imagename + ".bootfs.tar.xz", + "uncompressed_size": bootfssize_kb / 1024 + } + }, + { + "partition_size_nominal": 512, + "want_maximised": True, + "content": { + "label": "RFS", + "filesystem_type": d.getVar('TEZI_ROOT_FSTYPE', True), + "mkfs_options": "-E nodiscard", + "filename": imagename + imagename_suffix + ".tar.xz", + "uncompressed_size": rootfs_get_size(d) / 1024 + } + } + ] + }), + OrderedDict({ + "name": "mmcblk0boot0", + "content": { + "filesystem_type": "raw", + "rawfiles": bootpart_rawfiles + } + })] + + +def rootfs_tezi_rawnand(d): + from collections import OrderedDict + imagename = d.getVar('IMAGE_NAME', True) + imagename_suffix = d.getVar('IMAGE_NAME_SUFFIX', True) + + # Use device tree mapping to create product id <-> device tree relationship + dtmapping = d.getVarFlags('TORADEX_PRODUCT_IDS') + dtfiles = [] + for f, v in dtmapping.items(): + dtfiles.append({ "filename": v, "product_ids": f }) + + return [ + OrderedDict({ + "name": "u-boot1", + "content": { + "rawfile": { + "filename": d.getVar('UBOOT_BINARY_TEZI', True), + "size": 1 + } + }, + }), + OrderedDict({ + "name": "u-boot2", + "content": { + "rawfile": { + "filename": d.getVar('UBOOT_BINARY_TEZI', True), + "size": 1 + } + } + }), + OrderedDict({ + "name": "ubi", + "ubivolumes": [ + { + "name": "kernel", + "size_kib": 8192, + "type": "static", + "content": { + "rawfile": { + "filename": d.getVar('KERNEL_IMAGETYPE', True), + "size": 5 + } + } + }, + { + "name": "dtb", + "content": { + "rawfiles": dtfiles + }, + "size_kib": 128, + "type": "static" + }, + { + "name": "m4firmware", + "size_kib": 896, + "type": "static" + }, + { + "name": "rootfs", + "content": { + "filesystem_type": "ubifs", + "filename": imagename + imagename_suffix + ".tar.xz", + "uncompressed_size": rootfs_get_size(d) / 1024 + } + } + ] + })] + +python rootfs_tezi_json() { + import json + from collections import OrderedDict + from datetime import datetime + + deploydir = d.getVar('DEPLOY_DIR_IMAGE', True) + # patched in IMAGE_CMD_teziimg() below + release_date = "%release_date%" + + data = OrderedDict({ "config_format": 2, "autoinstall": False }) + + # Use image recipes SUMMARY/DESCRIPTION/PV... + data["name"] = d.getVar('SUMMARY', True) + data["description"] = d.getVar('DESCRIPTION', True) + data["version"] = d.getVar('PV', True) + data["release_date"] = release_date + data["u_boot_env"] = d.getVar('UBOOT_ENV_TEZI', True) + if os.path.exists(os.path.join(deploydir, "prepare.sh")): + data["prepare_script"] = "prepare.sh" + if os.path.exists(os.path.join(deploydir, "wrapup.sh")): + data["wrapup_script"] = "wrapup.sh" + if os.path.exists(os.path.join(deploydir, "marketing.tar")): + data["marketing"] = "marketing.tar" + if os.path.exists(os.path.join(deploydir, "toradexlinux.png")): + data["icon"] = "toradexlinux.png" + + product_ids = d.getVar('TORADEX_PRODUCT_IDS', True) + if product_ids is None: + bb.fatal("Supported Toradex product ids missing, assign TORADEX_PRODUCT_IDS with a list of product ids.") + + data["supported_product_ids"] = d.getVar('TORADEX_PRODUCT_IDS', True).split() + + if bb.utils.contains("TORADEX_FLASH_TYPE", "rawnand", True, False, d): + data["mtddevs"] = rootfs_tezi_rawnand(d) + else: + data["blockdevs"] = rootfs_tezi_emmc(d) + + deploy_dir = d.getVar('DEPLOY_DIR_IMAGE', True) + with open(os.path.join(deploy_dir, 'image.json'), 'w') as outfile: + json.dump(data, outfile, indent=4) + bb.note("Toradex Easy Installer metadata file image.json written.") +} + +do_image_teziimg[prefuncs] += "rootfs_tezi_json" + +IMAGE_CMD_teziimg () { + bbnote "Create bootfs tarball" + + # Fixup release_date in image.json, convert ${DATE} to isoformat + # This works around the non fatal ERRORS: "the basehash value changed" when DATE is referenced + # in a python prefunction to do_image + ISODATE=`echo ${DATE} | sed 's/\(....\)\(..\)\(..\)/\1-\2-\3/'` + sed -i "s/%release_date%/$ISODATE/" ${DEPLOY_DIR_IMAGE}/image.json + + # Create list of device tree files + if test -n "${KERNEL_DEVICETREE}"; then + for DTS_FILE in ${KERNEL_DEVICETREE}; do + DTS_BASE_NAME=`basename ${DTS_FILE} .dtb` + if [ -e "${DEPLOY_DIR_IMAGE}/${DTS_BASE_NAME}.dtb" ]; then + KERNEL_DEVICETREE_FILES="${KERNEL_DEVICETREE_FILES} ${DTS_BASE_NAME}.dtb" + else + bbfatal "${DTS_FILE} does not exist." + fi + done + fi + + cd ${DEPLOY_DIR_IMAGE} + + case "${TORADEX_FLASH_TYPE}" in + rawnand) + # The first transform strips all folders from the files to tar, the + # second transform "moves" them in a subfolder ${IMAGE_NAME}_${PV}. + # The third transform removes zImage from the device tree. + ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${UBOOT_ENV_TEZI} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.xz + ;; + *) + # Create bootfs... + ${IMAGE_CMD_TAR} --transform="flags=r;s|${KERNEL_IMAGETYPE}-||" -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar -C ${DEPLOY_DIR_IMAGE} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE_FILES} + xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${XZ_INTEGRITY_CHECK} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar > ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz + + # The first transform strips all folders from the files to tar, the + # second transform "moves" them in a subfolder ${IMAGE_NAME}-Tezi_${PV}. + ${IMAGE_CMD_TAR} --transform='s/.*\///' --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar image.json toradexlinux.png marketing.tar prepare.sh wrapup.sh ${SPL_BINARY} ${UBOOT_BINARY_TEZI} ${UBOOT_ENV_TEZI} ${IMGDEPLOYDIR}/${IMAGE_NAME}.bootfs.tar.xz ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar.xz + ;; + esac +} + +IMAGE_TYPEDEP_teziimg += "tar.xz" diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf index 3a43fd7e..ef241bec 100644 --- a/meta-toradex-extras/conf/layer.conf +++ b/meta-toradex-extras/conf/layer.conf @@ -39,8 +39,8 @@ BBFILE_COLLECTIONS += "b2qt_toradex" BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_toradex = "20" -LAYERSERIES_COMPAT_b2qt_toradex = "sumo" +LAYERSERIES_COMPAT_b2qt_toradex = "thud" # override toradex layer COMPATs -LAYERSERIES_COMPAT_toradex-bsp-common-layer = "sumo" -LAYERSERIES_COMPAT_toradex-nxp-layer = "sumo" +LAYERSERIES_COMPAT_toradex-bsp-common-layer = "thud" +LAYERSERIES_COMPAT_toradex-nxp-layer = "thud" diff --git a/meta-toradex-extras/recipes/tezi-metadata/files/Built_with_Qt.png b/meta-toradex-extras/recipes-bsp/tezi-metadata/files/Built_with_Qt.png Binary files differindex 15f05686..15f05686 100644 --- a/meta-toradex-extras/recipes/tezi-metadata/files/Built_with_Qt.png +++ b/meta-toradex-extras/recipes-bsp/tezi-metadata/files/Built_with_Qt.png diff --git a/meta-toradex-extras/recipes/tezi-metadata/files/TEZI_B2QT_EULA.TXT b/meta-toradex-extras/recipes-bsp/tezi-metadata/files/TEZI_B2QT_EULA.TXT index 750ad525..750ad525 100644 --- a/meta-toradex-extras/recipes/tezi-metadata/files/TEZI_B2QT_EULA.TXT +++ b/meta-toradex-extras/recipes-bsp/tezi-metadata/files/TEZI_B2QT_EULA.TXT diff --git a/meta-toradex-extras/recipes/tezi-metadata/tezi-metadata_%.bbappend b/meta-toradex-extras/recipes-bsp/tezi-metadata/tezi-metadata_%.bbappend index 3f7d7962..3f7d7962 100644 --- a/meta-toradex-extras/recipes/tezi-metadata/tezi-metadata_%.bbappend +++ b/meta-toradex-extras/recipes-bsp/tezi-metadata/tezi-metadata_%.bbappend diff --git a/meta-toradex-extras/recipes-core/systemd/systemd/0001-systemd-udevd.service.in-set-MountFlags-shared.patch b/meta-toradex-extras/recipes-core/systemd/systemd/0001-systemd-udevd.service.in-set-MountFlags-shared.patch new file mode 100644 index 00000000..ef7e541d --- /dev/null +++ b/meta-toradex-extras/recipes-core/systemd/systemd/0001-systemd-udevd.service.in-set-MountFlags-shared.patch @@ -0,0 +1,22 @@ +From 2a9d175360f1ed3ef85e336a329a9e803226096e Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.oss.09@gmail.com> +Date: Thu, 29 Oct 2015 19:38:50 +0100 +Subject: [PATCH] systemd-udevd.service.in: set MountFlags=shared + +This allows for udevd automounting of drives accessible to all. +--- + units/systemd-udevd.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in +index 6a3814e5d9..e3f3ad3293 100644 +--- a/units/systemd-udevd.service.in ++++ b/units/systemd-udevd.service.in +@@ -25,7 +25,6 @@ ExecStart=@rootlibexecdir@/systemd-udevd + KillMode=mixed + WatchdogSec=3min + TasksMax=infinity +-PrivateMounts=yes + MemoryDenyWriteExecute=yes + RestrictRealtime=yes + RestrictAddressFamilies=AF_UNIX AF_NETLINK AF_INET AF_INET6 diff --git a/meta-toradex-extras/recipes-core/systemd/systemd_%.bbappend b/meta-toradex-extras/recipes-core/systemd/systemd_%.bbappend new file mode 100644 index 00000000..52e23dc7 --- /dev/null +++ b/meta-toradex-extras/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,33 @@ +############################################################################ +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-systemd-udevd.service.in-set-MountFlags-shared.patch \ +" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch b/meta-toradex-extras/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch index 1f63fee0..1f63fee0 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch +++ b/meta-toradex-extras/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend b/meta-toradex-extras/recipes-kernel/linux/linux-toradex_4.9-1.0.x.bbappend index eadfa154..eadfa154 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend +++ b/meta-toradex-extras/recipes-kernel/linux/linux-toradex_4.9-1.0.x.bbappend diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 96b0cc33..44e8888b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -18,44 +18,44 @@ <project name="poky" remote="yocto" - revision="84b78df15ff77b2fe2aeb62fcaa265dce7ebfbbb" + revision="1cab405d88149fd63322a867c6adb4a80ba68db3" path="sources/poky"/> <project name="meta-openembedded" remote="oe-mirror" - revision="8760facba1bceb299b3613b8955621ddaa3d4c3f" + revision="6ef9657068492d4644079c88f2adee9c3cac9543" path="sources/meta-openembedded"/> <project name="meta-qt5" remote="qtyocto" - revision="3c86e3c28f00129fd408f9ad8daddd034bb19161" + revision="a2158ae2f8e347335b0e96f5524f173078819eee" path="sources/meta-qt5"/> <project name="meta-mingw" remote="qtyocto" - revision="628dcfed62ce8dcc408e5b4a5e5c0aaa921b20ad" + revision="fa4ea76d93c87a2ad3ce88b052c282106b2761e4" path="sources/meta-mingw"/> <project name="meta-freescale" remote="freescale" - revision="27ca94f8a4336790ba117b4298566f6820e7e74c" + revision="9d1463c9af81edadf8c5a343a030555b6156f8cf" path="sources/meta-freescale" groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> <project name="meta-freescale-3rdparty" remote="freescale" - revision="82037216280a39957fb4272581637abec734ad50" + revision="47848bff9478999019947f69a719b3d2c2a6b558" path="sources/meta-freescale-3rdparty" groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> <project name="meta-raspberrypi" remote="yocto" - revision="2d40b000021bc8a9ef7f329ed0ad410f8d227b97" + revision="a48743dc36e31170cf737e200cc88f273e13611a" path="sources/meta-raspberrypi" groups="notdefault,external,rpi"/> <project name="meta-intel" remote="intel" - revision="90af97d23fb2a56187c2fe2a3f4f4190d7cc2605" + revision="7ea89b9ddcdd3de1629bae1465425c8077c5aa06" path="sources/meta-intel" groups="notdefault,external,intel"/> <project name="meta-tegra" remote="madisongh" - revision="f74dd569798b0387b78cce854713e5852a0bae1a" + revision="da90b42297f5d14d362015be1c5a888f5cac946a" path="sources/meta-tegra" groups="notdefault,external,jetson"/> <project name="meta-renesas" @@ -70,22 +70,22 @@ groups="notdefault,external,renesas-draak"/> <project name="meta-linaro" remote="linaro" - revision="282b47a10940c26854c1cca0ec40950192af16fc" + revision="edb7ffc2a121df7596385595abe75180296103e0" path="sources/meta-linaro" groups="notdefault,external,renesas-gen3,renesas-draak"/> <project name="meta-toradex-bsp-common" remote="toradex" - revision="3e713eef6e056c955b82adaf4b45286a98c3fcdf" + revision="b3fe56eec075ccd719b0ec1fde32ad9c37f0cca0" path="sources/meta-toradex-bsp-common" groups="notdefault,external,toradex"/> <project name="meta-toradex-nxp" remote="toradex" - revision="656677f4a68e6747971a4a30550cd72c3beb6a76" + revision="53d4be5b9b8f609ae713e6eea8e935a73f7f7fd6" path="sources/meta-toradex-nxp" groups="notdefault,external,toradex"/> <project name="meta-boundary" remote="boundary" - revision="412ef0b92df0575808c2292cc4983e118c1a19f8" + revision="0533dbf42abee6e07be572eacc3d965772aad7a4" path="sources/meta-boundary" groups="notdefault,external,boundary"/> <project name="meta-fsl-bsp-release" diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh index 2172c015..868b2591 100755 --- a/scripts/update-qt5-modules.sh +++ b/scripts/update-qt5-modules.sh @@ -36,6 +36,7 @@ if [ $# -lt 1 ]; then fi SHA1S=$(git -C $1 submodule status --recursive | cut -c2- | awk '{print $1$2}') +SHA1S=${SHA1S,,} LAYERDIR=${2:-$PWD} for S in $SHA1S; do diff --git a/scripts/upload.sh b/scripts/upload.sh index 9d4448c4..cfc75528 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -36,10 +36,10 @@ UPLOADPATH=QT@ci-files02-hki.intra.qt.io:/srv/jenkins_data/enterprise/b2qt/yocto UPLOADS="\ tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \ - tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \ + tmp/deploy/sdk/b2qt-${MINGW}-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \ tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-${MACHINE}.sh \ tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-x86_64-${MACHINE}-${RELEASE}.qbsp \ - tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-i686-mingw32-${MACHINE}-${RELEASE}.qbsp \ + tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-${MINGW}-${MACHINE}-${RELEASE}.qbsp \ " for f in ${UPLOADS}; do |
