diff options
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc | 5 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc | 12 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb | 21 | ||||
| -rw-r--r-- | recipes-dpaa/fm-ucode/fm-ucode_git.bb | 2 | ||||
| -rw-r--r-- | recipes-dpaa2/management-complex/management-complex_10.39.0.bb | 2 | ||||
| -rw-r--r-- | recipes-extended/jailhouse/jailhouse-imx_git.bb | 22 | ||||
| -rw-r--r-- | recipes-extended/skmm-ep/skmm-ep_git.bb | 3 | ||||
| -rw-r--r-- | recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb | 2 | ||||
| -rw-r--r-- | recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb | 13 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-fslc-qoriq_5.4.bb | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-imx-headers_6.18.bb | 6 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-qoriq.inc | 7 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-qoriq_6.12.bb | 2 | ||||
| -rw-r--r-- | recipes-kernel/skmm-host/skmm-host_git.bb | 2 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb | 19 | ||||
| -rw-r--r-- | recipes-security/smw/smw_5.3.bb | 4 |
16 files changed, 64 insertions, 60 deletions
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc index 7d0189e17..368be1632 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc | |||
| @@ -3,18 +3,19 @@ | |||
| 3 | 3 | ||
| 4 | inherit fsl-u-boot-localversion | 4 | inherit fsl-u-boot-localversion |
| 5 | 5 | ||
| 6 | LICENSE = "GPL-2.0-or-later" | ||
| 7 | HOMEPAGE = "https://github.com/Freescale/u-boot-fslc" | 6 | HOMEPAGE = "https://github.com/Freescale/u-boot-fslc" |
| 7 | LICENSE = "GPL-2.0-or-later" | ||
| 8 | LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" | 8 | LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" |
| 9 | 9 | ||
| 10 | DEPENDS += "flex-native bison-native" | 10 | DEPENDS += "flex-native bison-native" |
| 11 | 11 | ||
| 12 | PV = "2025.01+fslc+git${SRCPV}" | ||
| 13 | |||
| 12 | SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" | 14 | SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" |
| 13 | 15 | ||
| 14 | SRCREV = "aa4bc52d08c342df83e3c576e2c108d7c8816e0e" | 16 | SRCREV = "aa4bc52d08c342df83e3c576e2c108d7c8816e0e" |
| 15 | SRCBRANCH = "2025.01+fslc" | 17 | SRCBRANCH = "2025.01+fslc" |
| 16 | 18 | ||
| 17 | PV = "2025.01+fslc+git${SRCPV}" | ||
| 18 | CVE_PRODUCT = "denx:u-boot" | 19 | CVE_PRODUCT = "denx:u-boot" |
| 19 | 20 | ||
| 20 | B = "${WORKDIR}/build" | 21 | B = "${WORKDIR}/build" |
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc index 9dd2b61fe..d704eddb4 100644 --- a/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc +++ b/recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc | |||
| @@ -3,12 +3,6 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards." | |||
| 3 | LICENSE = "GPL-2.0-or-later" | 3 | LICENSE = "GPL-2.0-or-later" |
| 4 | LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 4 | LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 5 | 5 | ||
| 6 | SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}" | ||
| 7 | UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https" | ||
| 8 | SRCBRANCH = "lf_v2025.04" | ||
| 9 | LOCALVERSION ?= "-${SRCBRANCH}" | ||
| 10 | SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692" | ||
| 11 | |||
| 12 | DEPENDS += "\ | 6 | DEPENDS += "\ |
| 13 | bc-native \ | 7 | bc-native \ |
| 14 | bison-native \ | 8 | bison-native \ |
| @@ -18,6 +12,12 @@ DEPENDS += "\ | |||
| 18 | xxd-native \ | 12 | xxd-native \ |
| 19 | " | 13 | " |
| 20 | 14 | ||
| 15 | SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}" | ||
| 16 | UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https" | ||
| 17 | SRCBRANCH = "lf_v2025.04" | ||
| 18 | LOCALVERSION ?= "-${SRCBRANCH}" | ||
| 19 | SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692" | ||
| 20 | |||
| 21 | B = "${WORKDIR}/build" | 21 | B = "${WORKDIR}/build" |
| 22 | 22 | ||
| 23 | inherit fsl-u-boot-localversion | 23 | inherit fsl-u-boot-localversion |
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb index 1d870ab92..28b747c70 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb | |||
| @@ -2,9 +2,6 @@ require recipes-bsp/u-boot/u-boot.inc | |||
| 2 | 2 | ||
| 3 | DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards" | 3 | DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards" |
| 4 | HOMEPAGE = "https://github.com/nxp-qoriq/u-boot" | 4 | HOMEPAGE = "https://github.com/nxp-qoriq/u-boot" |
| 5 | PROVIDES += "u-boot" | ||
| 6 | |||
| 7 | inherit fsl-u-boot-localversion | ||
| 8 | 5 | ||
| 9 | LICENSE = "BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND LGPL-2.0-only AND LGPL-2.1-only" | 6 | LICENSE = "BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND LGPL-2.0-only AND LGPL-2.1-only" |
| 10 | LIC_FILES_CHKSUM = "\ | 7 | LIC_FILES_CHKSUM = "\ |
| @@ -15,23 +12,27 @@ LIC_FILES_CHKSUM = "\ | |||
| 15 | file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ | 12 | file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ |
| 16 | " | 13 | " |
| 17 | 14 | ||
| 15 | INHIBIT_DEFAULT_DEPS = "1" | ||
| 16 | DEPENDS = "bc-native bison-native gnutls-native libgcc python3-native swig-native virtual/cross-cc" | ||
| 17 | DEPENDS:append:qoriq-arm64 = " dtc-native" | ||
| 18 | DEPENDS:append:qoriq-arm = " dtc-native" | ||
| 19 | DEPENDS:append:qoriq-ppc = " boot-format-native" | ||
| 20 | |||
| 21 | PROVIDES += "u-boot" | ||
| 22 | |||
| 18 | PV:append = "+${SRCPV}" | 23 | PV:append = "+${SRCPV}" |
| 24 | PV:append = "+fslgit" | ||
| 19 | 25 | ||
| 20 | UBOOT_BRANCH ?= "lf_v2025.04" | 26 | UBOOT_BRANCH ?= "lf_v2025.04" |
| 21 | UBOOT_SRC ?= "git://github.com/nxp-qoriq/u-boot.git;protocol=https" | 27 | UBOOT_SRC ?= "git://github.com/nxp-qoriq/u-boot.git;protocol=https" |
| 22 | SRC_URI = "${UBOOT_SRC};branch=${UBOOT_BRANCH}" | 28 | SRC_URI = "${UBOOT_SRC};branch=${UBOOT_BRANCH}" |
| 23 | SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692" | 29 | SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692" |
| 24 | 30 | ||
| 31 | inherit fsl-u-boot-localversion | ||
| 32 | |||
| 25 | B = "${UNPACKDIR}/build" | 33 | B = "${UNPACKDIR}/build" |
| 26 | PV:append = "+fslgit" | ||
| 27 | LOCALVERSION = "+fsl" | 34 | LOCALVERSION = "+fsl" |
| 28 | 35 | ||
| 29 | INHIBIT_DEFAULT_DEPS = "1" | ||
| 30 | DEPENDS = "bc-native bison-native gnutls-native libgcc python3-native swig-native virtual/cross-cc" | ||
| 31 | DEPENDS:append:qoriq-arm64 = " dtc-native" | ||
| 32 | DEPENDS:append:qoriq-arm = " dtc-native" | ||
| 33 | DEPENDS:append:qoriq-ppc = " boot-format-native" | ||
| 34 | |||
| 35 | python () { | 36 | python () { |
| 36 | if d.getVar("TCMODE") == "external-fsl": | 37 | if d.getVar("TCMODE") == "external-fsl": |
| 37 | return | 38 | return |
diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb index 76529db68..a4addcfd7 100644 --- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb +++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb | |||
| @@ -34,10 +34,10 @@ do_deploy () { | |||
| 34 | } | 34 | } |
| 35 | addtask deploy before do_build after do_install | 35 | addtask deploy before do_build after do_install |
| 36 | 36 | ||
| 37 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
| 37 | PACKAGES += "${PN}-image" | 38 | PACKAGES += "${PN}-image" |
| 38 | FILES:${PN}-image += "/boot" | 39 | FILES:${PN}-image += "/boot" |
| 39 | ALLOW_EMPTY:${PN} = "1" | 40 | ALLOW_EMPTY:${PN} = "1" |
| 40 | 41 | ||
| 41 | COMPATIBLE_MACHINE = "(e500mc|e5500|e5500-64b|e6500|e6500-64b|fsl-lsch2)" | 42 | COMPATIBLE_MACHINE = "(e500mc|e5500|e5500-64b|e6500|e6500-64b|fsl-lsch2)" |
| 42 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
| 43 | 43 | ||
diff --git a/recipes-dpaa2/management-complex/management-complex_10.39.0.bb b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb index 965b2d548..b35cca4fd 100644 --- a/recipes-dpaa2/management-complex/management-complex_10.39.0.bb +++ b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb | |||
| @@ -33,10 +33,10 @@ do_deploy () { | |||
| 33 | } | 33 | } |
| 34 | addtask deploy before do_build after do_install | 34 | addtask deploy before do_build after do_install |
| 35 | 35 | ||
| 36 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
| 36 | PACKAGES += "${PN}-image" | 37 | PACKAGES += "${PN}-image" |
| 37 | FILES:${PN}-image += "/boot" | 38 | FILES:${PN}-image += "/boot" |
| 38 | 39 | ||
| 39 | INHIBIT_PACKAGE_STRIP = "1" | 40 | INHIBIT_PACKAGE_STRIP = "1" |
| 40 | 41 | ||
| 41 | COMPATIBLE_MACHINE = "(qoriq-arm64)" | 42 | COMPATIBLE_MACHINE = "(qoriq-arm64)" |
| 42 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index 13746abc6..f2e1e989c 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb | |||
| @@ -14,27 +14,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ | |||
| 14 | file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ | 14 | file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ |
| 15 | " | 15 | " |
| 16 | 16 | ||
| 17 | PROVIDES = "jailhouse" | 17 | DEPENDS = "\ |
| 18 | RPROVIDES:${PN} += "jailhouse" | 18 | make-native \ |
| 19 | python3-mako-native \ | ||
| 20 | python3-mako \ | ||
| 21 | dtc-native \ | ||
| 22 | " | ||
| 19 | 23 | ||
| 20 | SRCBRANCH = "lf-6.12.20_2.0.0" | 24 | PROVIDES = "jailhouse" |
| 21 | SRCREV = "399d65450e9a377b4aaff4b0627619174e1c8c46" | ||
| 22 | 25 | ||
| 23 | PV = "2023.03+git${SRCPV}" | 26 | PV = "2023.03+git${SRCPV}" |
| 24 | 27 | ||
| 28 | SRCBRANCH = "lf-6.12.20_2.0.0" | ||
| 25 | IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" | 29 | IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" |
| 26 | SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \ | 30 | SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \ |
| 27 | file://arm-arm64-Makefile-Remove-march-option-from-Makefile.patch \ | 31 | file://arm-arm64-Makefile-Remove-march-option-from-Makefile.patch \ |
| 28 | file://0001-YOCIMX-9281-1-Fix-gcc15-errors.patch \ | 32 | file://0001-YOCIMX-9281-1-Fix-gcc15-errors.patch \ |
| 29 | file://0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch \ | 33 | file://0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch \ |
| 30 | " | 34 | " |
| 31 | 35 | SRCREV = "399d65450e9a377b4aaff4b0627619174e1c8c46" | |
| 32 | DEPENDS = "\ | ||
| 33 | make-native \ | ||
| 34 | python3-mako-native \ | ||
| 35 | python3-mako \ | ||
| 36 | dtc-native \ | ||
| 37 | " | ||
| 38 | 36 | ||
| 39 | inherit module bash-completion deploy setuptools3 | 37 | inherit module bash-completion deploy setuptools3 |
| 40 | 38 | ||
| @@ -111,6 +109,8 @@ RDEPENDS:pyjailhouse = "\ | |||
| 111 | python3-shell \ | 109 | python3-shell \ |
| 112 | " | 110 | " |
| 113 | 111 | ||
| 112 | RPROVIDES:${PN} += "jailhouse" | ||
| 113 | |||
| 114 | INSANE_SKIP:${PN} = "ldflags buildpaths" | 114 | INSANE_SKIP:${PN} = "ldflags buildpaths" |
| 115 | INSANE_SKIP:${PN}-dbg = "buildpaths" | 115 | INSANE_SKIP:${PN}-dbg = "buildpaths" |
| 116 | 116 | ||
diff --git a/recipes-extended/skmm-ep/skmm-ep_git.bb b/recipes-extended/skmm-ep/skmm-ep_git.bb index f8fdf889e..42ecaf2b5 100644 --- a/recipes-extended/skmm-ep/skmm-ep_git.bb +++ b/recipes-extended/skmm-ep/skmm-ep_git.bb | |||
| @@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://Makefile;endline=30;md5=39e58bedc879163c9338596e52df5 | |||
| 7 | 7 | ||
| 8 | DEPENDS = "libedit openssl virtual/kernel" | 8 | DEPENDS = "libedit openssl virtual/kernel" |
| 9 | 9 | ||
| 10 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
| 11 | |||
| 12 | SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=1 \ | 10 | SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=1 \ |
| 13 | file://add-two-missing-header-files.patch \ | 11 | file://add-two-missing-header-files.patch \ |
| 14 | " | 12 | " |
| @@ -28,3 +26,4 @@ do_install () { | |||
| 28 | } | 26 | } |
| 29 | 27 | ||
| 30 | COMPATIBLE_MACHINE = "(p4080ds|t4240qds|c293pcie)" | 28 | COMPATIBLE_MACHINE = "(p4080ds|t4240qds|c293pcie)" |
| 29 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb index 66889ae65..8bfb5aec4 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb | |||
| @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" | |||
| 11 | 11 | ||
| 12 | PV .= "+git${SRCPV}" | 12 | PV .= "+git${SRCPV}" |
| 13 | 13 | ||
| 14 | SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c" | ||
| 15 | SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master" | 14 | SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master" |
| 15 | SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c" | ||
| 16 | 16 | ||
| 17 | inherit module | 17 | inherit module |
| 18 | 18 | ||
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb index 7af9d3e4b..b82a3a58e 100644 --- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb | |||
| @@ -6,12 +6,6 @@ LICENSE = "GPL-2.0-only" | |||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77" |
| 7 | 7 | ||
| 8 | PROVIDES += "kernel-module-nxp89xx" | 8 | PROVIDES += "kernel-module-nxp89xx" |
| 9 | RREPLACES:${PN} = "kernel-module-nxp89xx" | ||
| 10 | RPROVIDES:${PN} = "kernel-module-nxp89xx" | ||
| 11 | RCONFLICTS:${PN} = "kernel-module-nxp89xx" | ||
| 12 | |||
| 13 | KERNEL_MODULE_PROBECONF += "moal" | ||
| 14 | module_conf_moal = "options moal mod_para=nxp/wifi_mod_para.conf" | ||
| 15 | 9 | ||
| 16 | SRC_URI = "\ | 10 | SRC_URI = "\ |
| 17 | ${MRVL_SRC};branch=${SRCBRANCH} \ | 11 | ${MRVL_SRC};branch=${SRCBRANCH} \ |
| @@ -21,6 +15,13 @@ MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" | |||
| 21 | SRCBRANCH = "lf-6.18.2_1.0.0" | 15 | SRCBRANCH = "lf-6.18.2_1.0.0" |
| 22 | SRCREV = "a5fe4e194bf99315e349d81d77d6dfacec70757a" | 16 | SRCREV = "a5fe4e194bf99315e349d81d77d6dfacec70757a" |
| 23 | 17 | ||
| 18 | RREPLACES:${PN} = "kernel-module-nxp89xx" | ||
| 19 | RPROVIDES:${PN} = "kernel-module-nxp89xx" | ||
| 20 | RCONFLICTS:${PN} = "kernel-module-nxp89xx" | ||
| 21 | |||
| 22 | KERNEL_MODULE_PROBECONF += "moal" | ||
| 23 | module_conf_moal = "options moal mod_para=nxp/wifi_mod_para.conf" | ||
| 24 | |||
| 24 | inherit module | 25 | inherit module |
| 25 | 26 | ||
| 26 | EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}" | 27 | EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}" |
diff --git a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb index 7264709a4..693b6a567 100644 --- a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb | |||
| @@ -14,5 +14,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | |||
| 14 | LINUX_VERSION = "5.4.92" | 14 | LINUX_VERSION = "5.4.92" |
| 15 | 15 | ||
| 16 | SRCBRANCH = "5.4.y+qoriq+fslc" | 16 | SRCBRANCH = "5.4.y+qoriq+fslc" |
| 17 | SRCREV = "11d4722c637a77c6e1c9a8eeec091f1588f6b3f3" | ||
| 18 | SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH};protocol=https" | 17 | SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH};protocol=https" |
| 18 | SRCREV = "11d4722c637a77c6e1c9a8eeec091f1588f6b3f3" | ||
diff --git a/recipes-kernel/linux/linux-imx-headers_6.18.bb b/recipes-kernel/linux/linux-imx-headers_6.18.bb index 4e4c986b1..cb05aa2a8 100644 --- a/recipes-kernel/linux/linux-imx-headers_6.18.bb +++ b/recipes-kernel/linux/linux-imx-headers_6.18.bb | |||
| @@ -8,6 +8,9 @@ HOMEPAGE = "https://github.com/nxp-imx/linux-imx" | |||
| 8 | LICENSE = "GPL-2.0-only" | 8 | LICENSE = "GPL-2.0-only" |
| 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
| 10 | 10 | ||
| 11 | INHIBIT_DEFAULT_DEPS = "1" | ||
| 12 | DEPENDS += "bison-native rsync-native unifdef-native" | ||
| 13 | |||
| 11 | SRC_URI = "${LINUX_IMX_SRC} \ | 14 | SRC_URI = "${LINUX_IMX_SRC} \ |
| 12 | file://0001-ipu-uapi-Do-not-redefine-standard-integer-types.patch \ | 15 | file://0001-ipu-uapi-Do-not-redefine-standard-integer-types.patch \ |
| 13 | " | 16 | " |
| @@ -79,9 +82,6 @@ do_install() { | |||
| 79 | # populating it into SDK | 82 | # populating it into SDK |
| 80 | ALLOW_EMPTY:${PN} = "1" | 83 | ALLOW_EMPTY:${PN} = "1" |
| 81 | 84 | ||
| 82 | INHIBIT_DEFAULT_DEPS = "1" | ||
| 83 | DEPENDS += "bison-native rsync-native unifdef-native" | ||
| 84 | |||
| 85 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 85 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
| 86 | 86 | ||
| 87 | # Restrict this recipe to NXP BSP only, this recipe is not compatible | 87 | # Restrict this recipe to NXP BSP only, this recipe is not compatible |
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index c3eeb37f5..284d43ddb 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc | |||
| @@ -7,6 +7,10 @@ SECTION = "kernel" | |||
| 7 | LICENSE = "GPL-2.0-only" | 7 | LICENSE = "GPL-2.0-only" |
| 8 | 8 | ||
| 9 | DEPENDS:append = " libgcc coreutils-native" | 9 | DEPENDS:append = " libgcc coreutils-native" |
| 10 | |||
| 11 | # Set the PV to the correct kernel version to satisfy the kernel version sanity check | ||
| 12 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
| 13 | |||
| 10 | # not put Images into /boot of rootfs, install kernel-image if needed | 14 | # not put Images into /boot of rootfs, install kernel-image if needed |
| 11 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" | 15 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" |
| 12 | 16 | ||
| @@ -17,9 +21,6 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" | |||
| 17 | ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" | 21 | ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" |
| 18 | ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | 22 | ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME" |
| 19 | 23 | ||
| 20 | # Set the PV to the correct kernel version to satisfy the kernel version sanity check | ||
| 21 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
| 22 | |||
| 23 | SCMVERSION ?= "y" | 24 | SCMVERSION ?= "y" |
| 24 | LOCALVERSION = "" | 25 | LOCALVERSION = "" |
| 25 | 26 | ||
diff --git a/recipes-kernel/linux/linux-qoriq_6.12.bb b/recipes-kernel/linux/linux-qoriq_6.12.bb index 378a5d0af..174008eca 100644 --- a/recipes-kernel/linux/linux-qoriq_6.12.bb +++ b/recipes-kernel/linux/linux-qoriq_6.12.bb | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | HOMEPAGE = "https://github.com/nxp-qoriq/linux" | ||
| 1 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
| 2 | LINUX_VERSION = "6.12.49" | 3 | LINUX_VERSION = "6.12.49" |
| 3 | 4 | ||
| @@ -7,4 +8,3 @@ SRC_URI = "${LINUX_QORIQ_SRC};branch=${LINUX_QORIQ_BRANCH}" | |||
| 7 | SRCREV = "df24f9428e38740256a410b983003a478e72a7c0" | 8 | SRCREV = "df24f9428e38740256a410b983003a478e72a7c0" |
| 8 | 9 | ||
| 9 | require linux-qoriq.inc | 10 | require linux-qoriq.inc |
| 10 | HOMEPAGE = "https://github.com/nxp-qoriq/linux" | ||
diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb index f60e607ee..3e7b56624 100644 --- a/recipes-kernel/skmm-host/skmm-host_git.bb +++ b/recipes-kernel/skmm-host/skmm-host_git.bb | |||
| @@ -12,9 +12,9 @@ SRCREV = "d5912ebdb8d3b29b1e2df52710e8821d1ce3eb80" | |||
| 12 | 12 | ||
| 13 | EXTRA_OEMAKE = 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' | 13 | EXTRA_OEMAKE = 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' |
| 14 | 14 | ||
| 15 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
| 15 | FILES:${PN} += "/etc/skmm/ /usr/bin/" | 16 | FILES:${PN} += "/etc/skmm/ /usr/bin/" |
| 16 | 17 | ||
| 17 | COMPATIBLE_MACHINE = "(p4080ds|t4240qds)" | 18 | COMPATIBLE_MACHINE = "(p4080ds|t4240qds)" |
| 18 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
| 19 | 19 | ||
| 20 | CLEANBROKEN = "1" | 20 | CLEANBROKEN = "1" |
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 index a3abc3927..bbe488547 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb | |||
| @@ -2,23 +2,16 @@ | |||
| 2 | SUMMARY = "GStreamer 1.0 plugins for i.MX platforms" | 2 | SUMMARY = "GStreamer 1.0 plugins for i.MX platforms" |
| 3 | DESCRIPTION = "GStreamer 1.0 plugins providing hardware-accelerated video and audio elements (VPU decoders/encoders, G2D/IPU-based blitters and uniaudio) for NXP i.MX platforms." | 3 | DESCRIPTION = "GStreamer 1.0 plugins providing hardware-accelerated video and audio elements (VPU decoders/encoders, G2D/IPU-based blitters and uniaudio) for NXP i.MX platforms." |
| 4 | HOMEPAGE = "https://github.com/Freescale/gstreamer-imx" | 4 | HOMEPAGE = "https://github.com/Freescale/gstreamer-imx" |
| 5 | SECTION = "multimedia" | ||
| 5 | LICENSE = "LGPL-2.0-or-later" | 6 | LICENSE = "LGPL-2.0-or-later" |
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" |
| 7 | SECTION = "multimedia" | ||
| 8 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base libimxdmabuffer" | 8 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base libimxdmabuffer" |
| 9 | # add the audioparsers and the videoparsersbad plugins as RDEPENDS ; audioparsers | ||
| 10 | # for the uniaudio decoder, videoparsersbad for the VPU video decoder | ||
| 11 | # the gstreamer1.0-plugins-imx RDEPENDS is necessary to ensure the -good recipe is | ||
| 12 | # built (it is not a compile-time dependency however, hence RDEPENDS and not DEPENDS) | ||
| 13 | RDEPENDS:gstreamer1.0-plugins-imx = "gstreamer1.0-plugins-bad gstreamer1.0-plugins-good" | ||
| 14 | RDEPENDS:gstreamer1.0-plugins-imx-imxaudio = "gstreamer1.0-plugins-good-audioparsers" | ||
| 15 | RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparsersbad" | ||
| 16 | 9 | ||
| 17 | PV .= "+git${SRCPV}" | 10 | PV .= "+git${SRCPV}" |
| 18 | 11 | ||
| 19 | SRCBRANCH ?= "master" | 12 | SRCBRANCH ?= "master" |
| 20 | SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387" | ||
| 21 | SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https" | 13 | SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https" |
| 14 | SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387" | ||
| 22 | 15 | ||
| 23 | inherit pkgconfig meson use-imx-headers | 16 | inherit pkgconfig meson use-imx-headers |
| 24 | 17 | ||
| @@ -60,6 +53,14 @@ PACKAGECONFIG[v4l2-mxc-source-sink] = "-Dv4l2-mxc-source-sink=true,-Dv4l2-mxc-so | |||
| 60 | PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec" | 53 | PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec" |
| 61 | PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec" | 54 | PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec" |
| 62 | 55 | ||
| 56 | # add the audioparsers and the videoparsersbad plugins as RDEPENDS ; audioparsers | ||
| 57 | # for the uniaudio decoder, videoparsersbad for the VPU video decoder | ||
| 58 | # the gstreamer1.0-plugins-imx RDEPENDS is necessary to ensure the -good recipe is | ||
| 59 | # built (it is not a compile-time dependency however, hence RDEPENDS and not DEPENDS) | ||
| 60 | RDEPENDS:gstreamer1.0-plugins-imx = "gstreamer1.0-plugins-bad gstreamer1.0-plugins-good" | ||
| 61 | RDEPENDS:gstreamer1.0-plugins-imx-imxaudio = "gstreamer1.0-plugins-good-audioparsers" | ||
| 62 | RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparsersbad" | ||
| 63 | |||
| 63 | require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc | 64 | require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc |
| 64 | 65 | ||
| 65 | # the following line is required to produce one package for each plugin | 66 | # the following line is required to produce one package for each plugin |
diff --git a/recipes-security/smw/smw_5.3.bb b/recipes-security/smw/smw_5.3.bb index 3fca2b460..b7313ac11 100644 --- a/recipes-security/smw/smw_5.3.bb +++ b/recipes-security/smw/smw_5.3.bb | |||
| @@ -74,6 +74,8 @@ EXTRA_OECMAKE = "\ | |||
| 74 | OECMAKE_TARGET_COMPILE += "build_tests" | 74 | OECMAKE_TARGET_COMPILE += "build_tests" |
| 75 | OECMAKE_TARGET_INSTALL += "install_tests" | 75 | OECMAKE_TARGET_INSTALL += "install_tests" |
| 76 | 76 | ||
| 77 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
| 78 | |||
| 77 | PACKAGES =+ "${PN}-tests" | 79 | PACKAGES =+ "${PN}-tests" |
| 78 | 80 | ||
| 79 | FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/*" | 81 | FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/*" |
| @@ -84,6 +86,4 @@ FILES:${PN}-tests = "${bindir}/* ${datadir}/${BPN}/*" | |||
| 84 | RDEPENDS:${PN}-tests = "cmake" | 86 | RDEPENDS:${PN}-tests = "cmake" |
| 85 | INSANE_SKIP:${PN}-tests = "buildpaths" | 87 | INSANE_SKIP:${PN}-tests = "buildpaths" |
| 86 | 88 | ||
| 87 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | ||
| 88 | |||
| 89 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | 89 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
