diff options
113 files changed, 457 insertions, 253 deletions
diff --git a/SCR/SCR-5.4.24_2.1.0.txt b/SCR/SCR-5.4.24_2.1.0.txt index e01b9cb3..67aab05a 100644 --- a/SCR/SCR-5.4.24_2.1.0.txt +++ b/SCR/SCR-5.4.24_2.1.0.txt @@ -4,7 +4,7 @@ Release - Linux 5.4.24_2.1.0 June 2020 Yocto Project recipe manifest: -repo init -u https://source.codeaurora.org/external/imx/imx-manifest -b imx-linux-zeus -m imx_5.4.24_2.1.0.xml +repo init -u https://github.com/nxp-imx/imx-manifest -b imx-linux-zeus -m imx_5.4.24_2.1.0.xml Release tag: rel_imx_5.4.24_2.1.0 @@ -18,7 +18,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: The Linux kernel with i.MX-specific drivers -Release Location: https://source.codeaurora.org/external/imx/linux-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/linux-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) kernel.org (GPL-2.0) - https://www.kernel.org/ @@ -30,7 +30,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Bootloader with i.MX-specific capabilities -Release Location: https://source.codeaurora.org/external/imx/uboot-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/uboot-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome Android Open Source Project (BSD-2-Clause) - https://source.android.com/ @@ -44,7 +44,7 @@ License File: docs/license.rst Package Category: BSP Type of Content: source Description and comments: ARM Trusted Firmware -Release Location: https://source.codeaurora.org/external/imx/imx-atf -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-atf -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-3-clause) arm-trusted-firmware - ARM Limited (BSD-3-clause) - http://github.com/ARM-software/arm-trusted-firmware/ @@ -99,7 +99,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Make Image BootLoader -Release Location: https://source.codeaurora.org/external/imx/imx-mkimage -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-mkimage -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome @@ -111,7 +111,7 @@ License File: COPYING-LGPL-2.1 Package Category: BSP Type of Content: source Description and comments: BSP libraries -Release Location: https://source.codeaurora.org/external/imx/imx-lib -b master +Release Location: https://github.com/nxp-imx/imx-lib -b master Origin: NXP (LGPL-2.1) -------------------------------------------- @@ -122,7 +122,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Linux unit test applications -Release Location: https://source.codeaurora.org/external/imx/imx-test -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-test -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) module_test: NXP (GPL-2.0+) Hantro Products Oy. (GPL-2.0+) @@ -192,7 +192,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: QCA9377 WLAN linux driver -Release Location: https://source.codeaurora.org/external/imx/qcacld-2.0-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/qcacld-2.0-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (ISC) Qualcomm Atheros, Inc. (ISC) – https://source.codeaurora.org/external/wlan/qcacld-2.0 @@ -228,7 +228,7 @@ License File: mwifiex*/gpl-2.0.txt Package Category: BSP Type of Content: source Description and comments: NXP Wi-Fi linux SDK -Release Location: https://source.codeaurora.org/external/imx/mwifiex -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/mwifiex -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) -------------------------------------------- @@ -277,7 +277,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Tool to convert Android sparse images to raw images -Release Location: https://source.codeaurora.org/external/imx/simg2img -b master +Release Location: https://github.com/nxp-imx/simg2img -b master Origin: NXP (Apache-2.0) The Android Open Source Project (Apache-2.0) - https://android.googlesource.com/platform/system/core/+/master/libsparse Gary S Brown (Public Domain) - http://www.opensource.apple.com/source/xnu/xnu-1456.1.26/bsd/libkern/crc32.c?txt @@ -315,7 +315,7 @@ License File: LICENSE Package Category: BSP Type of Content: source Description and comments: Open Portable Trusted Execution Environment for TEE Client library -Release Location: https://source.codeaurora.org/external/imx/imx-optee-client -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-optee-client -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-2-Clause) optee_client (BSD-2-Clause) - https://github.com/OP-TEE/optee_client @@ -327,7 +327,7 @@ License File: LICENSE Package Category: BSP Type of Content: source Description and comments: Open Portable Trusted Execution Environment for Linux on ARM -Release Location: https://source.codeaurora.org/external/imx/imx-optee-os -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-optee-os -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-2-Clause) OP-TEE Trusted OS (BSD-2-Clause) - https://github.com/OP-TEE/optee_os Mbed TLS (Apache-2.0) - https://github.com/ARMmbed/mbedtls/ @@ -340,7 +340,7 @@ License File: LICENSE.md Package Category: BSP Type of Content: source Description and comments: Open Portable Trusted Execution Environment sanity tests -Release Location: https://source.codeaurora.org/external/imx/imx-optee-test -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-optee-test -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-2-Clause) optee_test (BSD-2-Clause) - https://github.com/OP-TEE/optee_test @@ -352,7 +352,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: A partitioning Hypervisor based on Linux -Release Location: https://source.codeaurora.org/external/imx/imx-jailhouse -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-jailhouse -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) Siemens AG (GPL-2.0) - https://github.com/siemens/jailhouse @@ -364,7 +364,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: A Virtual Machine Monitor -Release Location: https://source.codeaurora.org/external/imx/imx-xen -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-xen -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) -------------------------------------------- @@ -386,7 +386,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: NXP i.MX Security Middleware Library -Release Location: https://source.codeaurora.org/external/imx/imx-smw -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-smw -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-3-Clause) -------------------------------------------- @@ -399,7 +399,7 @@ License File: vvcam/LICENSE Package Category: Graphics Type of Content: ISP Kernel Module source Description and comments: Kernel Loadable Module for ISP -Release Location: https://source.codeaurora.org/external/imx/isp-vvcam -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/isp-vvcam -b rel_imx_5.4.24_2.1.0 Origin: VeriSilicon Holdings Co., Ltd. (GPL-2.0) -------------------------------------------- @@ -433,7 +433,7 @@ License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: GPU Core IP and test application source -Release Location: https://source.codeaurora.org/external/imx/apitrace-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/apitrace-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) apitrace (MIT) - https://github.com/apitrace/apitrace @@ -481,7 +481,7 @@ License File: COPYING-MIT Package Category: Graphics Type of Content: source Description and comments: Xserver Library extensions -Release Location: https://source.codeaurora.org/external/imx/xf86-video-imx-vivante -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/xf86-video-imx-vivante -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Vivante Corp. (MIT) xorg-server (MIT) - http://xorg.freedesktop.org/ @@ -546,7 +546,7 @@ License File: COPYING Package Category: Graphics Type of Content: source Description and comments: i.MX DRM Direct Rendering Manager -Release Location: https://source.codeaurora.org/external/imx/libdrm-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/libdrm-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) -------------------------------------------- @@ -557,7 +557,7 @@ License File: COPYING Package Category: Graphics Type of Content: source Description and comments: Wayland protocol development -Release Location: https://source.codeaurora.org/external/imx/wayland-protocols-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/wayland-protocols-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Weston (MIT) - https://anongit.freedesktop.org/git/wayland/wayland-protocols.git @@ -569,7 +569,7 @@ License File: COPYING Package Category: Graphics Type of Content: source Description and comments: A reference implementation of a Wayland compositor -Release Location: https://source.codeaurora.org/external/imx/weston-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/weston-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Weston (MIT) - http://github.com/wayland-project/weston/ @@ -581,7 +581,7 @@ License File: LICENSE.txt Package Category: Graphics Type of Content: source Description and comments: Sample program to monitor i.MX GPU performance data -Release Location: https://source.codeaurora.org/external/imx/imx-gputop -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-gputop -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) -------------------------------------------- @@ -680,7 +680,7 @@ License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: i.MX Neural Networks Accelerator Plugin -Release Location: https://source.codeaurora.org/external/imx/nn-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/nn-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Vivante Corporation (MIT) Boost Software (Boost) - https://www.boost.org/ @@ -697,7 +697,7 @@ License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: i.MX OpenCV -Release Location: https://source.codeaurora.org/external/imx/opencv-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/opencv-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-3-Cluse) OpenCV Foundation (BSD-3-Clause) - https://github.com/opencv/opencv Intel Corporation (BSD-3-Clause) @@ -714,7 +714,7 @@ License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: ARM Compute Library fork -Release Location: https://source.codeaurora.org/external/imx/ARM-ComputeLibrary-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/ARM-ComputeLibrary-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) ARM Software (MIT) - https://github.com/ARM-software/ComputeLibrary @@ -755,7 +755,7 @@ License File: COPYING-LGPL-2.1 Package Category: Multimedia Type of Content: source Description and comments: i.MX Gstreamer 1.0 plugins -Release Location: https://source.codeaurora.org/external/imx/imx-gst1.0-plugin -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-gst1.0-plugin -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/ Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/ @@ -769,7 +769,7 @@ License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Open Source Multimedia Farmework -Release Location: https://source.codeaurora.org/external/imx/gstreamer -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/gstreamer -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) GStreamer (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gstreamer/ @@ -781,7 +781,7 @@ License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Gstreamer plugins with good quality code and correct functionality -Release Location: https://source.codeaurora.org/external/imx/gst-plugins-good -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/gst-plugins-good -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/ @@ -793,7 +793,7 @@ License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Collection of well-groomed and well-maintained Gstreamer plugins -Release Location: https://source.codeaurora.org/external/imx/gst-plugins-base -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/gst-plugins-base -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/ @@ -805,7 +805,7 @@ License File: COPYING.LIB Package Category: Multimedia Type of Content: source Description and comments: Gstreamer plug-ins that aren't up to par compared to the rest. Close to good quality but missing something. -Release Location: https://source.codeaurora.org/external/imx/gst-plugins-bad -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/gst-plugins-bad -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Bad (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-bad/ @@ -913,7 +913,7 @@ License File: COPYING.GPL Package Category: Multimedia Type of Content: source Description and comments: Plugins for various audio libraries and sound servers -Release Location: https://source.codeaurora.org/external/imx/imx-alsa-plugins -b nxp/master +Release Location: https://github.com/nxp-imx/imx-alsa-plugins -b nxp/master Origin: NXP (GPL-2.0) Alsa Plugins (GPL-2.0+) - ftp://ftp.alsa-project.org/pub/plugins/ GNU libtool (GPL-2.0+) http://www.gnu.org/software/libtool/ @@ -1037,7 +1037,7 @@ License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: ARM Neural Network SDK -Release Location: https://source.codeaurora.org/external/imx/armnn-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/armnn-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) armnn (MIT) - https://github.com/ARM-software/armnn @@ -1049,7 +1049,7 @@ License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: Onnxruntime cross-platform scoring engine -Release Location: https://source.codeaurora.org/external/imx/onnxruntime-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/onnxruntime-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Microsoft/onnxruntime (MIT) - https://github.com/Microsoft/onnxruntime Google's Protocol Buffer (BSD-3-clause) - https://tracker.debian.org/pkg/protobuf @@ -1074,7 +1074,7 @@ License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: TensorFlow Lite C++ Library -Release Location: https://source.codeaurora.org/external/imx/tensorflow-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/tensorflow-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (Apache-2.0) TensorFlow (Apache-2.0) - https://github.com/tensorflow/tensorflow/ diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass index 0a175e31..d4322e25 100644 --- a/classes/fsl-kernel-localversion.bbclass +++ b/classes/fsl-kernel-localversion.bbclass @@ -12,32 +12,25 @@ SCMVERSION ??= "y" LOCALVERSION ??= "+fslc" -kernel_conf_variable() { - CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" - if test "$2" = "n" - then - echo "# CONFIG_$1 is not set" >> ${B}/.config - else - echo "CONFIG_$1=$2" >> ${B}/.config - fi -} +# LINUX_VERSION_EXTENSION is used as CONFIG_LOCALVERSION by kernel-yocto class +LINUX_VERSION_EXTENSION ?= "${LOCALVERSION}" -do_preconfigure() { - mkdir -p ${B} - echo "" > ${B}/.config - CONF_SED_SCRIPT="" +do_kernel_localversion[dirs] += "${S} ${B}" +do_kernel_localversion() { - kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\"" - if [ "${SCMVERSION}" = "y" ]; then - kernel_conf_variable LOCALVERSION_AUTO y + # Fallback for recipes not able to use LINUX_VERSION_EXTENSION + if [ "${@bb.data.inherits_class('kernel-yocto', d)}" = "False" ]; then + echo "CONFIG_LOCALVERSION=${LOCALVERSION}" >> ${B}/.config fi - sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config' - if [ "${SCMVERSION}" = "y" ]; then # Add GIT revision to the local version head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` printf "%s%s" +g $head > ${S}/.scmversion + + sed -i -e "/CONFIG_LOCALVERSION_AUTO[ =]/d" ${B}/.config + echo "CONFIG_LOCALVERSION_AUTO=y" >> ${B}/.config fi } -addtask preconfigure before do_configure after do_unpack do_patch do_kernel_metadata + +addtask kernel_localversion before do_configure after do_patch do_kernel_configme diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 16c1dcb6..a6d5908b 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -40,6 +40,10 @@ UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" WKS_FILE = "imx-uboot-spl-bootpart.wks.in" +# The fsl distro uses u-boot-imx which does not provide unified functionality +# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. +UBOOT_MACHINE_fsl = "mx6qsabreauto_defconfig" + SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 2fe95dc6..406ad7d7 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -49,6 +49,10 @@ UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" WKS_FILE = "imx-uboot-spl-bootpart.wks.in" +# The fsl distro uses u-boot-imx which does not provide unified functionality +# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. +UBOOT_MACHINE_fsl = "mx6qsabresd_defconfig" + SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 4221321f..f4dd8d79 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -371,18 +371,6 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" -# Certain machines override the default fsl u-boot with the -# fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: -# MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" -UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" -UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" -SPL_BINARY_use-fsl-bsp_mx6 = "" -WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks.in" -UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" -UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" -SPL_BINARY_use-fsl-bsp_mx7 = "" -WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks.in" - SERIAL_CONSOLES = "115200;ttymxc0" SERIAL_CONSOLES_mxs = "115200;ttyAMA0" diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc index cdd0f08f..d5e67874 100644 --- a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc +++ b/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc @@ -14,7 +14,7 @@ CHROMIUM_IMX_COMMON_PATCHES ?= " " CHROMIUM_IMX_VPU_PATCHES ?= " " CHROMIUM_IMX_WAYLAND_PATCHES ?= " " -SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV}" +SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV};protocol=https" do_unpack[postfuncs] += "copy_chromium_imx_files" # using =+ instead of += to make sure add_chromium_imx_patches is diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 2f5f1afa..3a91f46d 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb @@ -6,7 +6,7 @@ PR = "r2" DEPENDS = "libxml2 fmlib tclap" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/fmc;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" SRCREV = "c7576ab7fb6fb09b68ebc40531e5452fc89e5cd5" S = "${WORKDIR}/git" diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc index 187681a8..1f3f9e0f 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc @@ -12,6 +12,8 @@ SRC_URI_append_imxgpu2d += " \ file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ file://0003-i.MX6-force-egl-visual-ID-33.patch \ + file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \ + file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch \ " DEPENDS_append_imxgpu2d = " virtual/kernel virtual/libgles2" diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch new file mode 100644 index 00000000..7eee7cf2 --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch @@ -0,0 +1,25 @@ +From 234580de9d63fd79a8b444358cdaeac111a17061 Mon Sep 17 00:00:00 2001 +From: Mauro Salvini <m.salvini@koansoftware.com> +Date: Thu, 29 Sep 2022 16:06:04 +0200 +Subject: [PATCH 1/2] config.tests: add DEFINES to compile egl test with + imxgpu2d (Vivante) + +Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> +--- + config.tests/unix/egl/egl.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.tests/unix/egl/egl.pro b/config.tests/unix/egl/egl.pro +index f04d0535..bc35b908 100644 +--- a/config.tests/unix/egl/egl.pro ++++ b/config.tests/unix/egl/egl.pro +@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { + + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL ++DEFINES += LINUX=1 EGL_API_FB=1 + + CONFIG -= qt +-- +2.17.1 + diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch new file mode 100644 index 00000000..993df85e --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch @@ -0,0 +1,25 @@ +From adb19c68d3c92eb1a88e49e447ce827f14943486 Mon Sep 17 00:00:00 2001 +From: Mauro Salvini <m.salvini@koansoftware.com> +Date: Thu, 29 Sep 2022 16:12:11 +0200 +Subject: [PATCH 2/2] config.tests: add DEFINES to compile egl4gles1 test with + imxgpu2d (Vivante) + +Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> +--- + config.tests/unix/egl4gles1/egl4gles1.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.tests/unix/egl4gles1/egl4gles1.pro b/config.tests/unix/egl4gles1/egl4gles1.pro +index 667ea8e3..14cb4a76 100644 +--- a/config.tests/unix/egl4gles1/egl4gles1.pro ++++ b/config.tests/unix/egl4gles1/egl4gles1.pro +@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { + + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL ++DEFINES += LINUX=1 EGL_API_FB=1 + + CONFIG -= qt +-- +2.17.1 + diff --git a/recipes-bsp/atf/atf-tools_git.bb b/recipes-bsp/atf/atf-tools_git.bb index 33ec51c2..aa6f1aed 100644 --- a/recipes-bsp/atf/atf-tools_git.bb +++ b/recipes-bsp/atf/atf-tools_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Tools for ARM Trusted Firmware, e.g. FIP image creation tool" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/atf;protocol=https;nobranch=1" SRCREV = "7d748e6f0ec652ba7c43733dc67a3d0b0217390a" S = "${WORKDIR}/git" diff --git a/recipes-bsp/atf/atf_git.bb b/recipes-bsp/atf/atf_git.bb index c7e7b15c..ee8ef5ae 100644 --- a/recipes-bsp/atf/atf_git.bb +++ b/recipes-bsp/atf/atf_git.bb @@ -11,7 +11,7 @@ do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" S = "${WORKDIR}/git" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/atf;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/atf;protocol=https;nobranch=1" SRCREV = "7d748e6f0ec652ba7c43733dc67a3d0b0217390a" COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb index 92ec8307..99e320b4 100644 --- a/recipes-bsp/boot-format/boot-format_git.bb +++ b/recipes-bsp/boot-format/boot-format_git.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" PR = "r6" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/boot-format;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/boot-format;protocol=https;nobranch=1 \ file://flags.patch" SRCREV = "4eb81a6797ef4e58bf7d9b2d58afb37a21c1f550" diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb index 31f6c101..c196fcad 100644 --- a/recipes-bsp/ddr-phy/ddr-phy_git.bb +++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=89cc852481956e861228286ac7430 inherit deploy -SRC_URI = "git://github.com/nxp/ddr-phy-binary.git;nobranch=1" +SRC_URI = "git://github.com/nxp/ddr-phy-binary.git;nobranch=1;protocol=https" SRCREV = "fbc036b88acb6c06ffed02c898cbae9856ec75ba" S = "${WORKDIR}/git" diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.8.bb b/recipes-bsp/firmware-imx/firmware-imx_8.8.bb index 84534a62..8ff4a321 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.8.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.8.bb @@ -16,6 +16,8 @@ do_install() { # SDMA Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin # EASRC Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc diff --git a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb index 60598ae5..3a84cc0d 100644 --- a/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb +++ b/recipes-bsp/fsl-tlu/fsl-tlu_1.0.0.bb @@ -5,7 +5,7 @@ and configuration files." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fsl-tlu;protocol=https;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/fsl-tlu;protocol=https;nobranch=1" SRCREV = "8837cce3c86b30c0931c319e9e1a8ca622ae5354" S = "${WORKDIR}/git" diff --git a/recipes-bsp/imx-atf/imx-atf_2.2.bb b/recipes-bsp/imx-atf/imx-atf_2.2.bb index ab99f2fe..02458e8c 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.2.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m PV .= "+git${SRCPV}" SRCBRANCH = "imx_5.4.24_2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ file://0001-imx-Fix-missing-inclusion-of-cdefs.h.patch \ file://0001-imx-Fix-multiple-definition-of-ipc_handle.patch \ " diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb index b104fafd..9c19b8eb 100644 --- a/recipes-bsp/imx-kobs/imx-kobs_git.bb +++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" PV = "5.5+git${SRCPV}" -SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https \ +SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https;branch=master \ " SRCREV = "cee66d0e956a64d03cc866fa8819da5b798c7f1b" S = "${WORKDIR}/git" diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index d94b2daa..4ebd9521 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb @@ -13,7 +13,7 @@ PE = "1" PV = "5.8+${SRCPV}" SRCBRANCH = "master" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "3f777974c0c146817e2ff5cb0340ca66a1f99e57" S = "${WORKDIR}/git" diff --git a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch new file mode 100644 index 00000000..be8c78aa --- /dev/null +++ b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch @@ -0,0 +1,70 @@ +From fe3d11ae2886f00ff57e2a3d20cdae02cca28234 Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin <andrey.z@gmail.com> +Date: Thu, 21 Oct 2021 08:53:38 +0000 +Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot + +mkimage tool is provided as a part of sysroot from Yocto build. Current +implementation on the imx-mkimge on the other hand copies it locally in +order to invoke it from within the build folder. + +Since recent updates, mkimage requires openssl.so to be installed, which +when local copy is used causes the tool not to operate and fails the +build. + +Use it from the build sysroot, and do not pull the local version of it. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> +--- + iMX8M/soc.mak | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak +index b7b3986..ca00411 100644 +--- a/iMX8M/soc.mak ++++ b/iMX8M/soc.mak +@@ -142,7 +142,7 @@ u-boot.itb: $(dtbs) + ./$(PAD_IMAGE) bl31.bin + ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs) + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs) > u-boot.its +- ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb ++ mkimage -E -p 0x3000 -f u-boot.its u-boot.itb + @rm -f u-boot.its $(dtbs) + + dtbs_ddr3l = valddr3l.dtb +@@ -154,7 +154,7 @@ u-boot-ddr3l.itb: $(dtbs_ddr3l) + ./$(PAD_IMAGE) bl31.bin + ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr3l) + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr3l) > u-boot-ddr3l.its +- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb ++ mkimage -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb + @rm -f u-boot.its $(dtbs_ddr3l) + + dtbs_ddr4 = valddr4.dtb +@@ -166,7 +166,7 @@ u-boot-ddr4.itb: $(dtbs_ddr4) + ./$(PAD_IMAGE) bl31.bin + ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4) + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr4) > u-boot-ddr4.its +- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb ++ mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb + @rm -f u-boot.its $(dtbs_ddr4) + + dtbs_ddr4_evk = evkddr4.dtb +@@ -178,7 +178,7 @@ u-boot-ddr4-evk.itb: $(dtbs_ddr4_evk) + ./$(PAD_IMAGE) bl31.bin + ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4_evk) + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr4_evk) > u-boot-ddr4-evk.its +- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb ++ mkimage -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb + @rm -f u-boot.its $(dtbs_ddr4_evk) + + ifeq ($(HDMI),yes) +@@ -285,7 +285,6 @@ nightly : + @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb + @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_hdmi_imx8m.bin -O signed_hdmi_imx8m.bin + @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin +- @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/mkimage_uboot -O mkimage_uboot + + archive : + git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME) diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index a54b439d..45556718 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" -inherit use-imx-security-controller-firmware +inherit use-imx-security-controller-firmware uboot-sign IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco" IMX_EXTRA_FIRMWARE_mx8m = "firmware-imx-8m" @@ -18,6 +18,8 @@ DEPENDS += " \ imx-atf \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os', '', d)} \ " +# xxd is a dependency of fspi_packer.sh +DEPENDS += "xxd-native" DEPENDS_append_mx8m = " u-boot-mkimage-native dtc-native" BOOT_NAME = "imx-boot" PROVIDES = "${BOOT_NAME}" @@ -96,9 +98,12 @@ compile_mx8m() { cp ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} \ ${BOOT_STAGING}/u-boot-spl.bin cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_DTB_NAME} ${BOOT_STAGING} + if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then + # Use DTB binary patched with signature node + cp ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY} ${BOOT_STAGING}/${UBOOT_DTB_NAME} + fi cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} \ ${BOOT_STAGING}/u-boot-nodtb.bin - cp ${STAGING_DIR_NATIVE}/${bindir}/mkimage ${BOOT_STAGING}/mkimage_uboot cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${BOOT_STAGING}/bl31.bin cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME} ${BOOT_STAGING}/u-boot.bin } @@ -165,7 +170,6 @@ deploy_mx8m() { install -m 0644 ${BOOT_STAGING}/signed_hdmi_imx8m.bin ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0755 ${BOOT_STAGING}/${TOOLS_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} install -m 0755 ${BOOT_STAGING}/mkimage_fit_atf.sh ${DEPLOYDIR}/${BOOT_TOOLS} - install -m 0755 ${BOOT_STAGING}/mkimage_uboot ${DEPLOYDIR}/${BOOT_TOOLS} } deploy_mx8() { install -d ${DEPLOYDIR}/${BOOT_TOOLS} @@ -187,7 +191,7 @@ deploy_mx8x() { } do_deploy() { deploy_${SOC_FAMILY} - # copy the tool mkimage to deploy path and sc fw, dcd and uboot + # copy the sc fw, dcd and uboot to deploy path install -m 0644 ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} # copy tee.bin to deploy path diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index db0f6bf4..a3af6eeb 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -3,7 +3,9 @@ DEPENDS = "zlib-native openssl-native" SRCBRANCH = "imx_5.4.24_2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ + file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \ +" SRCREV = "6745ccdcf15384891639b7ced3aa6ce938682365" S = "${WORKDIR}/git" diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index 61f5e9d4..a46b5115 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -18,7 +18,7 @@ PV = "7.0+${SRCPV}" SRCBRANCH = "lf-5.4.y" SRC_URI = " \ - git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ + git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ file://0001-mxc_v4l2_test-fix-compilation-error-produced-by-gcc9.patch \ file://memtool_profile \ " diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb index bfa6607b..a7a9822b 100644 --- a/recipes-bsp/imx-uuc/imx-uuc_git.bb +++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb @@ -11,7 +11,7 @@ inherit autotools-brokensep PR = "r1" PV = "0.5.1+git${SRCPV}" -SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https" +SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master" SRCREV = "d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc" S = "${WORKDIR}/git" diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.1.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.1.0.bb index a44c9027..286f3c87 100644 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.1.0.bb +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.1.0.bb @@ -13,4 +13,23 @@ S = "${WORKDIR}/${BPN}-${PV}" SRC_URI[md5sum] = "5c254523ae4c44491ea838e84e9aee49" SRC_URI[sha256sum] = "c5dd1fbf8c9776d7a2844a225e0aa2e489aa24eaab8f55cb48a6e3184def235d" +# SCR is the location and name of the Software Content Register file +# relative to ${D}${D_SUBDIR}. +SCR = "SCR.txt" + +do_install () { + install -d ${D}${D_SUBDIR} + cp -r ${S}/* ${D}${D_SUBDIR} + if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then + mv ${D}/usr/lib ${D}${libdir} + fi + rm ${D}${D_SUBDIR}/COPYING + if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then + bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\"" + fi + rm ${D}${D_SUBDIR}/${SCR} +} + +FILES_${PN} = "/" + COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/inphi/inphi_git.bb b/recipes-bsp/inphi/inphi_git.bb index 3f3c5f28..a9718b09 100644 --- a/recipes-bsp/inphi/inphi_git.bb +++ b/recipes-bsp/inphi/inphi_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=86d76166990962fa552f840ff08e5798" inherit deploy -SRC_URI = "git://github.com/nxp/qoriq-firmware-inphi.git;nobranch=1" +SRC_URI = "git://github.com/nxp/qoriq-firmware-inphi.git;nobranch=1;protocol=https" SRCREV = "f22e9ff3bfed8342da6efb699e473b11fbad5695" S = "${WORKDIR}/git" diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb index 9b918f2c..bc40a1cf 100644 --- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb +++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb @@ -8,8 +8,8 @@ SECTION = "base" PV .= "+git${SRCPV}" SRCBRANCH ?= "master" -SRCREV = "d2058aa404ee1e8e8abd552c6a637787bcdcf514" -SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH} \ +SRCREV = "faf547cc2345bfbf95507ab7e86530f85289bb5b" +SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \ file://run-ptest \ " @@ -18,15 +18,23 @@ S = "${WORKDIR}/git" inherit pkgconfig waf use-imx-headers ptest +# dma-heap allocator is unavailable because it requires kernel 5.6 or newer. EXTRA_OECONF = "--imx-linux-headers-path=${STAGING_INCDIR_IMX} \ --libdir=${libdir} \ + --with-dma-heap-allocator=no \ ${PACKAGECONFIG_CONFARGS}" -PACKAGECONFIG ?= " " -PACKAGECONFIG_append_imxgpu2d = " g2d" +# If imxdpu is in use, the DPU is also used for implementing +# libg2d. However, that implementation's g2d_alloc() function +# is broken, so we cannot use it. +LIBG2D_PACKAGECONFIG = "g2d" +LIBG2D_PACKAGECONFIG_imxdpu = "" + +PACKAGECONFIG ?= " ion " +PACKAGECONFIG_append_imxgpu2d = " ${LIBG2D_PACKAGECONFIG}" PACKAGECONFIG_append_imxipu = " ipu" PACKAGECONFIG_append_imxpxp = " pxp" -PACKAGECONFIG_append_mx8m = " dwl ion" +PACKAGECONFIG_append_mx8m = " dwl" HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2" diff --git a/recipes-bsp/ls2-phy/ls2-phy_git.bb b/recipes-bsp/ls2-phy/ls2-phy_git.bb index a1c412be..7369b540 100644 --- a/recipes-bsp/ls2-phy/ls2-phy_git.bb +++ b/recipes-bsp/ls2-phy/ls2-phy_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=86d76166990962fa552f840ff08e5798" inherit deploy -SRC_URI = "git://github.com/nxp/qoriq-firmware-cortina.git;nobranch=1" +SRC_URI = "git://github.com/nxp/qoriq-firmware-cortina.git;nobranch=1;protocol=https" SRCREV = "9143c2a3adede595966583c00ca4edc99ec698cf" S = "${WORKDIR}/git" diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb index 31645061..c2c7b0bc 100644 --- a/recipes-bsp/mc-utils/mc-utils_git.bb +++ b/recipes-bsp/mc-utils/mc-utils_git.bb @@ -9,7 +9,7 @@ DEPENDS += "dtc-native" inherit deploy -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/mc-utils;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/mc-utils;protocol=https;nobranch=1" SRCREV = "8672a5f5abcd3a354dcab07e03f2a8a69b2e962d" S = "${WORKDIR}/git" diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb index 01e24993..62b4b7ad 100644 --- a/recipes-bsp/mxsldr/mxsldr_git.bb +++ b/recipes-bsp/mxsldr/mxsldr_git.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCREV = "c40d80472525e1d57dae5317c028b745968c0399" -SRC_URI = "git://git.denx.de/mxsldr.git \ +SRC_URI = "git://git.denx.de/mxsldr.git;branch=master \ file://0001-Do-not-ignore-OE-cflags-and-ldflags.patch \ " diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb index fd53807f..4e5ee6ec 100644 --- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb +++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb @@ -7,7 +7,7 @@ INHIBIT_DEFAULT_DEPS = "1" inherit deploy -SRC_URI = "git://github.com/NXP/qoriq-engine-pfe-bin.git;nobranch=1" +SRC_URI = "git://github.com/NXP/qoriq-engine-pfe-bin.git;nobranch=1;protocol=https" SRCREV = "d3a8ef0760c54ddc243039c86389497e37be90ab" S = "${WORKDIR}/git" diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb index cecd5903..9e9a769f 100644 --- a/recipes-bsp/qe-ucode/qe-ucode_git.bb +++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=c62f8109b4df15ca37ceeb5e4943626c" inherit deploy -SRC_URI = "git://github.com/NXP/qoriq-qe-ucode.git;nobranch=1" +SRC_URI = "git://github.com/NXP/qoriq-qe-ucode.git;nobranch=1;protocol=https" SRCREV= "57401f6dff6507055558eaa6838116baa8a2fd46" S = "${WORKDIR}/git" diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb index e1e63cce..f4d77198 100644 --- a/recipes-bsp/rcw/rcw_git.bb +++ b/recipes-bsp/rcw/rcw_git.bb @@ -7,7 +7,7 @@ DEPENDS += "tcl-native" inherit deploy siteinfo -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/rcw;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/rcw;protocol=https;nobranch=1" SRCREV = "e0fab6d9b61003caef577f7474c2fac61e6ba2ff" S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc index 94db11cc..11d77e92 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2020.04.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "bison-native" -SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" SRCREV = "88c58453be8cd87eb55f8e283ac4dcce5b59006d" SRCBRANCH = "2020.04+fslc" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.04.bb new file mode 100644 index 00000000..7f02746b --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.04.bb @@ -0,0 +1,8 @@ +# Copyright (C) 2014 O.S. Systems Software LTDA. +# Copyright (C) 2014-2016 Freescale Semiconductor +# Copyright 2017-2019 NXP + +FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-fslc:" + +require u-boot-fslc_${PV}.bb +require u-boot-mfgtool.inc diff --git a/recipes-bsp/u-boot/u-boot-imx-common.inc b/recipes-bsp/u-boot/u-boot-imx-common.inc index e5f15b12..5eb234ce 100644 --- a/recipes-bsp/u-boot/u-boot-imx-common.inc +++ b/recipes-bsp/u-boot/u-boot-imx-common.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCBRANCH = "imx_v2020.04_5.4.24_2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "4979a99482f7e04a3c1f4fb55e3182395ee8f710" DEPENDS += "flex-native bison-native bc-native dtc-native" diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb b/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb index 571fadb7..b32cd1ab 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2019.10.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/u-boot;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1 \ file://0001-patman-Drop-binary-parameter.patch \ file://0001-patman-Update-command.Run-to-handle-failure-better.patch \ file://0001-patman-Adjust-command-to-return-strings-instead-of-b.patch \ diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb index f94a67e2..4c5adf41 100644 --- a/recipes-bsp/uefi/uefi_git.bb +++ b/recipes-bsp/uefi/uefi_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315" inherit deploy -SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1" +SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https" SRCREV= "e95ed52322f15437f98dee2b27de45a7495d648c" S = "${WORKDIR}/git" diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/cst/cst_git.bb index fef0fbcf..d2171283 100644 --- a/recipes-devtools/cst/cst_git.bb +++ b/recipes-devtools/cst/cst_git.bb @@ -16,7 +16,7 @@ inherit kernel-arch #SECURE_PRI_KEY = "/path/srk.pri" #SECURE_PUB_KEY = "/path/srk.pub" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cst;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1 \ file://0001-tools-Mark-struct-input_field-file_field-extern.patch \ " SRCREV = "9aafbdf2441858ceca2779279b6876c6bdc2d3ed" diff --git a/recipes-devtools/devregs/devregs_git.bb b/recipes-devtools/devregs/devregs_git.bb index 7f158fd8..2bee7b8b 100644 --- a/recipes-devtools/devregs/devregs_git.bb +++ b/recipes-devtools/devregs/devregs_git.bb @@ -1,10 +1,10 @@ DESCRIPTION = "i.MX Register tool" SECTION = "devel" -LICENSE = "GPL-1" +LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5003fa041d799dd5dd5f646b74e36924" -SRCREV = "d5f6223027f4d6ae71bd5d432f5611486e0e6074" -SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=http" +SRCREV = "dcc3e3f26d3d867d5297a104dc32bd99f5e6fa71" +SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=https;branch=master" PV = "1.0+${SRCPV}" diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb index c5f51983..1a1e1a9c 100644 --- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb +++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libusb1" SRCREV = "f009770d841468204ab104bf7d3b0c5bc8425dbb" -SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=http" +SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https;branch=master" PV = "1.0+${SRCPV}" diff --git a/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb b/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb index a281170c..7938719f 100644 --- a/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb +++ b/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb @@ -9,7 +9,7 @@ DEPENDS = "glib-2.0 zlib pixman bison-native" LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" -SRC_URI = "gitsm://source.codeaurora.org/external/qoriq/qoriq-components/qemu;nobranch=1 \ +SRC_URI = "gitsm://github.com/nxp-qoriq/qemu;protocol=https;nobranch=1 \ file://powerpc_rom.bin \ file://run-ptest \ file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \ diff --git a/recipes-devtools/utp-com/utp-com_git.bb b/recipes-devtools/utp-com/utp-com_git.bb index db2d7f08..0b0a6cf2 100644 --- a/recipes-devtools/utp-com/utp-com_git.bb +++ b/recipes-devtools/utp-com/utp-com_git.bb @@ -6,7 +6,7 @@ DEPENDS = "sg3-utils" SRCREV = "dee512ced1e9367d223d22f10797fbf9aeacfab6" SRC_URI = " \ - git://github.com/Freescale/utp_com;protocol=https \ + git://github.com/Freescale/utp_com;protocol=https;branch=master \ " PV = "1.0+git${SRCPV}" diff --git a/recipes-dpaa/eth-config/eth-config_git.bb b/recipes-dpaa/eth-config/eth-config_git.bb index cfeae114..f05e1f14 100644 --- a/recipes-dpaa/eth-config/eth-config_git.bb +++ b/recipes-dpaa/eth-config/eth-config_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47716bd5b656aa5e298a132a64d2d1e4" PR = "r2" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/eth-config;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/eth-config;protocol=https;nobranch=1" SRCREV = "6164664070e45810c793f112781ebcedc979e132" S = "${WORKDIR}/git" diff --git a/recipes-dpaa/flib/flib_git.bb b/recipes-dpaa/flib/flib_git.bb index 3ae05889..9152939b 100644 --- a/recipes-dpaa/flib/flib_git.bb +++ b/recipes-dpaa/flib/flib_git.bb @@ -3,7 +3,7 @@ SECTION = "flib" LICENSE = "BSD & GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9f6d1afdf6b0f6b3ba65c25ba589ee53" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/flib;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1" SRCREV = "cbb31427466649c07d2ac2739a41bb42f5f6be7c" S = "${WORKDIR}/git" diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb index 39e4f9d0..4b39b006 100644 --- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb +++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb @@ -7,7 +7,7 @@ PR = "r1" inherit deploy -SRC_URI = "git://github.com/NXP/qoriq-fm-ucode.git;nobranch=1" +SRC_URI = "git://github.com/NXP/qoriq-fm-ucode.git;nobranch=1;protocol=https" SRCREV = "c275e91392e2adab1ed22f3867b8269ca3c54014" S = "${WORKDIR}/git" diff --git a/recipes-dpaa/fmlib/fmlib_git.bb b/recipes-dpaa/fmlib/fmlib_git.bb index 880d768b..ecc3a690 100644 --- a/recipes-dpaa/fmlib/fmlib_git.bb +++ b/recipes-dpaa/fmlib/fmlib_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c7bd5e45d066db084bdb3543d55b1ac" PR = "r1" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/fmlib;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/fmlib;protocol=https;nobranch=1" SRCREV = "69a70474cd8411d5a099c34f40760b6567d781d6" S = "${WORKDIR}/git" diff --git a/recipes-dpaa2/aiopsl/aiopsl_git.bb b/recipes-dpaa2/aiopsl/aiopsl_git.bb index a1b00289..6030dc1f 100644 --- a/recipes-dpaa2/aiopsl/aiopsl_git.bb +++ b/recipes-dpaa2/aiopsl/aiopsl_git.bb @@ -7,7 +7,7 @@ BASEDEPENDS = "" S = "${WORKDIR}/git" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/aiopsl;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/aiopsl;protocol=https;nobranch=1" SRCREV = "87d83d8e99770325cc7ad9e10965c9959e7cb828" do_configure[noexec] = "1" diff --git a/recipes-dpaa2/dce/dce_git.bb b/recipes-dpaa2/dce/dce_git.bb index 0e31a3c4..f52acf85 100644 --- a/recipes-dpaa2/dce/dce_git.bb +++ b/recipes-dpaa2/dce/dce_git.bb @@ -3,8 +3,8 @@ SECTION = "dpaa2" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=956df5ea6cfe0a1dcf2dee7ca37c0cdf" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dce;nobranch=1 \ - git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \ +SRC_URI = "git://github.com/nxp-qoriq/dce;protocol=https;nobranch=1 \ + git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \ " SRCREV = "0ec35ad12ad04b5dadfa9f8c8a718c715bde41db" SRCREV_qbman = "a1af1e1528fe2e1ce0df1e6d9170b6c239c8ab4f" diff --git a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb index a9c3180f..e809a375 100644 --- a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb +++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb @@ -6,7 +6,7 @@ SECTION = "dpaa2" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/gpp-aioptool;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/gpp-aioptool;protocol=https;nobranch=1 \ file://0001-remove-libio.h.patch \ " SRCREV = "6ead470dde043f3ca67f1ba19b313dd64ec199e1" diff --git a/recipes-dpaa2/management-complex/management-complex_10.14.1.bb b/recipes-dpaa2/management-complex/management-complex_10.14.1.bb index ddb305c1..4f30ae93 100644 --- a/recipes-dpaa2/management-complex/management-complex_10.14.1.bb +++ b/recipes-dpaa2/management-complex/management-complex_10.14.1.bb @@ -6,7 +6,7 @@ inherit deploy INHIBIT_DEFAULT_DEPS = "1" -SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1" +SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https" SRCREV = "408110ee632f6291545b0b156cd74e7e3b4612cc" S = "${WORKDIR}/git" diff --git a/recipes-dpaa2/management-complex/management-complex_10.20.4.bb b/recipes-dpaa2/management-complex/management-complex_10.20.4.bb index 3e14a26e..684ca9a9 100644 --- a/recipes-dpaa2/management-complex/management-complex_10.20.4.bb +++ b/recipes-dpaa2/management-complex/management-complex_10.20.4.bb @@ -6,7 +6,7 @@ inherit deploy INHIBIT_DEFAULT_DEPS = "1" -SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1" +SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https" SRCREV = "f73683596a7b72124d67b62e64f3dc2bb36b9321" S = "${WORKDIR}/git" diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb index 0211c779..53d165ee 100644 --- a/recipes-dpaa2/restool/restool_git.bb +++ b/recipes-dpaa2/restool/restool_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ec8d84e9cd4de287e290275d09db27f0" RDEPENDS_${PN} += "bash dtc" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/restool;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \ file://0001-restool-fix-build-error-with-gcc7.patch" SRCREV = "f0cec094e4c6d1c975b377203a3bf994ba9325a9" diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb index e9bf1427..5b0d4974 100644 --- a/recipes-dpaa2/spc/spc_git.bb +++ b/recipes-dpaa2/spc/spc_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=163b09a1c249a6ff2b28da1ceca2e0a8" DEPENDS = "libxml2 fmlib tclap" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/spc;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/spc;protocol=https;nobranch=1" SRCREV = "be7dd8e346a934aae1e4bdd6b579f2aa4bb5cd86" S = "${WORKDIR}/git" diff --git a/recipes-extended/dpdk/dpdk_19.11-20.04.bb b/recipes-extended/dpdk/dpdk_19.11-20.04.bb index 398d2ec4..13d9e352 100644 --- a/recipes-extended/dpdk/dpdk_19.11-20.04.bb +++ b/recipes-extended/dpdk/dpdk_19.11-20.04.bb @@ -1,6 +1,6 @@ LIC_FILES_CHKSUM = "file://license/README;md5=3383def2d4c82237df281174e981a492" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/dpdk;protocol=https;nobranch=1 \ file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ file://0001-add-Wno-cast-function-type.patch \ file://0001-Add-RTE_KERNELDIR_OUT.patch \ diff --git a/recipes-extended/ipc-ust/ipc-ust_git.bb b/recipes-extended/ipc-ust/ipc-ust_git.bb index df496c28..91e0c288 100644 --- a/recipes-extended/ipc-ust/ipc-ust_git.bb +++ b/recipes-extended/ipc-ust/ipc-ust_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "DSP boot application and ipc test application" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/ipc;branch=nxp/sdk-v2.0.x \ +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ipc;protocol=https;branch=nxp/sdk-v2.0.x \ file://Makefile-use-LDFLAGS-if-set.patch \ " SRCREV = "74d662707558290f070f9589177db730444bc435" diff --git a/recipes-extended/jailhouse/jailhouse_0.11.bb b/recipes-extended/jailhouse/jailhouse_0.11.bb index 32a4f92f..5a1665eb 100644 --- a/recipes-extended/jailhouse/jailhouse_0.11.bb +++ b/recipes-extended/jailhouse/jailhouse_0.11.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ SRCBRANCH = "lf-5.4.y" SRCREV = "82d5698945eafaffa58bab3b4d6da320bf56289c" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-jailhouse.git;protocol=ssh;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/imx-jailhouse.git;protocol=ssh;branch=${SRCBRANCH} \ file://0001-tools-scripts-update-shebang-to-python3.patch \ " diff --git a/recipes-extended/libpkcs11/libpkcs11_git.bb b/recipes-extended/libpkcs11/libpkcs11_git.bb index 33c27ecd..554d5159 100644 --- a/recipes-extended/libpkcs11/libpkcs11_git.bb +++ b/recipes-extended/libpkcs11/libpkcs11_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "PKCS library" LICENSE = "GPLv2 & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/libpkcs11;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/libpkcs11;protocol=https;nobranch=1" SRCREV = "a243fb21772f1bd434d8bc1ac45feb36571afadb" DEPENDS = "openssl secure-obj" diff --git a/recipes-extended/odp/odp.inc b/recipes-extended/odp/odp.inc index 129f77ae..6965c372 100644 --- a/recipes-extended/odp/odp.inc +++ b/recipes-extended/odp/odp.inc @@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ca6103dc75397fb6bec596187d6b7829" FILESEXTRAPATHS_prepend := "${THISDIR}/odp:" SRC_URI = " \ -git://source.codeaurora.org/external/qoriq/qoriq-components/odp;nobranch=1 \ -git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \ -git://source.codeaurora.org/external/qoriq/qoriq-components/flib;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \ +git://github.com/nxp-qoriq/odp;protocol=https;nobranch=1 \ +git://github.com/nxp-qoriq/qbman_userspace;protocol=https;nobranch=1;name=qbman;destsuffix=git/platform/linux-dpaa2/flib/qbman \ +git://github.com/nxp-qoriq/flib;protocol=https;nobranch=1;name=rta;destsuffix=git/platform/linux-dpaa2/flib/rta \ " SRC_URI += "file://0001-Fix-this-build-error.patch" diff --git a/recipes-extended/ofp/ofp_git.bb b/recipes-extended/ofp/ofp_git.bb index c76eafd7..60fc59dd 100644 --- a/recipes-extended/ofp/ofp_git.bb +++ b/recipes-extended/ofp/ofp_git.bb @@ -6,7 +6,7 @@ SECTION = "console/network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=fbe4957c430eed6cc20521d4eb429fae" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ofp;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/ofp;protocol=https;nobranch=1" SRCREV = "fe66f4659f7d356f7aa73a8fb32fcf67c6cf1108" diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb index 9b5d2516..a0dc4a82 100644 --- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb +++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.13.0.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "bash libcrypto libssl python3" inherit python3native -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ovs-dpdk;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/ovs-dpdk;protocol=https;nobranch=1 \ file://0001-netdev-dpdk-have-env-based-configurable-number-of-pa.patch \ " SRCREV = "71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3" diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc index 617601ac..14fa8c3c 100644 --- a/recipes-extended/secure-obj/secure-obj.inc +++ b/recipes-extended/secure-obj/secure-obj.inc @@ -10,7 +10,7 @@ inherit python3native LDFLAGS += "${TOOLCHAIN_OPTIONS}" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/secure_obj;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/secure_obj;protocol=https;nobranch=1 \ " SRCREV = "fb179a861e8e9bfed85ac5ef8387bdd30de48db9" diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb index b75c0feb..1a66e880 100644 --- a/recipes-extended/skmm-ep/skmm-ep_git.bb +++ b/recipes-extended/skmm-ep/skmm-ep_git.bb @@ -7,7 +7,7 @@ DEPENDS = "libedit openssl virtual/kernel" PACKAGE_ARCH = "${MACHINE_ARCH}" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=1 \ file://add-two-missing-header-files.patch \ " SRCREV = "de6816c7d66129683bc62229b482ac3cf585d896" diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb index 5694e91c..108adc02 100644 --- a/recipes-extended/tsntool/tsntool_git.bb +++ b/recipes-extended/tsntool/tsntool_git.bb @@ -7,7 +7,7 @@ DEPENDS = "cjson libnl readline" inherit pkgconfig -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/tsntool;protocol=https;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/tsntool;protocol=https;nobranch=1" SRCREV = "ca2d8fb348bb54960d706177108c43ae213e0063" S = "${WORKDIR}/git" diff --git a/recipes-graphics/drm/libdrm-armada_git.bb b/recipes-graphics/drm/libdrm-armada_git.bb deleted file mode 100644 index a47987a5..00000000 --- a/recipes-graphics/drm/libdrm-armada_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Userspace interface to kernel DRM services" -SECTION = "x11/base" -LICENSE = "GPLv2 & BSD" - -LIC_FILES_CHKSUM = "file://libdrm_lists.h;beginline=1;endline=25;md5=2af1df1026ba1d24c8e7c370e68ed198" - -DEPENDS = "libdrm" - -SRCREV = "6b461c163b0bd02c76b65d94cc2fb3767167bda8" -PV = "0.1+git${SRCPV}" -SRC_URI = "git://git.armlinux.org.uk/~rmk/libdrm-armada.git" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" - -COMPATIBLE_MACHINE ?= "(imx|use-mainline-bsp)" diff --git a/recipes-graphics/drm/libdrm_2.4.99.imx.bb b/recipes-graphics/drm/libdrm_2.4.99.imx.bb index dc2aa8a9..81ee35ab 100644 --- a/recipes-graphics/drm/libdrm_2.4.99.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.99.imx.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5 PROVIDES = "drm" DEPENDS = "libpthread-stubs" -IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1" +IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https;nobranch=1" IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.99" SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ file://musl-ioctl.patch \ diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb index 2f8029a4..7601a1cb 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" DEPENDS = "imx-gpu-viv zlib libpng procps" -SRC_URI = "git://source.codeaurora.org/external/imx/apitrace-imx.git;protocol=https;branch=imx_9.0" +SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_9.0" SRCREV = "fed74f6f84cb4f48ddace4306c9bf90bf7a9a967" S = "${WORKDIR}/git" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 8d429abf..139263be 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -17,17 +17,26 @@ python () { # Enable Etnaviv and Freedreno support PACKAGECONFIG_append_use-mainline-bsp = " gallium etnaviv kmsro freedreno" -USE_OSMESA_ONLY ?= "no" - -# Etnaviv support state for i.MX8 is unknown, therefore only enable OSMesa and -# disable Gallium for now. If you still want to enable Etnaviv, just set -# USE_OSMESA_ONLY_mx8 = "no" in your bbappend. -USE_OSMESA_ONLY_mx8 ?= "yes" - -# Enable OSMesa which also requires dri (classic) swrast -PACKAGECONFIG_append = " ${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', ' osmesa', '', d)}" -PACKAGECONFIG_remove = " ${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', 'gallium', '', d)}" -DRIDRIVERS_append = "${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', 'swrast', '', d)}" +# For NXP BSP, choose between gallium and osmesa, and between enabling +# dri and swrast or not. gallium and dri are default. +# +# For parts with no GPU, use gallium and dri +PACKAGECONFIG_REMOVE_NXPBSP = "" +PACKAGECONFIG_APPEND_NXPBSP = "" +DRIDRIVERS_NXPBSP = "" +# +# For parts with GPU but no DRM, use gallium +PACKAGECONFIG_REMOVE_NXPBSP_imxgpu = "dri" +DRIDRIVERS_NXPBSP_imxgpu = "" +# +# For parts with GPU and DRM, use osmesa, dri, and swrast +PACKAGECONFIG_REMOVE_NXPBSP_imxgpu = "gallium" +PACKAGECONFIG_APPEND_NXPBSP_imxgpu = "osmesa" +DRIDRIVERS_NXPBSP_imxgpu = "swrast" +# +PACKAGECONFIG_remove_use-nxp-bsp = "${PACKAGECONFIG_REMOVE_NXPBSP}" +PACKAGECONFIG_append_use-nxp-bsp = " ${PACKAGECONFIG_APPEND_NXPBSP}" +DRIDRIVERS_use-nxp-bsp = "${DRIDRIVERS_NXPBSP}" BACKEND = \ "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ diff --git a/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb index 7f15bdb3..a799bf59 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" -SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.18" +SRC_URI = "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.18" SRCREV = "ee18c1f66877f7fb652467c349108395c20d4f9a" S = "${WORKDIR}/git" diff --git a/recipes-graphics/wayland/weston_8.0.0.imx.bb b/recipes-graphics/wayland/weston_8.0.0.imx.bb index 24a21db5..4909b826 100644 --- a/recipes-graphics/wayland/weston_8.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_8.0.0.imx.bb @@ -127,7 +127,7 @@ SUMMARY = "Weston, a Wayland compositor, i.MX fork" DEFAULT_PREFERENCE = "-1" SRCBRANCH = "weston-imx-8.0" -SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ diff --git a/recipes-graphics/xorg-driver/xf86-video-armada_git.bb b/recipes-graphics/xorg-driver/xf86-video-armada_git.bb deleted file mode 100644 index 0aba8e5a..00000000 --- a/recipes-graphics/xorg-driver/xf86-video-armada_git.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "X.org graphics driver for KMS based systems with pluggable GPU backend" -DESCRIPTION = "The xf86-video-armada module is a 2D graphics driver for the X Window \ -System as implemented by X.org, supporting these DRM KMS drivers: \ -\ - Freescale i.MX \ - Marvell Armada 510 (Dove) \ -\ -and GPU drivers: \ - Vivante libGAL (Armada only) \ - Etnaviv (Armada and i.MX) with galcore kernel driver \ - Etnaviv (Armada and i.MX) with etnaviv DRM kernel driver \ -" -LICENSE = "BSD" - -require recipes-graphics/xorg-driver/xorg-driver-video.inc - -DEPENDS += "libdrm-armada" - -LIC_FILES_CHKSUM = " \ - file://README;md5=d5271074fb6ad959b7b6cfa68b4adaf0 \ - file://../etna_viv/LICENSE;md5=9d4853905d85f044ed013e75def30a76 \ - " - -SRCREV_armada = "78e7116a5bc6cdd9f93cbf1552d342933623ab59" -SRCREV_etna = "8478eef32fd911ebb300c970071e22227afa1896" -SRCREV_FORMAT = "armada_etna" - -PV = "0.1+git${SRCPV}" - -SRC_URI = " \ - git://git.arm.linux.org.uk/cgit/xf86-video-armada.git;branch=unstable-devel;protocol=http;name=armada \ - git://github.com/etnaviv/etna_viv.git;protocol=https;name=etna;destsuffix=etna_viv \ - " - -S = "${WORKDIR}/git" - -RDEPENDS_${PN} = "xserver-xorg-module-exa \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - " - -EXTRA_OECONF = "--disable-etnaviv \ - --disable-vivante \ - --with-etnaviv-source=${WORKDIR}/etna_viv \ - " - -COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)" diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb index 069008c0..b71e81a3 100644 --- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb +++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3" SRCREV = "c828e8a7c38743e960967e7bb78c134cec31c102" SRCBRANCH = "imx_exa_viv6_g2d" -SRC_URI = "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/xf86-video-imx-vivante.git;protocol=https;branch=${SRCBRANCH} \ file://rc.autohdmi" S = "${WORKDIR}/git" diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb index 68fb67e0..ac084855 100644 --- a/recipes-kernel/ceetm/ceetm_git.bb +++ b/recipes-kernel/ceetm/ceetm_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "CEETM TC QDISC" LICENSE = "GPLv2 & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=bac620b9883d38a84dfb73ca7122d915" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ceetm;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/ceetm;protocol=https;nobranch=1" SRCREV = "6a7f2ec2091df2f4380cb8d25a36c399aed5af1b" SRC_URI_append = " file://0001-Makefile-update-CFLAGS.patch \ " diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-1.10.inc b/recipes-kernel/cryptodev/cryptodev-qoriq-1.10.inc index bb785831..f8ce6d6e 100644 --- a/recipes-kernel/cryptodev/cryptodev-qoriq-1.10.inc +++ b/recipes-kernel/cryptodev/cryptodev-qoriq-1.10.inc @@ -13,7 +13,7 @@ python() { d.appendVar("RREPLACES_" + p, ' ' + p.replace('-qoriq', '')) } -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cryptodev-linux;protocol=https;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/cryptodev-linux;protocol=https;nobranch=1" SRCREV = "f3007431120a1b4ae983c2b9ea09051311aa5e2f" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb index feddc8fa..59a8ecc5 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b5881ecf398da8a03a3f4c501e29d287" inherit module -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/auto-resp;branch=nxp/sdk-v2.0.x" +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/auto-resp;protocol=https;branch=nxp/sdk-v2.0.x" SRCREV = "9a74743167dcfcfbca5056eedbff9a52337c9712" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4+fslc.bb index af0b2d60..3e3f8aff 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4+fslc.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4+fslc.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" PV .= "+git${SRCPV}" SRCREV = "f2e8483fbda59bf2482f77efb0804c014848f749" -SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https" +SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4.bb index 7d8d0386..ead4f2f0 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 SRCBRANCH = "imx_5.4.24_2.1.0" LOCALVERSION = "-${SRCBRANCH}" -KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https" +KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https" SRC_URI = " \ ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ file://Add-makefile.patch \ diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc index 350ba186..39466ca9 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc +++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fa38cd73d71527dc6efb546474f64d10" inherit module qoriq_build_64bit_kernel -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/ipc;protocol=https;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ipc;protocol=https;nobranch=1" SRCREV = "74d662707558290f070f9589177db730444bc435" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb index cad18b69..a5801188 100644 --- a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94263f12f9416f9fd0493c8f9e8085a3" inherit module autotools-brokensep -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/ls-dbg;branch=nxp/master" +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ls-dbg;protocol=https;branch=nxp/master" SRCREV = "40501f6659e880d38508cdd34a4df2d348d1c68e" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-perf-qoriq_0.8.2.bb b/recipes-kernel/kernel-modules/kernel-module-perf-qoriq_0.8.2.bb index 4a31f1e3..1ac045b1 100644 --- a/recipes-kernel/kernel-modules/kernel-module-perf-qoriq_0.8.2.bb +++ b/recipes-kernel/kernel-modules/kernel-module-perf-qoriq_0.8.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "QorIQ extension to Perf for supporting non core counters" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=e29234dd5d40dc352cc60cc0c93437ba" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/qoriq-perf;branch=nxp/master" +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/qoriq-perf;protocol=https;branch=nxp/master" SRCREV = "7beb3783edac66bab00c85d99a7b073f569af7fd" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc index 0b23a47c..3fb18f06 100644 --- a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc +++ b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc @@ -2,7 +2,7 @@ SUMMARY = "Qualcomm WiFi driver for QCA module 9377 and 6174" LICENSE = "BSD & GPLv2" LIC_FILES_CHKSUM = "file://CORE/HDD/src/wlan_hdd_main.c;beginline=1;endline=20;md5=ec8d62116b13db773825ebf7cf91be1d;" -QCACLD_SRC ?= "git://source.codeaurora.org/external/imx/qcacld-2.0-imx.git;protocol=https" +QCACLD_SRC ?= "git://github.com/nxp-imx/qcacld-2.0-imx.git;protocol=https" SRC_URI = "${QCACLD_SRC};branch=IMX_CNSS.LEA.NRT_3.0_KRL5.4" SRCREV = "7dc91e5977f31d60741c55682564788c0f930163" diff --git a/recipes-kernel/kernel-modules/kernel-module-scatter-gather_git.bb b/recipes-kernel/kernel-modules/kernel-module-scatter-gather_git.bb index 20d894ed..e6afe4fc 100644 --- a/recipes-kernel/kernel-modules/kernel-module-scatter-gather_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-scatter-gather_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9605a22ea50467bd2bfe4cdd66e69ae" inherit module -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/scatter-gather;branch=nxp/master" +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/scatter-gather;protocol=https;branch=nxp/master" SRCREV = "97db173d08a70abe2b9a6fa928299a117f3febc2" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb index f7beed21..28aad165 100644 --- a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb +++ b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "UIO driver for T1040 L2 Switch" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/l2switch-uio;branch=nxp/sdk-v2.0.x" +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/l2switch-uio;protocol=https;branch=nxp/sdk-v2.0.x" SRCREV = "0f31fbcbe9ab1ab9c424da34f70c82314b16f8de" inherit module diff --git a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/imx/defconfig index 742400a9..8781d8bb 100644 --- a/recipes-kernel/linux/linux-fslc-imx/imx/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/imx/defconfig @@ -577,3 +577,5 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_FTRACE is not set +CONFIG_ION=y +CONFIG_ION_CMA_HEAP=y diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index adadd83f..df44c71c 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb @@ -28,7 +28,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community." # ------------------------------------------------------------------------------ # 1. Stable (tag or SHA(s)) # ------------------------------------------------------------------------------ -# tag: v5.4.88 +# tag: v5.4.147 # # ------------------------------------------------------------------------------ # 2. NXP-specific (tag or SHA(s)) @@ -73,14 +73,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" SRCBRANCH = "5.4-2.1.x-imx" -SRCREV = "3fd28d5dc75d360340eee1b6b858c29acad0cbb8" +SRCREV = "074a74780f813c7e6037f3ca3e581c405276e502" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.4.88" +LINUX_VERSION = "5.4.147" # Local version indicates the branch name in the NXP kernel tree where patches are collected from. LOCALVERSION = "-imx-5.4.24-2.1.0" diff --git a/recipes-kernel/linux/linux-fslc-mfgtool_5.4.bb b/recipes-kernel/linux/linux-fslc-mfgtool_5.4.bb new file mode 100644 index 00000000..3bed2fa8 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-mfgtool_5.4.bb @@ -0,0 +1,16 @@ +# Copyright (C) 2014-2018 O.S. Systems Software LTDA. +# Copyright (C) 2014-2016 Freescale Semiconductor + +SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" +DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ +that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ +environment" + +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-fslc:" +require linux-fslc_${PV}.bb +require linux-mfgtool.inc + +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +do_package[vardepsexclude] = "DATETIME" + diff --git a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb index eb8cf0c4..a82483c3 100644 --- a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb @@ -14,4 +14,4 @@ LINUX_VERSION = "5.4.64" SRCBRANCH = "5.4.y+qoriq+fslc" SRCREV = "4c04c442c0e91e7cf01f830aca524f09b5613f29" -SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH}" +SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH};protocol=https" diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc index f6d04d59..7315df0d 100644 --- a/recipes-kernel/linux/linux-fslc.inc +++ b/recipes-kernel/linux/linux-fslc.inc @@ -5,6 +5,6 @@ require recipes-kernel/linux/linux-imx.inc DEPENDS += "lzop-native bc-native" -SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH};protocol=https \ file://defconfig" LOCALVERSION = "-fslc" diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index dbb2387c..3526cee7 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig @@ -467,3 +467,5 @@ CONFIG_PROVE_LOCKING=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_FQ_CODEL=y CONFIG_NET_SCH_FIFO=y +CONFIG_ION=y +CONFIG_ION_CMA_HEAP=y diff --git a/recipes-kernel/linux/linux-fslc_5.4.bb b/recipes-kernel/linux/linux-fslc_5.4.bb index 3e8b97a4..fc5924c8 100644 --- a/recipes-kernel/linux/linux-fslc_5.4.bb +++ b/recipes-kernel/linux/linux-fslc_5.4.bb @@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.4.88" +LINUX_VERSION = "5.4.172" SRCBRANCH = "5.4.x+fslc" -SRCREV = "ad377c6ef432605c4f4ab58b3b2a33a163a78ce9" +SRCREV = "9eb5a8b554ee8bd41c6c52ae6f5c74e3c60d16f9" COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" diff --git a/recipes-kernel/linux/linux-imx-headers_5.4.bb b/recipes-kernel/linux/linux-imx-headers_5.4.bb index 54c4e8cb..bb5db8d0 100644 --- a/recipes-kernel/linux/linux-imx-headers_5.4.bb +++ b/recipes-kernel/linux/linux-imx-headers_5.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" SRCBRANCH = "imx_5.4.24_2.1.0" LOCALVERSION = "-2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "dea2fede7e024ee7029b13e8d82a00ec14427777" S = "${WORKDIR}/git" @@ -33,6 +33,7 @@ IMX_UAPI_HEADERS = " \ mxcfb.h \ pxp_device.h \ pxp_dma.h \ + version.h \ videodev2.h \ " diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index d508a727..36823eec 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -14,7 +14,7 @@ SRCBRANCH ?= "" # Set the PV to the correct kernel version to satisfy the kernel version sanity check PV = "${LINUX_VERSION}+git${SRCPV}" -SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/linux-imx;protocol=https;branch=${SRCBRANCH} \ file://defconfig \ " diff --git a/recipes-kernel/linux/linux-imx/imx/defconfig b/recipes-kernel/linux/linux-imx/imx/defconfig index 30792d23..7ac298a7 100644 --- a/recipes-kernel/linux/linux-imx/imx/defconfig +++ b/recipes-kernel/linux/linux-imx/imx/defconfig @@ -577,3 +577,5 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_FTRACE is not set +CONFIG_ION=y +CONFIG_ION_CMA_HEAP=y diff --git a/recipes-kernel/linux/linux-mfgtool.inc b/recipes-kernel/linux/linux-mfgtool.inc index 7ff370e4..93a27d8c 100644 --- a/recipes-kernel/linux/linux-mfgtool.inc +++ b/recipes-kernel/linux/linux-mfgtool.inc @@ -4,4 +4,4 @@ PROVIDES = "linux-mfgtool" -KERNEL_PACKAGE_NAME = "mfgtool" +KERNEL_PACKAGE_NAME = "linux-mfgtool" diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index dcf28401..4d134b47 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc @@ -53,7 +53,7 @@ do_merge_delta_config() { done cp .config ${WORKDIR}/defconfig } -addtask merge_delta_config before do_preconfigure after do_patch +addtask merge_delta_config before do_kernel_localversion after do_patch # The link of dts folder is needed for 32b compile of aarch64 targets(e.g. ls1043ardb-32b) do_compile_prepend_fsl-lsch2-32b() { diff --git a/recipes-kernel/linux/linux-qoriq_5.4.bb b/recipes-kernel/linux/linux-qoriq_5.4.bb index 6a2f9c1f..e5f9e192 100644 --- a/recipes-kernel/linux/linux-qoriq_5.4.bb +++ b/recipes-kernel/linux/linux-qoriq_5.4.bb @@ -2,7 +2,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LINUX_VERSION = "5.4.3" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/linux;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/linux;protocol=https;nobranch=1 \ file://0001-Makfefile-linux-5.4-add-warning-cflags-on-LSDK-20.04.patch \ file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch \ file://0001-perf-tests-bp_account-Make-global-variable-static.patch \ diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb index 4b111b5d..41902ca2 100644 --- a/recipes-kernel/skmm-host/skmm-host_git.bb +++ b/recipes-kernel/skmm-host/skmm-host_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=99803d8e9a595c0bdb45ca710f353813" inherit module qoriq_build_64bit_kernel -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/skmm-host;protocol=https;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-host;protocol=https;nobranch=1" SRCREV = "d5912ebdb8d3b29b1e2df52710e8821d1ce3eb80" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb index db2f71fd..237b4925 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f" inherit autotools pkgconfig use-imx-headers SRCBRANCH = "MM_04.05.01_1909_L4.19.35" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "cde60d68ab2acee913dbfacb8aabb53d87dd3e38" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb index 25186751..4000410d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "-1" PACKAGE_ARCH_imxpxp = "${MACHINE_SOCARCH}" PACKAGE_ARCH_mx8 = "${MACHINE_SOCARCH}" -GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https" +GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" SRCBRANCH = "MM_04.05.05_2005_L5.4.24" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb index f8fc08fa..0bb11c2c 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" -GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" +GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" SRCBRANCH = "MM_04.05.05_2005_L5.4.24" SRCREV = "cad00a3c4318c787c9661990e8f9328e4a69a329" SRC_URI = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb index b85b7842..5b848d0d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb @@ -1,7 +1,7 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc -GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" +GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" SRCBRANCH = "MM_04.05.05_2005_L5.4.24" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.1.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.1.bb index 35996337..394fe39b 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.1.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_0.13.1.bb @@ -18,7 +18,7 @@ PV .= "+git${SRCPV}" SRCBRANCH ?= "master" SRCREV = "805987bff74af13fcb14ff111955206f1c92554d" -SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb new file mode 100644 index 00000000..7e2f2573 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb @@ -0,0 +1,80 @@ +# Copyright (C) 2018 O.S. Systems Software LTDA. +DESCRIPTION = "GStreamer 1.0 plugins for i.MX platforms" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" +SECTION = "multimedia" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base libimxdmabuffer" +# add the audioparsers and the videoparsersbad plugins as RDEPENDS ; audioparsers +# for the uniaudio decoder, videoparsersbad for the VPU video decoder +# the gstreamer1.0-plugins-imx RDEPENDS is necessary to ensure the -good recipe is +# built (it is not a compile-time dependency however, hence RDEPENDS and not DEPENDS) +RDEPENDS_gstreamer1.0-plugins-imx = "gstreamer1.0-plugins-good gstreamer1.0-plugins-bad" +RDEPENDS_gstreamer1.0-plugins-imx-imxaudio = "gstreamer1.0-plugins-good-audioparsers" +RDEPENDS_gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparsersbad" + +PV .= "+git${SRCPV}" + +SRCBRANCH ?= "master" +SRCREV = "cb3cd45676e808b222ac573e8a118f44fd70c288" +SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https" + +S = "${WORKDIR}/git" + +# Setting DEFAULT_PREFERENCE to -1 since dunfell has had gstreamer-imx version +# 0.13.1 for a long time already, so silently replacing it with version 2.1.0 +# may break existing BSPs. +DEFAULT_PREFERENCE = "-1" + +inherit pkgconfig meson use-imx-headers + +# libg2d on i.MX8 SoCs with a DPU is emulated via the DPU. +# That particular libg2d .so depends on libdrm, however. +# Also, due to behavioral differences, an additional flag +# is needed to improve performance. +LIBG2D_DPU_OPTION = "-Dg2d-based-on-dpu=false" +LIBG2D_DEPENDENCIES = "virtual/libg2d" +LIBG2D_DPU_OPTION_imxdpu = "-Dg2d-based-on-dpu=true" +LIBG2D_DEPENDENCIES_imxdpu = "virtual/libg2d libdrm" + +# OE dunfell's meson version does not have the necessary +# functionality for build scripts to query the sysroot path, +# so it must be specified manually via the -Dsysroot option. +EXTRA_OEMESON += "-Dimx-headers-path=${STAGING_INCDIR_IMX} -Dsysroot=${RECIPE_SYSROOT}" + +PACKAGECONFIG ?= "uniaudiodec" +PACKAGECONFIG_append_imxgpu2d = " g2d" +PACKAGECONFIG_append_imxvpu = " vpu" +PACKAGECONFIG_append_imxipu = " ipu" +PACKAGECONFIG_append_imxpxp = " pxp" +# The custom imxv4l2 source and sink elements are only +# available on the i.MX6. +# The 2D blitter sinks require an MXC framebuffer, which +# is not available anymore on the i.MX8 (since these SoCs +# now use KMS instead of the old Linux framebuffer). +PACKAGECONFIG_append_mx6 = " imx2dvideosink v4l2-mxc-source-sink" +PACKAGECONFIG_append_mx7 = " imx2dvideosink" +# The custom Amphion V4L2 mem-2-mem elements are meant for +# the QuadMax and QuadXPlus SoCs. +PACKAGECONFIG_append_mx8qm = " v4l2-amphion" +PACKAGECONFIG_append_mx8qxp = " v4l2-amphion" + +PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}" +PACKAGECONFIG[pxp] = "-Dpxp=enabled,-Dpxp=disabled," +PACKAGECONFIG[ipu] = "-Dipu=enabled,-Dipu=disabled," +PACKAGECONFIG[vpu] = "-Dvpu=enabled,-Dvpu=disabled,libimxvpuapi2" +PACKAGECONFIG[imx2dvideosink] = "-Dimx2d-videosink=true,-Dimx2d-videosink=false," +PACKAGECONFIG[v4l2-mxc-source-sink] = "-Dv4l2-mxc-source-sink=true,-Dv4l2-mxc-source-sink=false," +# v4l2-isi is not enabled by default because the ISI devices +# need to be turned on in the devicetree. See the readme on +# the gstreamer-imx github site for details. +PACKAGECONFIG[v4l2-isi] = "-Dv4l2-isi=true,-Dv4l2-isi=false," +PACKAGECONFIG[v4l2-amphion] = "-Dv4l2-amphion=enabled,-Dv4l2-amphion=disabled," +PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec" +PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec" + +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc + +# the following line is required to produce one package for each plugin +PACKAGES_DYNAMIC = "^${PN}-.*" + +COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d|mx8)" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb index 3dc60b66..18fb4b5a 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" # Use i.MX fork of GST for customizations -GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" +GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" SRCBRANCH = "MM_04.05.05_2005_L5.4.24" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb index f2b33d96..169f84f1 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ SRCBRANCH = "MM_04.05.05_2005_L5.4.24" SRC_URI = " \ - git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ + git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ file://0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch \ " SRCREV = "4d2e5c1547c5f8a5e4e26a034ab87c809b34fb54" diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.0.1.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb index 0bfb3494..51e6b554 100644 --- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.0.1.bb +++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb @@ -4,12 +4,15 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324" SECTION = "multimedia" DEPENDS = "virtual/imxvpu libimxdmabuffer" +# Add imx-vpu-hantro-vc as dependency for being +# able to encode video using the VC8000E encoder +DEPENDS_append_mx8mp = " imx-vpu-hantro-vc" PV .= "+git${SRCPV}" SRCBRANCH ?= "master" -SRCREV = "9a5e84af53e6765c4f0ea299df264a4e32a13ea7" -SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH}" +SRCREV = "6f803f46d6b53a08cf02fc3d440072e01e2f3a09" +SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https" S = "${WORKDIR}/git" @@ -18,7 +21,7 @@ inherit waf pkgconfig use-imx-headers IMX_PLATFORM_mx6 = "imx6" IMX_PLATFORM_mx8mq = "imx8m" IMX_PLATFORM_mx8mm = "imx8mm" -IMX_PLATFORM_mx8mp = "imx8mm" +IMX_PLATFORM_mx8mp = "imx8mp" EXTRA_OECONF = "--imx-platform=${IMX_PLATFORM} --libdir=${libdir} --imx-headers=${STAGING_INCDIR_IMX} --sysroot-path=${RECIPE_SYSROOT}" diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb index 2d0f8571..778514fb 100644 --- a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb +++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb @@ -10,7 +10,7 @@ PV = "0.10.3+${SRCPV}" SRCBRANCH ?= "v1" SRCREV = "3a1ee3a54fe93813868d38c3d32ea065b59e227e" -SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https" S = "${WORKDIR}/git" diff --git a/recipes-security/optee-imx/optee-client_3.7.0.imx.bb b/recipes-security/optee-imx/optee-client_3.7.0.imx.bb index d83f8a9c..ee0cead8 100644 --- a/recipes-security/optee-imx/optee-client_3.7.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.7.0.imx.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" inherit python3native systemd SRCBRANCH = "imx_5.4.24_2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe" diff --git a/recipes-security/optee-imx/optee-os_3.7.0.imx.bb b/recipes-security/optee-imx/optee-os_3.7.0.imx.bb index 1bef749b..e7116b25 100644 --- a/recipes-security/optee-imx/optee-os_3.7.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.7.0.imx.bb @@ -7,12 +7,12 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173" inherit deploy python3native autotools -DEPENDS = "python3-pycrypto-native python3-pyelftools-native u-boot-mkimage-native" +DEPENDS = "python3-pycryptodome-native python3-pyelftools-native u-boot-mkimage-native" SRCBRANCH = "imx_5.4.24_2.1.0" SRC_URI = "\ - git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \ + git://github.com/nxp-imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \ file://0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch \ " diff --git a/recipes-security/optee-imx/optee-test_3.7.0.imx.bb b/recipes-security/optee-imx/optee-test_3.7.0.imx.bb index e0dfdbe2..13066507 100644 --- a/recipes-security/optee-imx/optee-test_3.7.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.7.0.imx.bb @@ -13,7 +13,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRCBRANCH = "imx_5.4.24_2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH} \ file://0001-use-python3-instead-of-python.patch \ " diff --git a/recipes-security/optee/optee-client-qoriq.bb b/recipes-security/optee/optee-client-qoriq.bb index af5fc095..71ca2ecb 100644 --- a/recipes-security/optee/optee-client-qoriq.bb +++ b/recipes-security/optee/optee-client-qoriq.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=69663ab153298557a59c67a60a743e5b" inherit python3native systemd -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_client;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/optee_client;protocol=https;nobranch=1 \ " S = "${WORKDIR}/git" diff --git a/recipes-security/optee/optee-os-qoriq_git.bb b/recipes-security/optee/optee-os-qoriq_git.bb index d7b28278..065c6093 100644 --- a/recipes-security/optee/optee-os-qoriq_git.bb +++ b/recipes-security/optee/optee-os-qoriq_git.bb @@ -9,7 +9,7 @@ DEPENDS = "python3-pycrypto-native" inherit deploy python3native SRCREV = "4e8d2e5307b99a91a0cac3ea3560ecb7d62898d6" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_os;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/optee_os;protocol=https;nobranch=1 \ file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ file://0001-Fix-alignment-of-data-for-mempool_alloc_pool.patch \ file://0001-use-python3-instead-of-python.patch \ diff --git a/recipes-security/optee/optee-test-qoriq_git.bb b/recipes-security/optee/optee-test-qoriq_git.bb index b66725c7..a1929403 100644 --- a/recipes-security/optee/optee-test-qoriq_git.bb +++ b/recipes-security/optee/optee-test-qoriq_git.bb @@ -8,7 +8,7 @@ DEPENDS = "optee-client-qoriq optee-os-qoriq python3-pycrypto-native" inherit python3native -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/optee_test;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/optee_test;protocol=https;nobranch=1 \ file://0001-fix-build-failure-with-GCC-9.patch \ file://0001-use-python3-instead-of-python.patch \ " |