summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc5
-rw-r--r--recipes-bsp/u-boot/u-boot-imx-common_2025.04.inc12
-rw-r--r--recipes-bsp/u-boot/u-boot-qoriq_2025.04.bb21
-rw-r--r--recipes-dpaa/fm-ucode/fm-ucode_git.bb2
-rw-r--r--recipes-dpaa2/management-complex/management-complex_10.39.0.bb2
-rw-r--r--recipes-extended/jailhouse/jailhouse-imx_git.bb22
-rw-r--r--recipes-extended/skmm-ep/skmm-ep_git.bb3
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb2
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb13
-rw-r--r--recipes-kernel/linux/linux-fslc-qoriq_5.4.bb2
-rw-r--r--recipes-kernel/linux/linux-imx-headers_6.18.bb6
-rw-r--r--recipes-kernel/linux/linux-qoriq.inc7
-rw-r--r--recipes-kernel/linux/linux-qoriq_6.12.bb2
-rw-r--r--recipes-kernel/skmm-host/skmm-host_git.bb2
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb19
-rw-r--r--recipes-security/smw/smw_5.3.bb4
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
4inherit fsl-u-boot-localversion 4inherit fsl-u-boot-localversion
5 5
6LICENSE = "GPL-2.0-or-later"
7HOMEPAGE = "https://github.com/Freescale/u-boot-fslc" 6HOMEPAGE = "https://github.com/Freescale/u-boot-fslc"
7LICENSE = "GPL-2.0-or-later"
8LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" 8LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
9 9
10DEPENDS += "flex-native bison-native" 10DEPENDS += "flex-native bison-native"
11 11
12PV = "2025.01+fslc+git${SRCPV}"
13
12SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" 14SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
13 15
14SRCREV = "aa4bc52d08c342df83e3c576e2c108d7c8816e0e" 16SRCREV = "aa4bc52d08c342df83e3c576e2c108d7c8816e0e"
15SRCBRANCH = "2025.01+fslc" 17SRCBRANCH = "2025.01+fslc"
16 18
17PV = "2025.01+fslc+git${SRCPV}"
18CVE_PRODUCT = "denx:u-boot" 19CVE_PRODUCT = "denx:u-boot"
19 20
20B = "${WORKDIR}/build" 21B = "${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."
3LICENSE = "GPL-2.0-or-later" 3LICENSE = "GPL-2.0-or-later"
4LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" 4LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5 5
6SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
7UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https"
8SRCBRANCH = "lf_v2025.04"
9LOCALVERSION ?= "-${SRCBRANCH}"
10SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692"
11
12DEPENDS += "\ 6DEPENDS += "\
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
15SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
16UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https"
17SRCBRANCH = "lf_v2025.04"
18LOCALVERSION ?= "-${SRCBRANCH}"
19SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692"
20
21B = "${WORKDIR}/build" 21B = "${WORKDIR}/build"
22 22
23inherit fsl-u-boot-localversion 23inherit 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
3DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards" 3DESCRIPTION = "U-Boot provided by Freescale with focus on QorIQ boards"
4HOMEPAGE = "https://github.com/nxp-qoriq/u-boot" 4HOMEPAGE = "https://github.com/nxp-qoriq/u-boot"
5PROVIDES += "u-boot"
6
7inherit fsl-u-boot-localversion
8 5
9LICENSE = "BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND LGPL-2.0-only AND LGPL-2.1-only" 6LICENSE = "BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND LGPL-2.0-only AND LGPL-2.1-only"
10LIC_FILES_CHKSUM = "\ 7LIC_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
15INHIBIT_DEFAULT_DEPS = "1"
16DEPENDS = "bc-native bison-native gnutls-native libgcc python3-native swig-native virtual/cross-cc"
17DEPENDS:append:qoriq-arm64 = " dtc-native"
18DEPENDS:append:qoriq-arm = " dtc-native"
19DEPENDS:append:qoriq-ppc = " boot-format-native"
20
21PROVIDES += "u-boot"
22
18PV:append = "+${SRCPV}" 23PV:append = "+${SRCPV}"
24PV:append = "+fslgit"
19 25
20UBOOT_BRANCH ?= "lf_v2025.04" 26UBOOT_BRANCH ?= "lf_v2025.04"
21UBOOT_SRC ?= "git://github.com/nxp-qoriq/u-boot.git;protocol=https" 27UBOOT_SRC ?= "git://github.com/nxp-qoriq/u-boot.git;protocol=https"
22SRC_URI = "${UBOOT_SRC};branch=${UBOOT_BRANCH}" 28SRC_URI = "${UBOOT_SRC};branch=${UBOOT_BRANCH}"
23SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692" 29SRCREV = "4ddbad60eff308a5b356fb9ab8734ac382ddd692"
24 30
31inherit fsl-u-boot-localversion
32
25B = "${UNPACKDIR}/build" 33B = "${UNPACKDIR}/build"
26PV:append = "+fslgit"
27LOCALVERSION = "+fsl" 34LOCALVERSION = "+fsl"
28 35
29INHIBIT_DEFAULT_DEPS = "1"
30DEPENDS = "bc-native bison-native gnutls-native libgcc python3-native swig-native virtual/cross-cc"
31DEPENDS:append:qoriq-arm64 = " dtc-native"
32DEPENDS:append:qoriq-arm = " dtc-native"
33DEPENDS:append:qoriq-ppc = " boot-format-native"
34
35python () { 36python () {
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}
35addtask deploy before do_build after do_install 35addtask deploy before do_build after do_install
36 36
37PACKAGE_ARCH = "${MACHINE_SOCARCH}"
37PACKAGES += "${PN}-image" 38PACKAGES += "${PN}-image"
38FILES:${PN}-image += "/boot" 39FILES:${PN}-image += "/boot"
39ALLOW_EMPTY:${PN} = "1" 40ALLOW_EMPTY:${PN} = "1"
40 41
41COMPATIBLE_MACHINE = "(e500mc|e5500|e5500-64b|e6500|e6500-64b|fsl-lsch2)" 42COMPATIBLE_MACHINE = "(e500mc|e5500|e5500-64b|e6500|e6500-64b|fsl-lsch2)"
42PACKAGE_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}
34addtask deploy before do_build after do_install 34addtask deploy before do_build after do_install
35 35
36PACKAGE_ARCH = "${MACHINE_ARCH}"
36PACKAGES += "${PN}-image" 37PACKAGES += "${PN}-image"
37FILES:${PN}-image += "/boot" 38FILES:${PN}-image += "/boot"
38 39
39INHIBIT_PACKAGE_STRIP = "1" 40INHIBIT_PACKAGE_STRIP = "1"
40 41
41COMPATIBLE_MACHINE = "(qoriq-arm64)" 42COMPATIBLE_MACHINE = "(qoriq-arm64)"
42PACKAGE_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
17PROVIDES = "jailhouse" 17DEPENDS = "\
18RPROVIDES:${PN} += "jailhouse" 18 make-native \
19 python3-mako-native \
20 python3-mako \
21 dtc-native \
22"
19 23
20SRCBRANCH = "lf-6.12.20_2.0.0" 24PROVIDES = "jailhouse"
21SRCREV = "399d65450e9a377b4aaff4b0627619174e1c8c46"
22 25
23PV = "2023.03+git${SRCPV}" 26PV = "2023.03+git${SRCPV}"
24 27
28SRCBRANCH = "lf-6.12.20_2.0.0"
25IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" 29IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
26SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \ 30SRC_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 35SRCREV = "399d65450e9a377b4aaff4b0627619174e1c8c46"
32DEPENDS = "\
33 make-native \
34 python3-mako-native \
35 python3-mako \
36 dtc-native \
37"
38 36
39inherit module bash-completion deploy setuptools3 37inherit module bash-completion deploy setuptools3
40 38
@@ -111,6 +109,8 @@ RDEPENDS:pyjailhouse = "\
111 python3-shell \ 109 python3-shell \
112" 110"
113 111
112RPROVIDES:${PN} += "jailhouse"
113
114INSANE_SKIP:${PN} = "ldflags buildpaths" 114INSANE_SKIP:${PN} = "ldflags buildpaths"
115INSANE_SKIP:${PN}-dbg = "buildpaths" 115INSANE_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
8DEPENDS = "libedit openssl virtual/kernel" 8DEPENDS = "libedit openssl virtual/kernel"
9 9
10PACKAGE_ARCH = "${MACHINE_ARCH}"
11
12SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-ep;protocol=https;nobranch=1 \ 10SRC_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
30COMPATIBLE_MACHINE = "(p4080ds|t4240qds|c293pcie)" 28COMPATIBLE_MACHINE = "(p4080ds|t4240qds|c293pcie)"
29PACKAGE_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
12PV .= "+git${SRCPV}" 12PV .= "+git${SRCPV}"
13 13
14SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c"
15SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master" 14SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master"
15SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c"
16 16
17inherit module 17inherit 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"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
7 7
8PROVIDES += "kernel-module-nxp89xx" 8PROVIDES += "kernel-module-nxp89xx"
9RREPLACES:${PN} = "kernel-module-nxp89xx"
10RPROVIDES:${PN} = "kernel-module-nxp89xx"
11RCONFLICTS:${PN} = "kernel-module-nxp89xx"
12
13KERNEL_MODULE_PROBECONF += "moal"
14module_conf_moal = "options moal mod_para=nxp/wifi_mod_para.conf"
15 9
16SRC_URI = "\ 10SRC_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"
21SRCBRANCH = "lf-6.18.2_1.0.0" 15SRCBRANCH = "lf-6.18.2_1.0.0"
22SRCREV = "a5fe4e194bf99315e349d81d77d6dfacec70757a" 16SRCREV = "a5fe4e194bf99315e349d81d77d6dfacec70757a"
23 17
18RREPLACES:${PN} = "kernel-module-nxp89xx"
19RPROVIDES:${PN} = "kernel-module-nxp89xx"
20RCONFLICTS:${PN} = "kernel-module-nxp89xx"
21
22KERNEL_MODULE_PROBECONF += "moal"
23module_conf_moal = "options moal mod_para=nxp/wifi_mod_para.conf"
24
24inherit module 25inherit module
25 26
26EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}" 27EXTRA_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"
14LINUX_VERSION = "5.4.92" 14LINUX_VERSION = "5.4.92"
15 15
16SRCBRANCH = "5.4.y+qoriq+fslc" 16SRCBRANCH = "5.4.y+qoriq+fslc"
17SRCREV = "11d4722c637a77c6e1c9a8eeec091f1588f6b3f3"
18SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH};protocol=https" 17SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH};protocol=https"
18SRCREV = "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"
8LICENSE = "GPL-2.0-only" 8LICENSE = "GPL-2.0-only"
9LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 9LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
10 10
11INHIBIT_DEFAULT_DEPS = "1"
12DEPENDS += "bison-native rsync-native unifdef-native"
13
11SRC_URI = "${LINUX_IMX_SRC} \ 14SRC_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
80ALLOW_EMPTY:${PN} = "1" 83ALLOW_EMPTY:${PN} = "1"
81 84
82INHIBIT_DEFAULT_DEPS = "1"
83DEPENDS += "bison-native rsync-native unifdef-native"
84
85PACKAGE_ARCH = "${MACHINE_SOCARCH}" 85PACKAGE_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"
7LICENSE = "GPL-2.0-only" 7LICENSE = "GPL-2.0-only"
8 8
9DEPENDS:append = " libgcc coreutils-native" 9DEPENDS:append = " libgcc coreutils-native"
10
11# Set the PV to the correct kernel version to satisfy the kernel version sanity check
12PV = "${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
11RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" 15RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
12 16
@@ -17,9 +21,6 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
17ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" 21ZIMAGE_BASE_NAME = "zImage-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
18ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME" 22ZIMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
19 23
20# Set the PV to the correct kernel version to satisfy the kernel version sanity check
21PV = "${LINUX_VERSION}+git${SRCPV}"
22
23SCMVERSION ?= "y" 24SCMVERSION ?= "y"
24LOCALVERSION = "" 25LOCALVERSION = ""
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 @@
1HOMEPAGE = "https://github.com/nxp-qoriq/linux"
1LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 2LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
2LINUX_VERSION = "6.12.49" 3LINUX_VERSION = "6.12.49"
3 4
@@ -7,4 +8,3 @@ SRC_URI = "${LINUX_QORIQ_SRC};branch=${LINUX_QORIQ_BRANCH}"
7SRCREV = "df24f9428e38740256a410b983003a478e72a7c0" 8SRCREV = "df24f9428e38740256a410b983003a478e72a7c0"
8 9
9require linux-qoriq.inc 10require linux-qoriq.inc
10HOMEPAGE = "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
13EXTRA_OEMAKE = 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' 13EXTRA_OEMAKE = 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
14 14
15PACKAGE_ARCH = "${MACHINE_ARCH}"
15FILES:${PN} += "/etc/skmm/ /usr/bin/" 16FILES:${PN} += "/etc/skmm/ /usr/bin/"
16 17
17COMPATIBLE_MACHINE = "(p4080ds|t4240qds)" 18COMPATIBLE_MACHINE = "(p4080ds|t4240qds)"
18PACKAGE_ARCH = "${MACHINE_ARCH}"
19 19
20CLEANBROKEN = "1" 20CLEANBROKEN = "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 @@
2SUMMARY = "GStreamer 1.0 plugins for i.MX platforms" 2SUMMARY = "GStreamer 1.0 plugins for i.MX platforms"
3DESCRIPTION = "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." 3DESCRIPTION = "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."
4HOMEPAGE = "https://github.com/Freescale/gstreamer-imx" 4HOMEPAGE = "https://github.com/Freescale/gstreamer-imx"
5SECTION = "multimedia"
5LICENSE = "LGPL-2.0-or-later" 6LICENSE = "LGPL-2.0-or-later"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605"
7SECTION = "multimedia"
8DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base libimxdmabuffer" 8DEPENDS = "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)
13RDEPENDS:gstreamer1.0-plugins-imx = "gstreamer1.0-plugins-bad gstreamer1.0-plugins-good"
14RDEPENDS:gstreamer1.0-plugins-imx-imxaudio = "gstreamer1.0-plugins-good-audioparsers"
15RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparsersbad"
16 9
17PV .= "+git${SRCPV}" 10PV .= "+git${SRCPV}"
18 11
19SRCBRANCH ?= "master" 12SRCBRANCH ?= "master"
20SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387"
21SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https" 13SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https"
14SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387"
22 15
23inherit pkgconfig meson use-imx-headers 16inherit pkgconfig meson use-imx-headers
24 17
@@ -60,6 +53,14 @@ PACKAGECONFIG[v4l2-mxc-source-sink] = "-Dv4l2-mxc-source-sink=true,-Dv4l2-mxc-so
60PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec" 53PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec"
61PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec" 54PACKAGECONFIG[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)
60RDEPENDS:gstreamer1.0-plugins-imx = "gstreamer1.0-plugins-bad gstreamer1.0-plugins-good"
61RDEPENDS:gstreamer1.0-plugins-imx-imxaudio = "gstreamer1.0-plugins-good-audioparsers"
62RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparsersbad"
63
63require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc 64require 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 = "\
74OECMAKE_TARGET_COMPILE += "build_tests" 74OECMAKE_TARGET_COMPILE += "build_tests"
75OECMAKE_TARGET_INSTALL += "install_tests" 75OECMAKE_TARGET_INSTALL += "install_tests"
76 76
77PACKAGE_ARCH = "${MACHINE_SOCARCH}"
78
77PACKAGES =+ "${PN}-tests" 79PACKAGES =+ "${PN}-tests"
78 80
79FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/*" 81FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/*"
@@ -84,6 +86,4 @@ FILES:${PN}-tests = "${bindir}/* ${datadir}/${BPN}/*"
84RDEPENDS:${PN}-tests = "cmake" 86RDEPENDS:${PN}-tests = "cmake"
85INSANE_SKIP:${PN}-tests = "buildpaths" 87INSANE_SKIP:${PN}-tests = "buildpaths"
86 88
87PACKAGE_ARCH = "${MACHINE_SOCARCH}"
88
89COMPATIBLE_MACHINE = "(imx-nxp-bsp)" 89COMPATIBLE_MACHINE = "(imx-nxp-bsp)"