diff options
81 files changed, 564 insertions, 114 deletions
diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index 9b8f2af6..ee490329 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass @@ -6,10 +6,66 @@ # # SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV};fsl-eula=true" -LIC_FILES_CHKSUM_append = " file://${FSL_EULA_FILE};md5=ab61cab9599935bfe9f700405ef00f28" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8 = "01ba08a2b77c3a0a9d0ab5d4d83fed64" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10 = "3880bb9c943b135a30fad5e8aabd3ee9" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11 = "a31dce3023402a821cfcdc1bb8dbdbc0" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V12 = "8cf95184c220e247b9917e7244124c5a" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V13 = "102094e9e695888c6a9f9fda9004165d" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V14 = "d4f548f93b5fe0ee2bc86758c344412d" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V16 = "be67a88e9e6c841043b005ad7bcf8309" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V17 = "88595f92466edd79be7f4f9547ffa0ef" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V18 = "6b552f505eedab4a11ab538cf3db743a" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V20 = "08fd295cce89b0a9c74b9b83ed74f671" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V21 = "6bd2df2910a2234bf6f419b7d2f531a3" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V22 = "75abe2fa1d16ca79f87cde926f05f72d" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24 = "ab61cab9599935bfe9f700405ef00f28" +FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V26 = "5ab1a30d0cd181e3408077727ea5a2db" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V3 = "6dfb32a488e5fd6bae52fbf6c7ebb086" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V5 = "80c0478f4339af024519b3723023fe28" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V7 = "fb0303e4ee8b0e71c094171e2272bd44" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V8 = "72c0f70181bb6e83eee6aab8de12a9f3" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9 = "6c12031a11b81db21cdfe0be88cac4b3" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10 = "fd4b227530cd88a82af6a5982cfb724d" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11 = "228c72f2a91452b8a03c4cab30f30ef9" +FSL_EULA_FILE_MD5SUMS = " \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V11} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V12} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V13} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V14} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V16} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V17} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V18} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V20} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V21} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V22} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V26} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V3} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V5} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V7} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V8} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11} \ +" + +# The checksum for the EULA in the layer +FSL_EULA_FILE_MD5SUM ?= \ + "${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V24}" + +LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}" +LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE" +LIC_FILES_CHKSUM_append = " ${LIC_FILES_CHKSUM_LAYER}" LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE" +do_fetch_prepend() { + if "Proprietary" not in d.getVar("LICENSE"): + bb.fatal("The recipe LICENSE should include Proprietary but is " + d.getVar("LICENSE") + ".") +} + python fsl_bin_do_unpack() { src_uri = (d.getVar('SRC_URI') or "").split() if len(src_uri) == 0: @@ -21,6 +77,7 @@ python fsl_bin_do_unpack() { rootdir = localdata.getVar('WORKDIR', True) fetcher = bb.fetch2.Fetch(src_uri, localdata) + found = 0 for url in fetcher.ud.values(): # Skip this fetcher if it's not under EULA or if the fetcher type is not supported if not url.parm.get('fsl-eula', False) or url.type not in ['http', 'https', 'ftp', 'file']: @@ -29,9 +86,39 @@ python fsl_bin_do_unpack() { if not os.path.exists(url.localpath): bb.debug(1, "Exiting as '%s' cannot be found" % url.basename) return + found += 1 bb.note("Handling file '%s' as a Freescale EULA-licensed archive." % url.basename) cmd = "sh %s --auto-accept --force" % (url.localpath) bb.fetch2.runfetchcmd(cmd, d, quiet=True, workdir=rootdir) + + # Check for two EULAs, one from the layer and one from the package + bb.note("Checking LIC_FILES_CHKSUM for Freescale EULA consistency...") + if found > 1: + bb.warn("The package contains multiple Freescale EULA-licensed archives. The consistency logic may not be able to detect a EULA problem.") + layer_license = d.getVar('LIC_FILES_CHKSUM_LAYER') + licenses = d.getVar('LIC_FILES_CHKSUM') or "" + md5sums = d.getVar('FSL_EULA_FILE_MD5SUMS') or "" + found_layer_license = False + found_package_license = False + for license in licenses.split(): + try: + (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(license) + if method != "file" or not path: + raise bb.fetch.MalformedUrl() + except bb.fetch.MalformedUrl: + bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), license)) + if license == layer_license: + bb.note("Found Freescale EULA for the layer %s." % license) + found_layer_license = True + elif parm.get('md5') in md5sums: + bb.note("Found Freescale EULA for the package %s." % license) + found_package_license = True + if not found_layer_license: + bb.fatal("The Freescale layer EULA '%s' is not listed in LIC_FILES_CHKSUM '%s'." + % (layer_license, licenses)) + if not found_package_license: + bb.fatal("A valid package EULA with md5sum in %s was not found in LIC_FILES_CHKSUM '%s'." + % (md5sums.split(), licenses)) } python do_unpack() { diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf index a6cf9030..7c7625b8 100644 --- a/conf/machine/imx8mqevk.conf +++ b/conf/machine/imx8mqevk.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" require conf/machine/include/imx-base.inc -require conf/machine/include/arm/arch-arm64.inc +require conf/machine/include/tune-cortexa53.inc MACHINE_FEATURES += "pci wifi bluetooth optee qca6174" diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf index 2611c2cc..7be26f74 100644 --- a/conf/machine/imx8qxpmek.conf +++ b/conf/machine/imx8qxpmek.conf @@ -6,7 +6,7 @@ MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:" require conf/machine/include/imx-base.inc -require conf/machine/include/arm/arch-arm64.inc +require conf/machine/include/tune-cortexa35.inc MACHINE_FEATURES_append = " qca6174" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index a3532f85..9086fb9d 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -34,6 +34,8 @@ UBOOT_ENTRYPOINT_mx6ul = "0x10008000" UBOOT_ENTRYPOINT_mx6ull = "0x10008000" UBOOT_ENTRYPOINT_mx7 = "0x80008000" UBOOT_ENTRYPOINT_mx7ulp = "0x60008000" +UBOOT_ENTRYPOINT_mx8mm = "0x40480000" +UBOOT_ENTRYPOINT_mx8mn = "0x40480000" UBOOT_ENTRYPOINT_mx8mq = "0x40480000" UBOOT_ENTRYPOINT_vf = "0x80008000" @@ -57,12 +59,16 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" # handled by software # DEFAULTTUNE_mx6 ?= "cortexa9t-neon" # handled by hardware -DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" -DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" +DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" +DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon" -DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" -DEFAULTTUNE_vf ?= "cortexa5thf-neon" -DEFAULTTUNE_mx8mm ?= "cortexa53-crypto" +DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" +DEFAULTTUNE_vf ?= "cortexa5thf-neon" + +DEFAULTTUNE_mx8mm ?= "cortexa53-crypto" +DEFAULTTUNE_mx8mn ?= "cortexa53-crypto" +DEFAULTTUNE_mx8mq ?= "cortexa53-crypto" +DEFAULTTUNE_mx8qxp ?= "cortexa35-crypto" INHERIT += "machine-overrides-extender" @@ -78,6 +84,7 @@ MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc" MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx8mn = "imxdrm:imxgpu:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" @@ -98,6 +105,7 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ mx8 \ mx8qm \ mx8mm \ + mx8mn \ mx8mq \ mx8qxp \ " @@ -121,6 +129,7 @@ MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" MACHINE_SOCARCH_SUFFIX_mx8qm = "-mx8" MACHINE_SOCARCH_SUFFIX_mx8mm = "-mx8mm" +MACHINE_SOCARCH_SUFFIX_mx8mn = "-mx8mn" MACHINE_SOCARCH_SUFFIX_mx8mq = "-mx8m" MACHINE_SOCARCH_SUFFIX_mx8qxp = "-mx8" MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx" @@ -315,7 +324,7 @@ WKS_FILE_DEPENDS ?= " \ ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ " -WKS_FILE_DEPENDS_mx8 += "imx-boot" +WKS_FILE_DEPENDS_append_mx8 = " imx-boot " SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" 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/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch deleted file mode 100644 index 8e7129e3..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/mkspecs/linux-oe-g++/qmake.conf -=================================================================== ---- git.orig/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:03:17.000000000 -0600 -+++ git/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:06:23.000000000 -0600 -@@ -37,6 +37,8 @@ QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) - # for the SDK - isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) - -+EGLFS_DEVICE_INTEGRATION = eglfs_viv -+ - include(../oe-device-extra.pri) - - QMAKE_LIBS_EGL += -lEGL diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 68eab915..0d06654d 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -5,20 +5,19 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_imxgpu2d = " \ +SRC_URI_append_imxgpu = " \ file://0014-Add-IMX-GPU-support.patch \ file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \ " -SRC_URI_APPEND_3D_NOT_X11 = " \ - file://0015-Add-eglfs-to-IMX-GPU.patch \ -" -SRC_URI_append_imxgpu3d = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '${SRC_URI_APPEND_3D_NOT_X11}', d)} \ -" + +PACKAGECONFIG_GL_IMX_GPU = "" +PACKAGECONFIG_GL_IMX_GPU_mx8 = "gbm kms" PACKAGECONFIG_GL_imxpxp = "gles2" -PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}" -PACKAGECONFIG_GL_imxgpu3d = "gles2" +PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ + ${PACKAGECONFIG_GL_IMX_GPU}" +PACKAGECONFIG_GL_imxgpu3d = "gles2 \ + ${PACKAGECONFIG_GL_IMX_GPU}" PACKAGECONFIG_GL_append_use-mainline-bsp = " gbm kms" PACKAGECONFIG_PLATFORM = "" @@ -29,3 +28,10 @@ PACKAGECONFIG_PLATFORM_imxgpu3d = " \ 'eglfs', d), d)}" PACKAGECONFIG_PLATFORM_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}" PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}" + +PACKAGECONFIG_VULKAN_IMX_GPU = "" +PACKAGECONFIG_VULKAN_IMX_GPU_mx8 = "vulkan" +PACKAGECONFIG_VULKAN_IMX_GPU_mx8mm = "" +PACKAGECONFIG_VULKAN = "" +PACKAGECONFIG_VULKAN_imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" +PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" diff --git a/recipes-bsp/atf/atf-tools_git.bb b/recipes-bsp/atf/atf-tools_git.bb index a5998fe2..7166a13c 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 = "17f94e4315e81e3d1b22d863d9614d724e8273dc" S = "${WORKDIR}/git" diff --git a/recipes-bsp/atf/atf_git.bb b/recipes-bsp/atf/atf_git.bb index d75e3eb2..6faab19b 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 = "85e98b945172118c55f0cea9c1f655b4307e6fab" SRC_URI += "file://0001-fix-fiptool-build-error.patch \ diff --git a/recipes-bsp/boot-format/boot-format_git.bb b/recipes-bsp/boot-format/boot-format_git.bb index 92ec8307..c59fa0b3 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/qoriq-yocto-sdk/boot-format;protocol=https;nobranch=1 \ file://flags.patch" SRCREV = "4eb81a6797ef4e58bf7d9b2d58afb37a21c1f550" diff --git a/recipes-bsp/imx-atf/imx-atf_2.0.bb b/recipes-bsp/imx-atf/imx-atf_2.0.bb index 15122520..4acc1c78 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.0.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m PV .= "+git${SRCPV}" SRCBRANCH = "imx_4.14.98_2.0.0_ga" -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-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch \ " SRCREV = "1cb68fa0a0dd8bc00b9871b51d4c4e1d0a827b2d" 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/imx-boot_0.2.bb b/recipes-bsp/imx-mkimage/imx-boot_0.2.bb index 7518c911..16c7fa65 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_0.2.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_0.2.bb @@ -41,6 +41,7 @@ ATF_MACHINE_NAME_mx8qm = "bl31-imx8qm.bin" ATF_MACHINE_NAME_mx8qxp = "bl31-imx8qx.bin" ATF_MACHINE_NAME_mx8mq = "bl31-imx8mq.bin" ATF_MACHINE_NAME_mx8mm = "bl31-imx8mm.bin" +ATF_MACHINE_NAME_mx8mn = "bl31-imx8mn.bin" ATF_MACHINE_NAME_append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}" UBOOT_NAME = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}" @@ -53,6 +54,7 @@ SOC_TARGET_mx8qm = "iMX8QM" SOC_TARGET_mx8qxp = "iMX8QX" SOC_TARGET_mx8mq = "iMX8M" SOC_TARGET_mx8mm = "iMX8MM" +SOC_TARGET_mx8mn = "iMX8MN" DEPLOY_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" @@ -63,6 +65,7 @@ IMXBOOT_TARGETS ?= \ BOOT_STAGING = "${S}/${SOC_TARGET}" BOOT_STAGING_mx8mm = "${S}/iMX8M" +BOOT_STAGING_mx8mn = "${S}/iMX8M" SOC_FAMILY = "INVALID" SOC_FAMILY_mx8 = "mx8" @@ -70,7 +73,7 @@ SOC_FAMILY_mx8m = "mx8m" SOC_FAMILY_mx8x = "mx8x" compile_mx8m() { - bbnote 8MQ/8MM boot binary build + bbnote 8MQ/8MM/8MN boot binary build for ddr_firmware in ${DDR_FIRMWARE_NAME}; do bbnote "Copy ddr_firmware: ${ddr_firmware} from ${DEPLOY_DIR_IMAGE} -> ${BOOT_STAGING} " cp ${DEPLOY_DIR_IMAGE}/${ddr_firmware} ${BOOT_STAGING} diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index ab354f9c..35f09333 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -3,7 +3,7 @@ DEPENDS = "zlib-native openssl-native" SRCBRANCH = "imx_4.14.98_2.0.0_ga" -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}" SRCREV = "dd0234001713623c79be92b60fa88bc07b07f24f" S = "${WORKDIR}/git" diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.2.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.2.bb index 904c8cc3..b6697d19 100644 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.2.bb +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.2.bb @@ -2,7 +2,7 @@ # Copyright (C) 2017-2019 NXP DESCRIPTION = "i.MX System Controller Firmware" -LICENSE = "MIT" +LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28" SECTION = "BSP" diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index 084a2b04..a69ee070 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 = "imx_4.14.98_2.0.0_ga" 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://memtool_profile \ " SRCREV = "d32727a9d7ef2543729c149a713db24b8f5c2aa8" diff --git a/recipes-bsp/mc-utils/mc-utils_git.bb b/recipes-bsp/mc-utils/mc-utils_git.bb index 39c26b57..6183d0ef 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 = "b11bd6b808906a8b38c3fa29dc5120b0e4b439ac" S = "${WORKDIR}/git" diff --git a/recipes-bsp/rcw/rcw_git.bb b/recipes-bsp/rcw/rcw_git.bb index fed9f864..498509b0 100644 --- a/recipes-bsp/rcw/rcw_git.bb +++ b/recipes-bsp/rcw/rcw_git.bb @@ -7,7 +7,7 @@ DEPENDS += "change-file-endianess-native 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 = "b73c4f6e5ad772aca5a8990f0ccc45d387ee7ac6" S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-imx_2018.03.bb b/recipes-bsp/u-boot/u-boot-imx_2018.03.bb index ed32ffcb..0237c135 100644 --- a/recipes-bsp/u-boot/u-boot-imx_2018.03.bb +++ b/recipes-bsp/u-boot/u-boot-imx_2018.03.bb @@ -11,7 +11,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCBRANCH = "imx_v2018.03_4.14.98_2.0.0_ga" -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 = "0d6d8807793e74402e23772062469aeb4808dd48" S = "${WORKDIR}/git" diff --git a/recipes-bsp/u-boot/u-boot-qoriq-common_2019.04.inc b/recipes-bsp/u-boot/u-boot-qoriq-common_2019.04.inc index c3a77fb4..8e079efa 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq-common_2019.04.inc +++ b/recipes-bsp/u-boot/u-boot-qoriq-common_2019.04.inc @@ -10,7 +10,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 \ " SRCREV= "ce862bb2d2aa3b2a69bc580c57dce67d84ac1b99" diff --git a/recipes-connectivity/openssl/openssl-qoriq_1.1.1d.bb b/recipes-connectivity/openssl/openssl-qoriq_1.1.1d.bb index 13d9fe75..03fbf6c4 100644 --- a/recipes-connectivity/openssl/openssl-qoriq_1.1.1d.bb +++ b/recipes-connectivity/openssl/openssl-qoriq_1.1.1d.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d343e62fc9c833710bbbed25f27364c8" DEPENDS = "hostperl-runtime-native" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/openssl;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/openssl;protocol=https;nobranch=1 \ file://run-ptest \ file://0001-skip-test_symbol_presence.patch \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ diff --git a/recipes-daemons/ptpd/ptpd-qoriq.bb b/recipes-daemons/ptpd/ptpd-qoriq.bb index 569deed5..d298fccb 100644 --- a/recipes-daemons/ptpd/ptpd-qoriq.bb +++ b/recipes-daemons/ptpd/ptpd-qoriq.bb @@ -34,7 +34,7 @@ def get_sub(d): except: return parts[0] -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/ptpd;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/ptpd;protocol=https;nobranch=1 \ file://ptpd-use-pkgconfig.patch \ " SRCREV = "ec34cdd10446619d036ac8d6a86b8276f0d4a81c" diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/cst/cst_git.bb index bc847e5e..92180f9b 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 \ " SRCREV = "bfad3c99074e8bb010685e17ce90c8898298bba6" diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb index 30d255ee..beb044f3 100644 --- a/recipes-devtools/qemu/qemu-qoriq_git.bb +++ b/recipes-devtools/qemu/qemu-qoriq_git.bb @@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 zlib pixman dtc" LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/qemu;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/qemu;protocol=https;nobranch=1 \ file://powerpc_rom.bin \ file://run-ptest \ " 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/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/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb index b8863627..70d2b2ba 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 = "55a1f377915176a195a7e96b165ed5447285c464" 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.inc b/recipes-extended/dpdk/dpdk.inc index 7642ec4e..75982f17 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://dpdk.org" LICENSE = "BSD-3-Clause & LGPLv2 & GPLv2" 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..cc3b84b8 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/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/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..61801244 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;nobranch=1" SRCREV = "fe66f4659f7d356f7aa73a8fb32fcf67c6cf1108" diff --git a/recipes-extended/ovs-dpdk/ovs-dpdk_2.11.bb b/recipes-extended/ovs-dpdk/ovs-dpdk_2.11.bb index fd9d3a61..26cb2aeb 100644 --- a/recipes-extended/ovs-dpdk/ovs-dpdk_2.11.bb +++ b/recipes-extended/ovs-dpdk/ovs-dpdk_2.11.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "bash libcrypto libssl python" inherit pythonnative -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 \ " SRCREV = "abc80ef87a8786050f27afb2a797cadd14e2a6bd" diff --git a/recipes-extended/secure-obj/secure-obj.inc b/recipes-extended/secure-obj/secure-obj.inc index 166c874a..c12b8671 100644 --- a/recipes-extended/secure-obj/secure-obj.inc +++ b/recipes-extended/secure-obj/secure-obj.inc @@ -10,7 +10,7 @@ inherit pythonnative 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 = "cd3c353df1c3f19577cf3fa08f8a21abd63fb3c1" diff --git a/recipes-extended/tsntool/tsntool_git.bb b/recipes-extended/tsntool/tsntool_git.bb index 4ce353be..ac85dc28 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 = "30a0320eb4a1798ac3d6258a2e02d863e60a1582" S = "${WORKDIR}/git" diff --git a/recipes-extended/vpp-core/dpdkvpp.bb b/recipes-extended/vpp-core/dpdkvpp.bb index 309a6101..4e088bed 100644 --- a/recipes-extended/vpp-core/dpdkvpp.bb +++ b/recipes-extended/vpp-core/dpdkvpp.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://dpdk.org" LICENSE = "BSD-3-Clause & LGPLv2 & GPLv2" 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/vpp-core/vpp-core.bb b/recipes-extended/vpp-core/vpp-core.bb index 53437d1a..99011566 100644 --- a/recipes-extended/vpp-core/vpp-core.bb +++ b/recipes-extended/vpp-core/vpp-core.bb @@ -11,7 +11,7 @@ OECMAKE_SOURCEPATH = "${S}/src" SRCREV = "ea4f900311027e4c50f101e08c12920f6e2ddf8d" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/vpp;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/vpp;protocol=https;nobranch=1 \ file://0001-GCC-above-5.4-fails-when-we-specify-arch-funattribut.patch \ file://0001-getcpu-rename-getcpu-to-avoid-conflict-with-glibc-2..patch \ file://0001-vpp-core-fix-package_qa-error.patch \ diff --git a/recipes-graphics/drm/libdrm_2.4.91.imx.bb b/recipes-graphics/drm/libdrm_2.4.91.imx.bb index 0a2d41a3..a905af71 100644 --- a/recipes-graphics/drm/libdrm_2.4.91.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.91.imx.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5 PROVIDES = "drm" DEPENDS = "libpthread-stubs libpciaccess" -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.91" SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ file://installtests.patch \ diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb index d8137e29..d37c688d 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_7.1.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_7.1" +SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_7.1" SRCREV = "013499c63d9eddd8c792bd8b136991caa3b8a100" S = "${WORKDIR}/git" diff --git a/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch b/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch new file mode 100644 index 00000000..f613386f --- /dev/null +++ b/recipes-graphics/waffle/waffle/0001-meson-Add-missing-wayland-dependency-on-EGL.patch @@ -0,0 +1,49 @@ +From 932c21d2851fe79bf4fe55d3b613f71f65762adb Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Wed, 22 Apr 2020 13:40:04 -0500 +Subject: [PATCH] meson: Add missing wayland dependency on EGL + +The build was not finding egl.pc due to this +missing dependency. + +Upstream-Status: Pending + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +--- + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 957737c..4ebb022 100644 +--- a/meson.build ++++ b/meson.build +@@ -65,6 +65,7 @@ dep_gl = _dep_null + dep_egl = _dep_null + dep_wayland_client = _dep_null + dep_wayland_egl = _dep_null ++dep_wayland_wayland_egl = _dep_null + dep_x11_xcb = _dep_null + dep_gbm = _dep_null + dep_udev = _dep_null +@@ -90,7 +91,8 @@ else + dep_wayland_client = dependency( + 'wayland-client', version : '>= 1.0', required : get_option('wayland'), + ) +- dep_wayland_egl = dependency( ++ dep_wayland_egl = dependency('egl', required : get_option('wayland')) ++ dep_wayland_wayland_egl = dependency( + 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), + ) + dep_x11_xcb = dependency('x11-xcb', required : get_option('glx')) +@@ -101,7 +103,7 @@ else + dep_udev = dependency('libudev', required : get_option('gbm')) + + build_x11_egl = dep_egl.found() +- build_wayland = dep_wayland_client.found() and dep_wayland_egl.found() ++ build_wayland = dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_wayland_egl.found() + build_glx = dep_gl.found() + build_gbm = dep_gbm.found() and dep_udev.found() + build_surfaceless = dep_egl.found() +-- +2.17.1 + diff --git a/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch b/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch new file mode 100644 index 00000000..3f9f3b1c --- /dev/null +++ b/recipes-graphics/waffle/waffle/0002-meson-Separate-surfaceless-option-from-x11.patch @@ -0,0 +1,46 @@ +From 451381a61ad0c96e870da2325fc188eaa3d91fec Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Wed, 22 Apr 2020 14:08:36 -0500 +Subject: [PATCH 2/2] meson: Separate surfaceless option from x11 + +Allow surfaceless build separate from the x11 option. +Also require gbm for surfaceless build. + +Upstream-Status: Pending + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +--- + meson.build | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 4ebb022..0705f61 100644 +--- a/meson.build ++++ b/meson.build +@@ -72,6 +72,7 @@ dep_udev = _dep_null + dep_cocoa = _dep_null + dep_core_foundation = _dep_null + dep_gl_headers = _dep_null ++dep_surfaceless = _dep_null + + # Get dependencies + if build_wgl +@@ -101,12 +102,14 @@ else + endif + dep_gbm = dependency('gbm', required : get_option('gbm')) + dep_udev = dependency('libudev', required : get_option('gbm')) ++ dep_surfaceless_egl = dependency('egl', required : get_option('surfaceless_egl')) ++ dep_surfaceless_gbm = dependency('gbm', required : get_option('surfaceless_egl')) + + build_x11_egl = dep_egl.found() + build_wayland = dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_wayland_egl.found() + build_glx = dep_gl.found() + build_gbm = dep_gbm.found() and dep_udev.found() +- build_surfaceless = dep_egl.found() ++ build_surfaceless = dep_surfaceless_egl.found() and dep_surfaceless_gbm.found() + endif + + dep_bash = dependency('bash-completion', required : false) +-- +2.17.1 + diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend index caef3a1e..9d090bcf 100644 --- a/recipes-graphics/waffle/waffle_%.bbappend +++ b/recipes-graphics/waffle/waffle_%.bbappend @@ -1,7 +1,18 @@ -PACKAGECONFIG_X11 = "" -PACKAGECONFIG_X11_append_imxgpu3d = " x11-egl glx" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-meson-Add-missing-wayland-dependency-on-EGL.patch \ + file://0002-meson-Separate-surfaceless-option-from-x11.patch \ +" + +PACKAGECONFIG_IMXGPU_X11 = "" +PACKAGECONFIG_IMXGPU_X11_imxgpu3d = "x11-egl glx" +PACKAGECONFIG_IMXGPU_GBM = "gbm" +PACKAGECONFIG_IMXGPU_GBM_mx6 = "" +PACKAGECONFIG_IMXGPU_GBM_mx7 = "" PACKAGECONFIG_imxgpu = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gbm wayland', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_X11}', \ - '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_IMXGPU_X11}', \ + '', d), d)} \ + ${PACKAGECONFIG_IMXGPU_GBM} \ " diff --git a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch b/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch index 7ea07ed6..01bdae1f 100644 --- a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch +++ b/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch @@ -15,12 +15,12 @@ Signed-off-by: Jun Zhu <junzhu@nxp.com> 1 file changed, 3 insertions(+) diff --git a/weston.ini.in b/weston.ini.in -index 83dd56e..6e20e11 100644 +index d9094b1f..8adcc646 100644 --- a/weston.ini.in +++ b/weston.ini.in -@@ -3,6 +3,9 @@ - idle-time=0 - #use-g2d=1 +@@ -7,6 +7,9 @@ idle-time=0 + #[shell] + #size=1920x1080 +[libinput] +touchscreen_calibrator=true diff --git a/recipes-graphics/wayland/weston_5.0.0.imx.bb b/recipes-graphics/wayland/weston_5.0.0.imx.bb index 270aa2ad..b3ea61ed 100644 --- a/recipes-graphics/wayland/weston_5.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_5.0.0.imx.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ DEFAULT_PREFERENCE = "-1" SRCBRANCH = "weston-imx-5.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://0001-make-error-portable.patch \ diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p4.0.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p4.0.bb index 670ade64..c9d988c8 100644 --- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p4.0.bb +++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p4.0.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3" SRCREV = "b765c3ffc0dcc4246afa659aa0d59f78a6736b08" 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.9.inc b/recipes-kernel/cryptodev/cryptodev-qoriq_1.9.inc index ad54fc9e..d2d9513c 100644 --- a/recipes-kernel/cryptodev/cryptodev-qoriq_1.9.inc +++ b/recipes-kernel/cryptodev/cryptodev-qoriq_1.9.inc @@ -14,7 +14,7 @@ python() { FILESEXTRAPATHS_prepend := "${THISDIR}/yocto_patches:" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cryptodev-linux;nobranch=1" +SRC_URI = "git://github.com/nxp-qoriq/cryptodev-linux;protocol=https;nobranch=1" SRCREV = "479e6e7f071e252c0c37ea38d38fdb4cd808f496" # NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb index feddc8fa..ddaffad9 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/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.2.4.p4.0.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p4.0.bb index 61fc98e0..e1ba7657 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p4.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.2.4.p4.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 SRCBRANCH = "imx_4.14.98_2.0.0_ga" 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-ls-debug_git.bb b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb index cad18b69..c663b5b9 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/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..b34571db 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/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 662975aa..5b7ff993 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_2.0" SRCREV = "e008d2578b09f1f593f65ede48529a52312e3957" 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..d21061b1 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/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..7194157c 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/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-lts-4.19.bb b/recipes-kernel/linux/linux-fslc-lts-4.19.bb index ded5d091..c3f6fc07 100644 --- a/recipes-kernel/linux/linux-fslc-lts-4.19.bb +++ b/recipes-kernel/linux/linux-fslc-lts-4.19.bb @@ -11,9 +11,9 @@ include linux-fslc.inc LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -PV = "4.19.78+git${SRCPV}" +PV = "4.19.107+git${SRCPV}" SRCBRANCH = "4.19.x+fslc" -SRCREV = "bc38ce926f0800f19b7523cdb88aea1944e46c51" +SRCREV = "a764f56c765d081954d9d7c4c84a8c9be4c6d689" COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" diff --git a/recipes-kernel/linux/linux-imx-headers_4.14.98.bb b/recipes-kernel/linux/linux-imx-headers_4.14.98.bb index e55a795b..c9b73963 100644 --- a/recipes-kernel/linux/linux-imx-headers_4.14.98.bb +++ b/recipes-kernel/linux/linux-imx-headers_4.14.98.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" SRCBRANCH = "imx_4.14.98_2.0.0_ga" LOCALVERSION = "-imx" -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 = "dfc78102d29f81d9316b281a3b8af3dff95174c8" S = "${WORKDIR}/git" diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index 9a8a035f..4660a9ee 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -11,7 +11,7 @@ LOCALVERSION ?= "" SCMVERSION ?= "y" SRCBRANCH ?= "" -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-qoriq-rt_4.14.bb b/recipes-kernel/linux/linux-qoriq-rt_4.14.bb index e880081a..998ff8df 100644 --- a/recipes-kernel/linux/linux-qoriq-rt_4.14.bb +++ b/recipes-kernel/linux/linux-qoriq-rt_4.14.bb @@ -6,7 +6,7 @@ SECTION = "kernel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -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-add-cflags.patch \ file://0001-perf-tools-Add-Python-3-support.patch \ " diff --git a/recipes-kernel/linux/linux-qoriq_4.14.bb b/recipes-kernel/linux/linux-qoriq_4.14.bb index f2e0a4b8..e4daef1c 100644 --- a/recipes-kernel/linux/linux-qoriq_4.14.bb +++ b/recipes-kernel/linux/linux-qoriq_4.14.bb @@ -6,7 +6,7 @@ SECTION = "kernel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -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-add-cflags.patch \ file://0001-perf-tools-Add-Python-3-support.patch \ " diff --git a/recipes-kernel/linux/linux-qoriq_4.19.bb b/recipes-kernel/linux/linux-qoriq_4.19.bb index aed29df6..c6f7da69 100644 --- a/recipes-kernel/linux/linux-qoriq_4.19.bb +++ b/recipes-kernel/linux/linux-qoriq_4.19.bb @@ -6,7 +6,7 @@ SECTION = "kernel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -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 \ " SRCREV = "4aba815fd6404a9620a66c8a3c2af4ba2a6a701a" 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 94c3f4a7..17025699 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 = "nxp/master" -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 = "9a63071e7734bd164017f3761b8d1944c017611f" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb index 9cf6bd98..d0146e96 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb @@ -16,7 +16,7 @@ PACKAGECONFIG[wayland] = "--enable-wayland --disable-x11,--disable-wayland,wayla EXTRA_OECONF_append = " --disable-introspection" -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.04.05_1902_L4.14.98_GA" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb index d329dbac..80a31f0d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ DEPENDS += "iso-codes util-linux" -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.04.05_1902_L4.14.98_GA" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb index 5781094b..8b2486af 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.imx.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" -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.04.05_1902_L4.14.98_GA" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb index 4d022335..3d61c91f 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb @@ -18,7 +18,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.04.05_1902_L4.14.98_GA" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.5.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.5.bb index 6dc924a1..f75ace07 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.5.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.4.5.bb @@ -20,7 +20,7 @@ RCONFLICTS_${PN} = "gst1.0-fsl-plugin" LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" -IMXGST_SRC ?= "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https" +IMXGST_SRC ?= "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https" SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH}" diff --git a/recipes-security/optee-imx/optee-client_3.2.0.imx.bb b/recipes-security/optee-imx/optee-client_3.2.0.imx.bb index 2b0bcf48..7e4f9b09 100644 --- a/recipes-security/optee-imx/optee-client_3.2.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.2.0.imx.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" inherit pythonnative systemd SRCBRANCH = "imx_4.14.78_1.0.0_ga" -OPTEE_CLIENT_SRC ?= "git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https" +OPTEE_CLIENT_SRC ?= "git://github.com/nxp-imx/imx-optee-client.git;protocol=https" SRC_URI = "${OPTEE_CLIENT_SRC};branch=${SRCBRANCH}" -SRCREV = "d06647d201520ac57f1331e97db6138d63bc2666" +SRCREV = "d06647d201520ac57f1331e97db6138d63bc2666" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes-security/optee-imx/optee-os_3.2.0.imx.bb b/recipes-security/optee-imx/optee-os_3.2.0.imx.bb index 43b0ef14..6d6889c3 100644 --- a/recipes-security/optee-imx/optee-os_3.2.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.2.0.imx.bb @@ -10,7 +10,7 @@ inherit deploy pythonnative autotools DEPENDS = "python-pycrypto-native u-boot-mkimage-native" SRCBRANCH = "imx_4.14.78_1.0.0_ga" -OPTEE_OS_SRC ?= "git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https" +OPTEE_OS_SRC ?= "git://github.com/nxp-imx/imx-optee-os.git;protocol=https" SRC_URI = "${OPTEE_OS_SRC};branch=${SRCBRANCH}" SRCREV = "6a52487eb0ff664e4ebbd48497f0d3322844d51d" @@ -71,8 +71,8 @@ do_deploy () { } do_install () { - install -d ${D}/lib/firmware/ - install -m 644 ${B}/core/*.bin ${D}/lib/firmware/ + install -d ${D}${nonarch_base_libdir}/firmware/ + install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/ # Install the TA devkit install -d ${D}/usr/include/optee/export-user_ta_${OPTEE_ARCH}/ diff --git a/recipes-security/optee-imx/optee-test/0003-sock_server-fix-compilation-against-musl-sys-errno.h.patch b/recipes-security/optee-imx/optee-test/0003-sock_server-fix-compilation-against-musl-sys-errno.h.patch new file mode 100644 index 00000000..d32a8eb7 --- /dev/null +++ b/recipes-security/optee-imx/optee-test/0003-sock_server-fix-compilation-against-musl-sys-errno.h.patch @@ -0,0 +1,41 @@ +From dc8cd1c43edeedb9f7335020537c4ffdddd683f8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Thu, 7 Feb 2019 01:26:53 +0000 +Subject: [PATCH 1/3] sock_server: fix compilation against musl (sys/errno.h) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Compiling against musl-libc fails with the following error: + +| In file included from .../host/xtest/sock_server.c:24: +| .../usr/include/sys/errno.h:1:2: error: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Werror=cpp] +| #warning redirecting incorrect #include <sys/errno.h> to <errno.h> +| ^~~~~~~ + +Just remove the needless include. + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Acked-by: Jens Wiklander <jens.wiklander@linaro.org> +Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> +--- +Signed-off-by: André Draszik <andre.draszik@jci.com> +Upstream-Status: Backport [3.5.0] + host/xtest/sock_server.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/host/xtest/sock_server.c b/host/xtest/sock_server.c +index 0d2ff06..1ba73d6 100644 +--- a/host/xtest/sock_server.c ++++ b/host/xtest/sock_server.c +@@ -21,7 +21,6 @@ + #include <netdb.h> + #include <netinet/in.h> + #include <poll.h> +-#include <sys/errno.h> + #include <sys/socket.h> + #include <unistd.h> + +-- +2.23.0.rc1 + diff --git a/recipes-security/optee-imx/optee-test/0004-build-ignore-declaration-after-statement-warnings.patch b/recipes-security/optee-imx/optee-test/0004-build-ignore-declaration-after-statement-warnings.patch new file mode 100644 index 00000000..ed45df60 --- /dev/null +++ b/recipes-security/optee-imx/optee-test/0004-build-ignore-declaration-after-statement-warnings.patch @@ -0,0 +1,62 @@ +From 1401b89684ee81bf0b3d3dea06e2926b24ba3f97 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Thu, 7 Feb 2019 01:29:08 +0000 +Subject: [PATCH 2/3] build: ignore declaration-after-statement warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| Makefile:37: recipe for target 'xtest' failed +| make: *** [xtest] Error 2 +| make: *** Waiting for unfinished jobs.... +| arith_taf.c: In function 'get_handle': +| arith_taf.c:56:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] +| int h = handle_get(&hdb, ptr); +| ^~~ +| arith_taf.c: In function 'ta_entry_arith_new_var': +| arith_taf.c:82:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] +| size_t len = TEE_BigIntSizeInU32(params[0].value.a); +| ^~~~~~ +| arith_taf.c: In function 'ta_entry_arith_new_fmm_var': +| arith_taf.c:129:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] +| size_t len = TEE_BigIntFMMSizeInU32(params[0].value.a); +| ^~~~~~ +| arith_taf.c: In function 'ta_entry_arith_free_handle': +| arith_taf.c:150:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] +| void *ptr = put_handle(params[0].value.a & ~HT_MASK); +| ^~~~ +| arith_taf.c: In function 'ta_entry_arith_from_octet_string': +| arith_taf.c:165:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] +| TEE_BigInt *big_int = lookup_handle(HT_BIGINT, params[0].value.a); +| ^~~~~~~~~~ +| arith_taf.c: In function 'ta_entry_arith_from_s32': +| arith_taf.c:181:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] +| TEE_BigInt *big_int = lookup_handle(HT_BIGINT, params[0].value.a); +| ^~~~~~~~~~ + +etc. + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Acked-by: Jens Wiklander <jens.wiklander@linaro.org> +Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> +--- +Signed-off-by: André Draszik <andre.draszik@jci.com> +Upstream-Status: Backport [3.5.0] + host/xtest/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/host/xtest/Makefile b/host/xtest/Makefile +index f4291e0..e97e555 100644 +--- a/host/xtest/Makefile ++++ b/host/xtest/Makefile +@@ -154,6 +154,7 @@ CFLAGS += -Wall -Wcast-align -Werror \ + -Wmissing-prototypes -Wnested-externs -Wpointer-arith \ + -Wshadow -Wstrict-prototypes -Wswitch-default \ + -Wwrite-strings \ ++ -Wno-declaration-after-statement \ + -Wno-missing-field-initializers -Wno-format-zero-length + endif + +-- +2.23.0.rc1 + diff --git a/recipes-security/optee-imx/optee-test/0005-benchmark_1000-fix-compilation-against-musl-uint.patch b/recipes-security/optee-imx/optee-test/0005-benchmark_1000-fix-compilation-against-musl-uint.patch new file mode 100644 index 00000000..58734aa4 --- /dev/null +++ b/recipes-security/optee-imx/optee-test/0005-benchmark_1000-fix-compilation-against-musl-uint.patch @@ -0,0 +1,57 @@ +From f74e9f339a8e8cb97fc8ea03bef51d7e3862a60a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Thu, 7 Feb 2019 01:31:27 +0000 +Subject: [PATCH 3/3] benchmark_1000: fix compilation against musl (uint) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Compiling against musl-libc fails with the following error: + +| .../host/xtest/benchmark_1000.c: In function 'show_test_result': +| .../host/xtest/benchmark_1000.c:102:2: error: unknown type name 'uint'; did you mean 'int'? +| uint i; +| ^~~~ +| int +| ...host/xtest/benchmark_1000.c:108:16: error: comparison of integer expressions of different signedness: 'int' and 'size_t' {aka 'unsigned int'} [-Werror=sign-compare] +| for (i = 0; i < size; i++) { +| ^ + +etc. + +Convert to using more standard size_t + +Signed-off-by: André Draszik <andre.draszik@jci.com> +Acked-by: Jens Wiklander <jens.wiklander@linaro.org> +Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> +--- +Signed-off-by: André Draszik <andre.draszik@jci.com> +Upstream-Status: Backport [3.5.0] + host/xtest/benchmark_1000.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/host/xtest/benchmark_1000.c b/host/xtest/benchmark_1000.c +index bf92fa0..1caf420 100644 +--- a/host/xtest/benchmark_1000.c ++++ b/host/xtest/benchmark_1000.c +@@ -99,7 +99,7 @@ static TEEC_Result run_chunk_access_test(enum storage_benchmark_cmd cmd, + + static void show_test_result(struct test_record records[], size_t size) + { +- uint i; ++ size_t i; + + printf("-----------------+---------------+----------------\n"); + printf(" Data Size (B) \t | Time (s)\t | Speed (kB/s)\t \n"); +@@ -119,7 +119,7 @@ static void chunk_test(ADBG_Case_t *c, enum storage_benchmark_cmd cmd) + { + uint32_t chunk_size = DEFAULT_CHUNK_SIZE; + struct test_record records[ARRAY_SIZE(data_size_table) - 1]; +- uint i; ++ size_t i; + + for (i = 0; data_size_table[i]; i++) { + ADBG_EXPECT_TEEC_SUCCESS(c, +-- +2.23.0.rc1 + diff --git a/recipes-security/optee-imx/optee-test/0006-regression_8100-use-null-terminated-strings-with-fil.patch b/recipes-security/optee-imx/optee-test/0006-regression_8100-use-null-terminated-strings-with-fil.patch new file mode 100644 index 00000000..1a5c4044 --- /dev/null +++ b/recipes-security/optee-imx/optee-test/0006-regression_8100-use-null-terminated-strings-with-fil.patch @@ -0,0 +1,88 @@ +From 7d566ed585d1e13f444d48fde5705b5be54de4af Mon Sep 17 00:00:00 2001 +From: Ricardo Salveti <ricardo@foundries.io> +Date: Wed, 26 Jun 2019 17:32:11 -0300 +Subject: [PATCH] regression_8100: use null terminated strings with file_to_c + +GCC 9 is more strict with string manipulation, causing the build to +fail as the string data converted via file_to_c is not null terminated, +as described by the following build error: + +regression_8100.c:100:29: error: '%*s' directive argument is not a +nul-terminated string [-Werror=format-overflow=] +tlen = myasprintf(&trust, "%*s", (int)sizeof(regression_8100_ca_crt), + ^~~ + regression_8100_ca_crt); + ~~~~~~~~~~~~~~~~~~~~~~ + +Change file_to_c to terminate the string after conversion and update the +string size to remove the null terminated byte. Also update +regression_8100 to use the size variable defined via file_to_c instead +of manually calling sizeof. + +Signed-off-by: Ricardo Salveti <ricardo@foundries.io> +Acked-by: Jens Wiklander <jens.wiklander@linaro.org> +--- +Signed-off-by: André Draszik <andre.draszik@jci.com> +Upstream-Status: Backport [3.6.0] + host/xtest/regression_8100.c | 10 +++++----- + scripts/file_to_c.py | 4 ++-- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/host/xtest/regression_8100.c b/host/xtest/regression_8100.c +index 04d62d9..13780e1 100644 +--- a/host/xtest/regression_8100.c ++++ b/host/xtest/regression_8100.c +@@ -91,13 +91,13 @@ static void test_8102(ADBG_Case_t *c) + return; + + clen = myasprintf(&chain, "%*s\n%*s", +- (int)sizeof(regression_8100_my_crt), ++ (int)regression_8100_my_crt_size, + regression_8100_my_crt, +- (int)sizeof(regression_8100_mid_crt), ++ (int)regression_8100_mid_crt_size, + regression_8100_mid_crt); + if (!ADBG_EXPECT_COMPARE_SIGNED(c, clen, !=, -1)) + goto out; +- tlen = myasprintf(&trust, "%*s", (int)sizeof(regression_8100_ca_crt), ++ tlen = myasprintf(&trust, "%*s", (int)regression_8100_ca_crt_size, + regression_8100_ca_crt); + if (!ADBG_EXPECT_COMPARE_SIGNED(c, tlen, !=, -1)) + goto out; +@@ -282,7 +282,7 @@ static void test_8103(ADBG_Case_t *c) + NULL, &ret_orig))) + return; + +- clen = myasprintf(&csr, "%*s", (int)sizeof(regression_8100_my_csr), ++ clen = myasprintf(&csr, "%*s", (int)regression_8100_my_csr_size, + regression_8100_my_csr); + if (!ADBG_EXPECT_COMPARE_SIGNED(c, clen, >=, 0)) + goto out; +@@ -300,7 +300,7 @@ static void test_8103(ADBG_Case_t *c) + if (!ADBG_EXPECT_TEEC_SUCCESS(c, res)) + goto out; + +- myasprintf(&ca, "%*s", (int)sizeof(regression_8100_ca_crt), ++ myasprintf(&ca, "%*s", (int)regression_8100_ca_crt_size, + regression_8100_ca_crt); + if (!ADBG_EXPECT_NOT_NULL(c, ca)) + goto out; +diff --git a/scripts/file_to_c.py b/scripts/file_to_c.py +index 83a9832..ae16f52 100755 +--- a/scripts/file_to_c.py ++++ b/scripts/file_to_c.py +@@ -37,9 +37,9 @@ def main(): + else: + f.write(" ") + +- f.write("};\n") ++ f.write("'\\0'};\n") + f.write("const size_t " + args.name + "_size = sizeof(" + +- args.name + ");\n") ++ args.name + ") - 1;\n") + + f.close() + inf.close() +-- +2.23.0.rc1 + diff --git a/recipes-security/optee-imx/optee-test_3.2.0.imx.bb b/recipes-security/optee-imx/optee-test_3.2.0.imx.bb index 187c24a9..16625a60 100644 --- a/recipes-security/optee-imx/optee-test_3.2.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.2.0.imx.bb @@ -12,11 +12,15 @@ inherit pythonnative FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRCBRANCH = "imx_4.14.78_1.0.0_ga" -OPTEE_TEST_SRC ?= "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https" +OPTEE_TEST_SRC ?= "git://github.com/nxp-imx/imx-optee-test.git;protocol=https" SRC_URI = "${OPTEE_TEST_SRC};branch=${SRCBRANCH} \ file://0001-regression-4011-correct-potential-overflow.patch \ file://0001-xtest-prevent-unexpected-build-warning-with-strncpy.patch \ + file://0003-sock_server-fix-compilation-against-musl-sys-errno.h.patch \ + file://0004-build-ignore-declaration-after-statement-warnings.patch \ + file://0005-benchmark_1000-fix-compilation-against-musl-uint.patch \ + file://0006-regression_8100-use-null-terminated-strings-with-fil.patch \ " S = "${WORKDIR}/git" diff --git a/recipes-security/optee/optee-client-qoriq.bb b/recipes-security/optee/optee-client-qoriq.bb index 4d1caa16..0eaf6160 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 pythonnative 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 fbde2616..64b96aa6 100644 --- a/recipes-security/optee/optee-os-qoriq_git.bb +++ b/recipes-security/optee/optee-os-qoriq_git.bb @@ -9,7 +9,7 @@ DEPENDS = "python-pycrypto-native" inherit deploy pythonnative 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 \ " diff --git a/recipes-security/optee/optee-test-qoriq_git.bb b/recipes-security/optee/optee-test-qoriq_git.bb index 1c6ca22e..eea88c18 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 python-pycrypto-native" inherit pythonnative -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 \ " S = "${WORKDIR}/git" |