diff options
47 files changed, 128 insertions, 439 deletions
@@ -68,20 +68,20 @@ LICENSE = "Apache-2.0 & BSD-3-Clause & Zlib" | |||
68 | ./recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb: LICENSE = "Proprietary" | 68 | ./recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb: LICENSE = "Proprietary" |
69 | ./recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb: LICENSE = "Proprietary" | 69 | ./recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb: LICENSE = "Proprietary" |
70 | ./recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb: LICENSE = "Proprietary" | 70 | ./recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb: LICENSE = "Proprietary" |
71 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" | 71 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" |
72 | ./recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later" | 72 | ./recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later" |
73 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later" | 73 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb: LICENSE = "LGPL-2.1-or-later" |
74 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb: LICENSE = "LGPL-2.0-or-later" | 74 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb: LICENSE = "LGPL-2.0-or-later" |
75 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" | 75 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" |
76 | LICENSE_FLAGS = "commercial" | 76 | LICENSE_FLAGS = "commercial" |
77 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb: LICENSE = "LGPL-2.1-or-later" | ||
77 | ./recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.0.imx.bb: LICENSE_FLAGS = "commercial" | 78 | ./recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.0.imx.bb: LICENSE_FLAGS = "commercial" |
78 | LICENSE = "LGPL-2.1-or-later" | 79 | LICENSE = "LGPL-2.1-or-later" |
79 | ./recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb: LICENSE = "LGPL-2.1-or-later" | 80 | ./recipes-multimedia/gstreamer/gst-devtools_1.22.5.imx.bb: LICENSE = "LGPL-2.1-or-later" |
80 | ./recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later" | 81 | ./recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later" |
82 | ./recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb: LICENSE = "LGPL-2.1-or-later" | ||
81 | ./recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later" | 83 | ./recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later" |
82 | ./recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb: LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only" | 84 | ./recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb: LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only" |
83 | ./recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later" | ||
84 | ./recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb: LICENSE = "LGPL-2.1-or-later" | ||
85 | ./recipes-multimedia/tinycompress/tinycompress_1.1.6.bb: LICENSE = "LGPL-2.1-only | BSD-3-Clause" | 85 | ./recipes-multimedia/tinycompress/tinycompress_1.1.6.bb: LICENSE = "LGPL-2.1-only | BSD-3-Clause" |
86 | ./recipes-multimedia/alsa/imx-alsa-plugins_git.bb: LICENSE = "GPL-2.0-only" | 86 | ./recipes-multimedia/alsa/imx-alsa-plugins_git.bb: LICENSE = "GPL-2.0-only" |
87 | ./recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb: LICENSE = "LGPL-2.1-only" | 87 | ./recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb: LICENSE = "LGPL-2.1-only" |
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf index 39108716..cc461a1a 100644 --- a/conf/machine/imx8mp-lpddr4-evk.conf +++ b/conf/machine/imx8mp-lpddr4-evk.conf | |||
@@ -41,6 +41,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
41 | freescale/imx8mp-evk-root.dtb \ | 41 | freescale/imx8mp-evk-root.dtb \ |
42 | freescale/imx8mp-evk-rpmsg.dtb \ | 42 | freescale/imx8mp-evk-rpmsg.dtb \ |
43 | freescale/imx8mp-evk-rpmsg-lpv.dtb \ | 43 | freescale/imx8mp-evk-rpmsg-lpv.dtb \ |
44 | freescale/imx8mp-evk-sof-pdm.dtb \ | ||
44 | freescale/imx8mp-evk-sof-wm8960.dtb \ | 45 | freescale/imx8mp-evk-sof-wm8960.dtb \ |
45 | freescale/imx8mp-evk-spdif-lb.dtb \ | 46 | freescale/imx8mp-evk-spdif-lb.dtb \ |
46 | freescale/imx8mp-evk-usdhc1-m2.dtb \ | 47 | freescale/imx8mp-evk-usdhc1-m2.dtb \ |
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf index 47cfde19..2d876b68 100644 --- a/conf/machine/imx8qm-mek.conf +++ b/conf/machine/imx8qm-mek.conf | |||
@@ -38,11 +38,17 @@ KERNEL_DEVICETREE = " \ | |||
38 | freescale/imx8qm-mek-dsi-serdes-rpmsg.dtb \ | 38 | freescale/imx8qm-mek-dsi-serdes-rpmsg.dtb \ |
39 | freescale/imx8qm-mek-enet2-tja1100.dtb \ | 39 | freescale/imx8qm-mek-enet2-tja1100.dtb \ |
40 | freescale/imx8qm-mek-hdmi.dtb \ | 40 | freescale/imx8qm-mek-hdmi.dtb \ |
41 | freescale/imx8qm-mek-hdmi-rx.dtb \ | ||
42 | freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \ | ||
43 | freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ | 41 | freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \ |
44 | freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ | 42 | freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \ |
45 | freescale/imx8qm-mek-ov5640.dtb \ | 43 | freescale/imx8qm-mek-max9286-csi0.dtb \ |
44 | freescale/imx8qm-mek-max9286-csi1.dtb \ | ||
45 | freescale/imx8qm-mek-max9286-dual.dtb \ | ||
46 | freescale/imx8qm-mek-ov5640-csi0.dtb \ | ||
47 | freescale/imx8qm-mek-ov5640-csi0-rpmsg.dtb \ | ||
48 | freescale/imx8qm-mek-ov5640-csi1.dtb \ | ||
49 | freescale/imx8qm-mek-ov5640-csi1-rpmsg.dtb \ | ||
50 | freescale/imx8qm-mek-ov5640-dual.dtb \ | ||
51 | freescale/imx8qm-mek-ov5640-dual-rpmsg.dtb \ | ||
46 | freescale/imx8qm-mek-pcie-ep.dtb \ | 52 | freescale/imx8qm-mek-pcie-ep.dtb \ |
47 | freescale/imx8qm-mek-rpmsg.dtb \ | 53 | freescale/imx8qm-mek-rpmsg.dtb \ |
48 | freescale/imx8qm-mek-sof.dtb \ | 54 | freescale/imx8qm-mek-sof.dtb \ |
@@ -50,6 +56,24 @@ KERNEL_DEVICETREE = " \ | |||
50 | freescale/imx8qm-mek-sof-wm8960.dtb \ | 56 | freescale/imx8qm-mek-sof-wm8960.dtb \ |
51 | freescale/imx8qm-mek-usd-wifi.dtb \ | 57 | freescale/imx8qm-mek-usd-wifi.dtb \ |
52 | freescale/imx8qm-mek-usdhc3-m2.dtb \ | 58 | freescale/imx8qm-mek-usdhc3-m2.dtb \ |
59 | freescale/imx8qm-mek-revd-ca53.dtb \ | ||
60 | freescale/imx8qm-mek-revd-ca72.dtb \ | ||
61 | freescale/imx8qm-mek-revd-dsi-rm67191.dtb \ | ||
62 | freescale/imx8qm-mek-revd-dsi-rm67199.dtb \ | ||
63 | freescale/imx8qm-mek-revd.dtb \ | ||
64 | freescale/imx8qm-mek-revd-enet2-tja1100.dtb \ | ||
65 | freescale/imx8qm-mek-revd-hdmi.dtb \ | ||
66 | freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel.dtb \ | ||
67 | freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel-rpmsg.dtb \ | ||
68 | freescale/imx8qm-mek-revd-ov5640-csi0.dtb \ | ||
69 | freescale/imx8qm-mek-revd-ov5640-csi1.dtb \ | ||
70 | freescale/imx8qm-mek-revd-ov5640-dual.dtb \ | ||
71 | freescale/imx8qm-mek-revd-pcie-ep.dtb \ | ||
72 | freescale/imx8qm-mek-revd-root.dtb \ | ||
73 | freescale/imx8qm-mek-revd-rpmsg.dtb \ | ||
74 | freescale/imx8qm-mek-revd-sof-wm8962.dtb \ | ||
75 | freescale/imx8qm-mek-revd-usdhc3-m2.dtb \ | ||
76 | freescale/imx8qm-mek-revd-usd-wifi.dtb \ | ||
53 | " | 77 | " |
54 | 78 | ||
55 | UBOOT_MAKE_TARGET = \ | 79 | UBOOT_MAKE_TARGET = \ |
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf index 87df30f4..c78e0780 100644 --- a/conf/machine/imx8qxp-mek.conf +++ b/conf/machine/imx8qxp-mek.conf | |||
@@ -20,6 +20,13 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
20 | freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \ | 20 | freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \ |
21 | freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ | 21 | freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \ |
22 | freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ | 22 | freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \ |
23 | freescale/${KERNEL_DEVICETREE_BASENAME}-max9286.dtb \ | ||
24 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \ | ||
25 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \ | ||
26 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual.dtb \ | ||
27 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual-rpmsg.dtb \ | ||
28 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel.dtb \ | ||
29 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel-rpmsg.dtb \ | ||
23 | freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ | 30 | freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ |
24 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof.dtb \ | 31 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof.dtb \ |
25 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ | 32 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \ |
diff --git a/conf/machine/imx8ulp-lpddr4-evk.conf b/conf/machine/imx8ulp-lpddr4-evk.conf index 273e1569..91240252 100644 --- a/conf/machine/imx8ulp-lpddr4-evk.conf +++ b/conf/machine/imx8ulp-lpddr4-evk.conf | |||
@@ -18,6 +18,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
18 | freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4m.dtb \ | 18 | freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4m.dtb \ |
19 | freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4mv2.dtb \ | 19 | freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4mv2.dtb \ |
20 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-btsco.dtb \ | 20 | freescale/${KERNEL_DEVICETREE_BASENAME}-sof-btsco.dtb \ |
21 | freescale/${KERNEL_DEVICETREE_BASENAME}-tpm.dtb \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | UBOOT_CONFIG_BASENAME = "imx8ulp_evk" | 24 | UBOOT_CONFIG_BASENAME = "imx8ulp_evk" |
diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf index 3ccd6fd7..5a4f1150 100644 --- a/conf/machine/imx93-9x9-lpddr4-qsb.conf +++ b/conf/machine/imx93-9x9-lpddr4-qsb.conf | |||
@@ -18,6 +18,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
18 | freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \ | 18 | freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \ |
19 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ | 19 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ |
20 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \ | 20 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \ |
21 | freescale/${KERNEL_DEVICETREE_BASENAME}-tianma-wvga-panel.dtb \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb" | 24 | UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb" |
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index baca3fc4..5e12548e 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -518,14 +518,14 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin" | |||
518 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" | 518 | MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp ?= "imx-gst1.0-plugin" |
519 | 519 | ||
520 | # GStreamer forked recipes | 520 | # GStreamer forked recipes |
521 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.0.imx" | 521 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.24.7.imx" |
522 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.0.imx" | 522 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.24.7.imx" |
523 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.0.imx" | 523 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx" |
524 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.0.imx" | 524 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx" |
525 | PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.0.imx" | 525 | PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp ??= "1.24.7.imx" |
526 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.0.imx" | 526 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp ??= "1.24.7.imx" |
527 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.0.imx" | 527 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx" |
528 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.0.imx" | 528 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx" |
529 | 529 | ||
530 | # GStreamer copied recipes | 530 | # GStreamer copied recipes |
531 | PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" | 531 | PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx" |
@@ -637,7 +637,7 @@ IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" | |||
637 | 637 | ||
638 | IMAGE_BOOT_FILES ?= " \ | 638 | IMAGE_BOOT_FILES ?= " \ |
639 | ${KERNEL_IMAGETYPE} \ | 639 | ${KERNEL_IMAGETYPE} \ |
640 | ${@make_dtb_boot_files(d)} \ | 640 | ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${@make_dtb_boot_files(d)}', d)} \ |
641 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \ | 641 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_BOOT_IMAGE}', '', d)} \ |
642 | " | 642 | " |
643 | 643 | ||
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc index 9eaa77c5..fc315fbc 100644 --- a/conf/machine/include/imx8x-mek.inc +++ b/conf/machine/include/imx8x-mek.inc | |||
@@ -33,8 +33,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | |||
33 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \ | 33 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \ |
34 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \ | 34 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \ |
35 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \ | 35 | freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \ |
36 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640.dtb \ | ||
37 | freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-rpmsg.dtb \ | ||
38 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ | 36 | freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ |
39 | " | 37 | " |
40 | 38 | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend index a5d3c2e2..dfedc062 100644 --- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend | |||
@@ -1,5 +1,5 @@ | |||
1 | # Only _mx8 machine do provide virtual/libgbm required for any drm* flavour | 1 | # 6 and 7 Vivante do not provide virtual/libgbm required for any drm* flavour |
2 | DRM-REMOVE:imxgpu = "drm-gl drm-gles2" | 2 | DRM-REMOVE = "" |
3 | DRM-REMOVE:imxgpu:mx8-nxp-bsp = "" | 3 | DRM-REMOVE:imxgpu:mx6-nxp-bsp = "drm-gl drm-gles2" |
4 | DRM-REMOVE:imxgpu:mx95-nxp-bsp = "" | 4 | DRM-REMOVE:imxgpu:mx7-nxp-bsp = "drm-gl drm-gles2" |
5 | PACKAGECONFIG:remove = "${DRM-REMOVE}" | 5 | PACKAGECONFIG:remove = "${DRM-REMOVE}" |
diff --git a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb index 5cf543ab..01e3a2a6 100644 --- a/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb +++ b/recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_22.04.bb | |||
@@ -6,7 +6,6 @@ inherit deploy fsl-eula-unpack | |||
6 | 6 | ||
7 | SRC_URI = "${FSL_MIRROR}/firmware-imx-8.16.bin;fsl-eula=true" | 7 | SRC_URI = "${FSL_MIRROR}/firmware-imx-8.16.bin;fsl-eula=true" |
8 | 8 | ||
9 | SRC_URI[md5sum] = "9ed2923c0eb511c7fcf37dd607944124" | ||
10 | SRC_URI[sha256sum] = "65f829a9e2597bffc58a680aaefa638122144a083633d1ae09b3aec1d9f8ab84" | 9 | SRC_URI[sha256sum] = "65f829a9e2597bffc58a680aaefa638122144a083633d1ae09b3aec1d9f8ab84" |
11 | 10 | ||
12 | S = "${WORKDIR}/firmware-imx-8.16" | 11 | S = "${WORKDIR}/firmware-imx-8.16" |
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb index c425173c..b362c4e2 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | # Copyright 2020-2023 NXP | 1 | # Copyright 2020-2024 NXP |
2 | 2 | ||
3 | SUMMARY = "Wi-Fi firmware redistributed by NXP" | 3 | SUMMARY = "Wi-Fi firmware redistributed by NXP" |
4 | DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \ | 4 | DESCRIPTION = "Additional Wi-Fi firmware redistributed by NXP. Some \ |
@@ -7,11 +7,11 @@ should be preferred." | |||
7 | 7 | ||
8 | SECTION = "kernel" | 8 | SECTION = "kernel" |
9 | LICENSE = "Proprietary" | 9 | LICENSE = "Proprietary" |
10 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a" | 10 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}" | 12 | SRC_URI = "git://github.com/nxp-imx/imx-firmware.git;protocol=https;branch=${SRCBRANCH}" |
13 | SRCBRANCH = "lf-6.6.23_2.0.0" | 13 | SRCBRANCH = "lf-6.6.52_2.2.0" |
14 | SRCREV = "7e038c6afba3118bcee91608764ac3c633bce0c4" | 14 | SRCREV = "2978f3c88d6bcc5695a7b45f1936f18d31eebfa8" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
@@ -59,6 +59,7 @@ PACKAGES =+ " \ | |||
59 | ${PN}-nxp9098-common \ | 59 | ${PN}-nxp9098-common \ |
60 | ${PN}-nxp9098-sdio \ | 60 | ${PN}-nxp9098-sdio \ |
61 | ${PN}-nxpiw416-sdio \ | 61 | ${PN}-nxpiw416-sdio \ |
62 | ${PN}-nxpiw610-sdio \ | ||
62 | ${PN}-nxpiw612-sdio \ | 63 | ${PN}-nxpiw612-sdio \ |
63 | " | 64 | " |
64 | 65 | ||
@@ -88,7 +89,7 @@ RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio" | |||
88 | FILES:${PN}-nxp8997-common = " \ | 89 | FILES:${PN}-nxp8997-common = " \ |
89 | ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \ | 90 | ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_8997.conf \ |
90 | ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \ | 91 | ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_8997.conf \ |
91 | ${nonarch_base_libdir}/firmware/nxp/uartuart8997_bt_v4.bin \ | 92 | ${nonarch_base_libdir}/firmware/nxp/uart8997_bt_v4.bin \ |
92 | " | 93 | " |
93 | RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common" | 94 | RDEPENDS:${PN}-nxp8997-common += "${PN}-nxp-common" |
94 | RPROVIDES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common" | 95 | RPROVIDES:${PN}-nxp8997-common = "linux-firmware-nxp8997-common" |
@@ -114,7 +115,7 @@ RCONFLICTS:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio" | |||
114 | FILES:${PN}-nxp9098-common = " \ | 115 | FILES:${PN}-nxp9098-common = " \ |
115 | ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \ | 116 | ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \ |
116 | ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \ | 117 | ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \ |
117 | ${nonarch_base_libdir}/firmware/nxp/uartuart9098_bt_v1.bin \ | 118 | ${nonarch_base_libdir}/firmware/nxp/uart9098_bt_v1.bin \ |
118 | " | 119 | " |
119 | RDEPENDS:${PN}-nxp9098-common += "${PN}-nxp-common" | 120 | RDEPENDS:${PN}-nxp9098-common += "${PN}-nxp-common" |
120 | RPROVIDES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common" | 121 | RPROVIDES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common" |
@@ -145,6 +146,17 @@ RPROVIDES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" | |||
145 | RREPLACES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" | 146 | RREPLACES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" |
146 | RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" | 147 | RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio" |
147 | 148 | ||
149 | FILES:${PN}-nxpiw610-sdio += " \ | ||
150 | ${nonarch_base_libdir}/firmware/nxp/sd_iw610.bin.se \ | ||
151 | ${nonarch_base_libdir}/firmware/nxp/sduart_iw610.bin.se \ | ||
152 | ${nonarch_base_libdir}/firmware/nxp/uart_iw610_bt.bin.se \ | ||
153 | ${nonarch_base_libdir}/firmware/nxp/uartspi_iw610.bin.se \ | ||
154 | " | ||
155 | RDEPENDS:${PN}-nxpiw610-sdio += "${PN}-nxp-common" | ||
156 | RPROVIDES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio" | ||
157 | RREPLACES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio" | ||
158 | RCONFLICTS:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio" | ||
159 | |||
148 | FILES:${PN}-nxpiw612-sdio = " \ | 160 | FILES:${PN}-nxpiw612-sdio = " \ |
149 | ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \ | 161 | ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_v1.bin.se \ |
150 | ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \ | 162 | ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \ |
diff --git a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb index 9778bd1c..6e6f90ca 100644 --- a/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb +++ b/recipes-bsp/firmware-imx/firmware-sof-imx_2.3.0.bb | |||
@@ -8,7 +8,6 @@ LICENSE = "BSD-3-Clause" | |||
8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444" | 8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=0f00d99239d922ffd13cabef83b33444" |
9 | 9 | ||
10 | SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz" | 10 | SRC_URI = "${FSL_MIRROR}/sof-imx-${PV}.tar.gz" |
11 | SRC_URI[md5sum] = "f7d277717b3f0dd17e8d341c1091d6b6" | ||
12 | SRC_URI[sha256sum] = "eb86c90aec92b3b376e7afca6aa5db4767b5d8868553595907ba37665329f16b" | 11 | SRC_URI[sha256sum] = "eb86c90aec92b3b376e7afca6aa5db4767b5d8868553595907ba37665329f16b" |
13 | 12 | ||
14 | S = "${WORKDIR}/sof-imx-${PV}" | 13 | S = "${WORKDIR}/sof-imx-${PV}" |
diff --git a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb index 3a7660f8..e64bc0bc 100644 --- a/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb +++ b/recipes-bsp/firmware-upower/firmware-upower_1.3.1.bb | |||
@@ -10,7 +10,6 @@ S = "${WORKDIR}/${PN}-${PV}" | |||
10 | 10 | ||
11 | inherit fsl-eula-unpack pkgconfig deploy | 11 | inherit fsl-eula-unpack pkgconfig deploy |
12 | 12 | ||
13 | SRC_URI[md5sum] = "65f28bd8ace3ce7116cb15685bfe1cd0" | ||
14 | SRC_URI[sha256sum] = "1df3a03d69feb38a450ee63abc7713d78cf6339988476e4c9f95ebbf63790f66" | 13 | SRC_URI[sha256sum] = "1df3a03d69feb38a450ee63abc7713d78cf6339988476e4c9f95ebbf63790f66" |
15 | 14 | ||
16 | do_configure[noexec] = "1" | 15 | do_configure[noexec] = "1" |
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb index 7dc2e593..c5fa2ee3 100644 --- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb +++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.15.0.bb | |||
@@ -10,7 +10,6 @@ inherit fsl-eula-unpack pkgconfig deploy | |||
10 | 10 | ||
11 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 11 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
12 | 12 | ||
13 | SRC_URI[md5sum] = "d608eb2b3d312da1dbde55b8514c1e0f" | ||
14 | SRC_URI[sha256sum] = "1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d5c0e5f" | 13 | SRC_URI[sha256sum] = "1272ac5c31a88017ef548721f3acf930a7eda6ac73aa9f41b5f0cade9d5c0e5f" |
15 | 14 | ||
16 | BOARD_TYPE ?= "mek" | 15 | BOARD_TYPE ?= "mek" |
diff --git a/recipes-bsp/imx-seco/imx-seco_5.9.4.bb b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb index 14b15da2..6e8aefdf 100644 --- a/recipes-bsp/imx-seco/imx-seco_5.9.4.bb +++ b/recipes-bsp/imx-seco/imx-seco_5.9.4.bb | |||
@@ -10,7 +10,6 @@ inherit fsl-eula-unpack use-imx-security-controller-firmware deploy | |||
10 | 10 | ||
11 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 11 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
12 | 12 | ||
13 | SRC_URI[md5sum] = "d05d6b15ad9ad0df141e1fc736f4a622" | ||
14 | SRC_URI[sha256sum] = "9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7" | 13 | SRC_URI[sha256sum] = "9b04be33814a9cbda9bbfcb6711585cf7e4ed2527793813c95230f350323cba7" |
15 | 14 | ||
16 | 15 | ||
diff --git a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb index 553f3993..fc90cdab 100644 --- a/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb +++ b/recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb | |||
@@ -11,7 +11,6 @@ PROVIDES = "virtual/imxvpu" | |||
11 | PE = "1" | 11 | PE = "1" |
12 | 12 | ||
13 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 13 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
14 | SRC_URI[md5sum] = "6d6302189a6704874375afe62a65def0" | ||
15 | SRC_URI[sha256sum] = "87cb799a57df654db29403cb74a75ca5185a1517022d3a4a16b8d69056c36127" | 14 | SRC_URI[sha256sum] = "87cb799a57df654db29403cb74a75ca5185a1517022d3a4a16b8d69056c36127" |
16 | 15 | ||
17 | inherit fsl-eula-unpack use-imx-headers | 16 | inherit fsl-eula-unpack use-imx-headers |
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb index 0ab44074..59ba1c61 100644 --- a/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.24.0.bb | |||
@@ -8,7 +8,6 @@ inherit fsl-eula-unpack | |||
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 9 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "31d716e1f40c248556e5a8e6b467ba71" | ||
12 | SRC_URI[sha256sum] = "ad3e98ee0c10f2b3e74af8923f44b8d5908e42eedbca12a702e35cee9328d8cf" | 11 | SRC_URI[sha256sum] = "ad3e98ee0c10f2b3e74af8923f44b8d5908e42eedbca12a702e35cee9328d8cf" |
13 | 12 | ||
14 | do_install() { | 13 | do_install() { |
diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index aedd01ac..2d0f2ff5 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb | |||
@@ -16,8 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ | |||
16 | PROVIDES = "jailhouse" | 16 | PROVIDES = "jailhouse" |
17 | RPROVIDES:${PN} += "jailhouse" | 17 | RPROVIDES:${PN} += "jailhouse" |
18 | 18 | ||
19 | SRCBRANCH = "lf-6.6.36_2.1.0" | 19 | SRCBRANCH = "lf-6.6.52_2.2.0" |
20 | SRCREV = "327e56941e3e96ef9a291d2decb7add21078d8de" | 20 | SRCREV = "44dd492a745cd8b8313fb6c7c03fb45a36d70e8a" |
21 | 21 | ||
22 | IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" | 22 | IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" |
23 | SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \ | 23 | SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \ |
diff --git a/recipes-extended/testfloat/testfloat_2a.bb b/recipes-extended/testfloat/testfloat_2a.bb index 60e9b864..c5ea96a5 100644 --- a/recipes-extended/testfloat/testfloat_2a.bb +++ b/recipes-extended/testfloat/testfloat_2a.bb | |||
@@ -10,9 +10,7 @@ SRC_URI:append:qoriq-ppc = " file://SoftFloat-powerpc-1.patch \ | |||
10 | file://TestFloat-powerpc-E500v2-SPE-1.patch \ | 10 | file://TestFloat-powerpc-E500v2-SPE-1.patch \ |
11 | file://Yocto-replace-COMPILE_PREFIX-gcc.patch \ | 11 | file://Yocto-replace-COMPILE_PREFIX-gcc.patch \ |
12 | " | 12 | " |
13 | SRC_URI[TestFloat.md5sum] = "4dc889319ae1e0c5381ec511f784553a" | ||
14 | SRC_URI[TestFloat.sha256sum] = "84d14aa42adefbda2ec9708b42946f7fa59f93689b042684bd027863481f8e4e" | 13 | SRC_URI[TestFloat.sha256sum] = "84d14aa42adefbda2ec9708b42946f7fa59f93689b042684bd027863481f8e4e" |
15 | SRC_URI[SoftFloat.md5sum] = "b4a58b5c941f1a2317e4c2500086e3fa" | ||
16 | SRC_URI[SoftFloat.sha256sum] = "89d14b55113a2ba8cbda7011443ba1d298d381c89d939515d56c5f18f2febf81" | 14 | SRC_URI[SoftFloat.sha256sum] = "89d14b55113a2ba8cbda7011443ba1d298d381c89d939515d56c5f18f2febf81" |
17 | 15 | ||
18 | S = "${WORKDIR}/TestFloat-2a" | 16 | S = "${WORKDIR}/TestFloat-2a" |
diff --git a/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb index 430182ae..e1d303e3 100644 --- a/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb +++ b/recipes-fsl/mcore-demos/imx-m33-demos_2.16.000.bb | |||
@@ -6,10 +6,8 @@ require imx-mcore-demos.inc | |||
6 | LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" | 6 | LIC_FILES_CHKSUM:mx8ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" |
7 | LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" | 7 | LIC_FILES_CHKSUM:mx93-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" |
8 | 8 | ||
9 | SRC_URI[imx8ulp.md5sum] = "9db44ac8ae50c2ce37072c89d54bf794" | ||
10 | SRC_URI[imx8ulp.sha256sum] = "2d1d48eb3f01d020917f42281581835a3c085233e9764ec845940c1e49ac317b" | 9 | SRC_URI[imx8ulp.sha256sum] = "2d1d48eb3f01d020917f42281581835a3c085233e9764ec845940c1e49ac317b" |
11 | 10 | ||
12 | SRC_URI[imx93.md5sum] = "293b097136b5c2c857057d1724b468ac" | ||
13 | SRC_URI[imx93.sha256sum] = "c954b9bc32cfdea9b696fa0b02f934812054e3ab445b5dd8eb7898d427e47526" | 11 | SRC_URI[imx93.sha256sum] = "c954b9bc32cfdea9b696fa0b02f934812054e3ab445b5dd8eb7898d427e47526" |
14 | 12 | ||
15 | COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx93-nxp-bsp)" | 13 | COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx93-nxp-bsp)" |
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb b/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb index fd99c637..78a837af 100644 --- a/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb +++ b/recipes-fsl/mcore-demos/imx-m4-demos_1.0.1.bb | |||
@@ -11,7 +11,6 @@ M4_SOC:mx7d-nxp-bsp = "imx7d-sabresd" | |||
11 | SRC_URI = "${FSL_MIRROR}/${M4_SOC}-m4-freertos-${PV}.bin;fsl-eula=true" | 11 | SRC_URI = "${FSL_MIRROR}/${M4_SOC}-m4-freertos-${PV}.bin;fsl-eula=true" |
12 | S = "${WORKDIR}/${M4_SOC}-m4-freertos-${PV}" | 12 | S = "${WORKDIR}/${M4_SOC}-m4-freertos-${PV}" |
13 | 13 | ||
14 | SRC_URI[md5sum] = "b05b780ff3916f4953ab58ac95233c38" | ||
15 | SRC_URI[sha256sum] = "cc00d3b936d49b2794a2a99e10129437e70caba3fd26b8379b8c50dd22f73254" | 14 | SRC_URI[sha256sum] = "cc00d3b936d49b2794a2a99e10129437e70caba3fd26b8379b8c50dd22f73254" |
16 | 15 | ||
17 | do_deploy () { | 16 | do_deploy () { |
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb index 435471c8..813b3025 100644 --- a/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb +++ b/recipes-fsl/mcore-demos/imx-m4-demos_2.16.000.bb | |||
@@ -7,13 +7,10 @@ LIC_FILES_CHKSUM:mx7ulp-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a54 | |||
7 | LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" | 7 | LIC_FILES_CHKSUM:mx8mm-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" |
8 | LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" | 8 | LIC_FILES_CHKSUM:mx8mq-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" |
9 | 9 | ||
10 | SRC_URI[imx7ulp.md5sum] = "f971b57a6787adf24bf1135b69847c65" | ||
11 | SRC_URI[imx7ulp.sha256sum] = "1fbb26f8e0a69a2e3925e07cf0cc4a13b13e3ff6321a2ba3dc39c454c82b398b" | 10 | SRC_URI[imx7ulp.sha256sum] = "1fbb26f8e0a69a2e3925e07cf0cc4a13b13e3ff6321a2ba3dc39c454c82b398b" |
12 | 11 | ||
13 | SRC_URI[imx8mm.md5sum] = "fe3d6cba7ad25f90f4cfdf22221ddd21" | ||
14 | SRC_URI[imx8mm.sha256sum] = "a335b54b797c37be05c5b4e6aeabd02099f401de907186723361d1fc25ea3f24" | 12 | SRC_URI[imx8mm.sha256sum] = "a335b54b797c37be05c5b4e6aeabd02099f401de907186723361d1fc25ea3f24" |
15 | 13 | ||
16 | SRC_URI[imx8mq.md5sum] = "e6da3b5fda929ac6989c7aa7633a9ab6" | ||
17 | SRC_URI[imx8mq.sha256sum] = "09b7195ce553dae5808afcefaf6f76c79f7122ce4dd31fabd679b768607dea25" | 14 | SRC_URI[imx8mq.sha256sum] = "09b7195ce553dae5808afcefaf6f76c79f7122ce4dd31fabd679b768607dea25" |
18 | 15 | ||
19 | COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8mm-nxp-bsp|mx8mq-nxp-bsp)" | 16 | COMPATIBLE_MACHINE = "(mx7ulp-nxp-bsp|mx8mm-nxp-bsp|mx8mq-nxp-bsp)" |
diff --git a/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb b/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb index 888fd647..0c2fe9a1 100644 --- a/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb +++ b/recipes-fsl/mcore-demos/imx-m4-demos_2.9.0.bb | |||
@@ -8,13 +8,10 @@ LIC_FILES_CHKSUM:mx8qm-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833 | |||
8 | LIC_FILES_CHKSUM:mx8qxp-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" | 8 | LIC_FILES_CHKSUM:mx8qxp-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" |
9 | LIC_FILES_CHKSUM:mx8dx-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" | 9 | LIC_FILES_CHKSUM:mx8dx-nxp-bsp = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" |
10 | 10 | ||
11 | SRC_URI[imx8dxl.md5sum] = "8850c04a8af91e2bd822cecd5ec56e12" | ||
12 | SRC_URI[imx8dxl.sha256sum] = "66ddba970712ed394de4034b362334a12caa5865a6afc1dfb5a897bb55b4fcf1" | 11 | SRC_URI[imx8dxl.sha256sum] = "66ddba970712ed394de4034b362334a12caa5865a6afc1dfb5a897bb55b4fcf1" |
13 | 12 | ||
14 | SRC_URI[imx8qm.md5sum] = "5912ca94847ee56a7e8b866b211b67d9" | ||
15 | SRC_URI[imx8qm.sha256sum] = "c695e72b0c7f609132f5990469cf950c03e137de887bd7e24d059c51a7b499be" | 13 | SRC_URI[imx8qm.sha256sum] = "c695e72b0c7f609132f5990469cf950c03e137de887bd7e24d059c51a7b499be" |
16 | 14 | ||
17 | SRC_URI[imx8qx.md5sum] = "5bc15014f59b2b11c71299fac608be5d" | ||
18 | SRC_URI[imx8qx.sha256sum] = "bbb268a30a58a86e38966122191c8aa69f427c6c1d56b0ce81e518f4d652782a" | 15 | SRC_URI[imx8qx.sha256sum] = "bbb268a30a58a86e38966122191c8aa69f427c6c1d56b0ce81e518f4d652782a" |
19 | 16 | ||
20 | COMPATIBLE_MACHINE = "(mx8dxl-nxp-bsp|mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp)" | 17 | COMPATIBLE_MACHINE = "(mx8dxl-nxp-bsp|mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp)" |
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb index fab57a7f..387d6527 100644 --- a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb +++ b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.000.bb | |||
@@ -11,16 +11,12 @@ LIC_FILES_CHKSUM:mx8mpul-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5 | |||
11 | 11 | ||
12 | LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" | 12 | LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" |
13 | 13 | ||
14 | SRC_URI[imx8mn.md5sum] = "b7e2733d8f6c9469b52b36cf6dad1c5e" | ||
15 | SRC_URI[imx8mn.sha256sum] = "ab608d621c8d74f42514799a732414184bd22f058a8a87a0ab75147a0fd5d99c" | 14 | SRC_URI[imx8mn.sha256sum] = "ab608d621c8d74f42514799a732414184bd22f058a8a87a0ab75147a0fd5d99c" |
16 | 15 | ||
17 | SRC_URI[imx8mnddr3l.md5sum] = "c99fdb271ab42390537845a6beb15cf3" | ||
18 | SRC_URI[imx8mnddr3l.sha256sum] = "9c9477db2581640395ec3bc7524f89c2c09ffd2947d9186959343a8cf764ad28" | 16 | SRC_URI[imx8mnddr3l.sha256sum] = "9c9477db2581640395ec3bc7524f89c2c09ffd2947d9186959343a8cf764ad28" |
19 | 17 | ||
20 | SRC_URI[imx8mp.md5sum] = "4260822516833e8cedec61dd5be24e3e" | ||
21 | SRC_URI[imx8mp.sha256sum] = "672af1e1d8fcc1ebd12b45c6dc4cfc7abc85ea9ebbf114d15f4bfe7540e24ea1" | 18 | SRC_URI[imx8mp.sha256sum] = "672af1e1d8fcc1ebd12b45c6dc4cfc7abc85ea9ebbf114d15f4bfe7540e24ea1" |
22 | 19 | ||
23 | SRC_URI[imx95.md5sum] = "f9576f3a4fe730c111c877344ea93427" | ||
24 | SRC_URI[imx95.sha256sum] = "8d394b62a4fbad8303acf43f9f8672e5d1c17f1af8f47d7665740272819c0cc1" | 20 | SRC_URI[imx95.sha256sum] = "8d394b62a4fbad8303acf43f9f8672e5d1c17f1af8f47d7665740272819c0cc1" |
25 | 21 | ||
26 | COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp|mx95-nxp-bsp)" | 22 | COMPATIBLE_MACHINE = "(mx8mn-nxp-bsp|mx8mnul-nxp-bsp|mx8mp-nxp-bsp|mx8mpul-nxp-bsp|mx95-nxp-bsp)" |
diff --git a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.001.bb b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.001.bb index e2030306..56ddbf80 100644 --- a/recipes-fsl/mcore-demos/imx-m7-demos_2.16.001.bb +++ b/recipes-fsl/mcore-demos/imx-m7-demos_2.16.001.bb | |||
@@ -5,7 +5,6 @@ require imx-mcore-demos.inc | |||
5 | 5 | ||
6 | LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" | 6 | LIC_FILES_CHKSUM:mx95-nxp-bsp = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" |
7 | 7 | ||
8 | SRC_URI[imx95.md5sum] = "70f4a0ab4f65beef113dd544c4b3be8c" | ||
9 | SRC_URI[imx95.sha256sum] = "0569f128e2068c509dcd4afe6689a62cdb5a4ac9f8eb1b522b2bfaac0e7d09fd" | 8 | SRC_URI[imx95.sha256sum] = "0569f128e2068c509dcd4afe6689a62cdb5a4ac9f8eb1b522b2bfaac0e7d09fd" |
10 | 9 | ||
11 | COMPATIBLE_MACHINE = "(mx95-nxp-bsp)" | 10 | COMPATIBLE_MACHINE = "(mx95-nxp-bsp)" |
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 453fdd48..5b8aaa09 100644 --- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb +++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/612" | 1 | SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/610/612" |
2 | LICENSE = "GPL-2.0-only" | 2 | LICENSE = "GPL-2.0-only" |
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77" |
4 | 4 | ||
@@ -8,10 +8,10 @@ RREPLACES:${PN} = "kernel-module-nxp89xx" | |||
8 | RPROVIDES:${PN} = "kernel-module-nxp89xx" | 8 | RPROVIDES:${PN} = "kernel-module-nxp89xx" |
9 | RCONFLICTS:${PN} = "kernel-module-nxp89xx" | 9 | RCONFLICTS:${PN} = "kernel-module-nxp89xx" |
10 | 10 | ||
11 | SRCBRANCH = "lf-6.6.23_2.0.0" | 11 | SRCBRANCH = "lf-6.6.52_2.2.0" |
12 | MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" | 12 | MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" |
13 | SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" | 13 | SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" |
14 | SRCREV = "88372772badbf30152b3ad12ae251dc567095cab" | 14 | SRCREV = "5ad19e194f49ed9447bee7864eb562618ccaf9b1" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.6.bb b/recipes-kernel/linux/linux-fslc-imx_6.6.bb index ed19bc8b..0e9a9edd 100644 --- a/recipes-kernel/linux/linux-fslc-imx_6.6.bb +++ b/recipes-kernel/linux/linux-fslc-imx_6.6.bb | |||
@@ -38,14 +38,20 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
38 | # ------------------------------------------------------------------------------ | 38 | # ------------------------------------------------------------------------------ |
39 | # 3. Critical patches (SHA(s)) | 39 | # 3. Critical patches (SHA(s)) |
40 | # ------------------------------------------------------------------------------ | 40 | # ------------------------------------------------------------------------------ |
41 | 41 | # The list includes well-known commits not yet upstreamed. Reverts address merge | |
42 | # $ git log --oneline --no-merges v6.6.34.. ^mainline/linux-6.6.y ^NXP/lf-6.6.y | 42 | # conflicts, prioritizing NXP BSP source code as the latest vendor updates. |
43 | # - a10c64e35a24 tty: vt: conmakehash: cope with abs_srctree no longer in env | 43 | # Additional commits may exist to better acommodate yocto builds. |
44 | # - 3fb57e773e55 tty: vt: conmakehash: Don't mention the full path of the input in output | 44 | # |
45 | # - d1198b88bc1b Revert "dmaengine: fsl-edma: add address for channel mux register in fsl_edma_chan" | 45 | # $ git log --oneline --no-merges v6.6.52.. ^mainline/linux-6.6.y ^NXP/lf-6.6.y |
46 | # - 717fee4a9cf7 Revert "dmaengine: fsl-edma: add i.MX8ULP edma support" | 46 | # - 93b9fc75becd nvmem: imx-ocotp-fsb-s400: BUG: Fix the word count |
47 | # - 74ef72069927 Revert "dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string" | 47 | # - 090d101928fc tty: vt: conmakehash: Don't mention the full path of the input in output |
48 | # - b54c6ea17058 Revert "dmaengine: fsl-edma: change the memory access from local into remote mode in i.MX 8QM" | 48 | # - d16eb5ced32f arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth |
49 | # - d39502c0dea9 imx:dts:imx8mm-evkb: fix the pmic name to avoid duplicated label error | ||
50 | # - 58181fb0ff67 media: imx8: select v4l2_* for mxc-mipi-csi2_yav | ||
51 | # - 930431e0d1d5 gpu: drm: cadence: select hdmi helper | ||
52 | # - da675fd29502 of: enable using OF_DYNAMIC without OF_UNITTEST | ||
53 | # - 7c5f3cbb180c arm64: dts: imx8mq: drop cpu-idle-states | ||
54 | # - a9920ce3e197 hwrng: optee: support generic crypto | ||
49 | # | 55 | # |
50 | # NOTE to upgraders: | 56 | # NOTE to upgraders: |
51 | # This recipe should NOT collect individual patches, they should be applied to | 57 | # This recipe should NOT collect individual patches, they should be applied to |
@@ -55,16 +61,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community." | |||
55 | 61 | ||
56 | require linux-imx.inc | 62 | require linux-imx.inc |
57 | 63 | ||
58 | KBRANCH = "6.6-2.1.x-imx" | 64 | KBRANCH = "6.6-2.2.x-imx" |
59 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" | 65 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" |
60 | SRCREV = "6605f549a71ef3af9c65609cba985086ac4edf2b" | 66 | SRCREV = "657504d5644f24a41822960ed31b883062ca30c9" |
61 | 67 | ||
62 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 68 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
63 | # required by kernel-yocto.bbclass. | 69 | # required by kernel-yocto.bbclass. |
64 | # | 70 | # |
65 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 71 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
66 | # should be updated once patchlevel is merged. | 72 | # should be updated once patchlevel is merged. |
67 | LINUX_VERSION = "6.6.54" | 73 | LINUX_VERSION = "6.6.69" |
68 | 74 | ||
69 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 75 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
70 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 76 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |
diff --git a/recipes-kernel/linux/linux-imx-headers_6.6.bb b/recipes-kernel/linux/linux-imx-headers_6.6.bb index 826b2189..dbf4442c 100644 --- a/recipes-kernel/linux/linux-imx-headers_6.6.bb +++ b/recipes-kernel/linux/linux-imx-headers_6.6.bb | |||
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | |||
9 | 9 | ||
10 | SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" | 10 | SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" |
11 | SRCBRANCH = "lf-6.6.y" | 11 | SRCBRANCH = "lf-6.6.y" |
12 | LOCALVERSION = "-6.6.36-2.1.0" | 12 | LOCALVERSION = "-6.6.52-2.2.0" |
13 | SRCREV = "d23d64eea5111e1607efcce1d601834fceec92cb" | 13 | SRCREV = "e0f9e2afd4cff3f02d71891244b4aa5899dfc786" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/recipes-kernel/linux/linux-imx_6.6.bb b/recipes-kernel/linux/linux-imx_6.6.bb index e7475da4..320e8a0f 100644 --- a/recipes-kernel/linux/linux-imx_6.6.bb +++ b/recipes-kernel/linux/linux-imx_6.6.bb | |||
@@ -13,8 +13,8 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU | |||
13 | require recipes-kernel/linux/linux-imx.inc | 13 | require recipes-kernel/linux/linux-imx.inc |
14 | 14 | ||
15 | SRCBRANCH = "lf-6.6.y" | 15 | SRCBRANCH = "lf-6.6.y" |
16 | LOCALVERSION = "-6.6.36-2.1.0" | 16 | LOCALVERSION = "-6.6.52-2.2.0" |
17 | SRCREV = "d23d64eea5111e1607efcce1d601834fceec92cb" | 17 | SRCREV = "e0f9e2afd4cff3f02d71891244b4aa5899dfc786" |
18 | 18 | ||
19 | SRC_URI += " \ | 19 | SRC_URI += " \ |
20 | file://0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch \ | 20 | file://0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch \ |
@@ -27,7 +27,7 @@ SRC_URI += " \ | |||
27 | # | 27 | # |
28 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 28 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
29 | # should be updated once patchlevel is merged. | 29 | # should be updated once patchlevel is merged. |
30 | LINUX_VERSION = "6.6.36" | 30 | LINUX_VERSION = "6.6.52" |
31 | 31 | ||
32 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 32 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
33 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 33 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-autovideoconvert-add-imxvideoconvert_g2d.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-autovideoconvert-add-imxvideoconvert_g2d.patch deleted file mode 100644 index d4fd8cf3..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-autovideoconvert-add-imxvideoconvert_g2d.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 784881b9bffaa768c3a1e9cb3d8eead7b4ca356a Mon Sep 17 00:00:00 2001 | ||
2 | From: Hiago De Franco <hiago.franco@toradex.com> | ||
3 | Date: Thu, 12 Sep 2024 18:44:14 +0200 | ||
4 | Subject: [PATCH] autovideoconvert: add imxvideoconvert_g2d | ||
5 | |||
6 | On i.MX8 platform, autovideoconvert defaults to CPU-based processing as | ||
7 | imxvideoconvert_g2d is not included as a listed filter, resulting in | ||
8 | poor video playback performance. | ||
9 | |||
10 | Add imxvideoconvert_g2d to improve performance by utilizing hardware | ||
11 | acceleration. | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/nxp-imx/gst-plugins-bad/pull/2] | ||
14 | Signed-off-by: Hiago De Franco <hiago.franco@toradex.com> | ||
15 | --- | ||
16 | gst/autoconvert/gstautovideoconvert.c | 7 +++++++ | ||
17 | 1 file changed, 7 insertions(+) | ||
18 | |||
19 | diff --git a/gst/autoconvert/gstautovideoconvert.c b/gst/autoconvert/gstautovideoconvert.c | ||
20 | index cf5468316cd5..b91bd1556c37 100644 | ||
21 | --- a/gst/autoconvert/gstautovideoconvert.c | ||
22 | +++ b/gst/autoconvert/gstautovideoconvert.c | ||
23 | @@ -85,6 +85,13 @@ gst_auto_video_convert_init (GstAutoVideoConvert * autovideoconvert) | ||
24 | .filters = { NULL }, | ||
25 | .rank = GST_RANK_SECONDARY, | ||
26 | }, | ||
27 | + { | ||
28 | + .first_elements = { "capsfilter caps=\"video/x-raw\"", NULL, }, | ||
29 | + .colorspace_converters = { "imxvideoconvert_g2d", NULL }, | ||
30 | + .last_elements = { NULL, }, | ||
31 | + .filters = { NULL }, | ||
32 | + .rank = GST_RANK_PRIMARY + 1, | ||
33 | + }, | ||
34 | { | ||
35 | .first_elements = { "capsfilter caps=\"video/x-raw\"", NULL, }, | ||
36 | .colorspace_converters = { "videoconvertscale", NULL }, | ||
37 | -- | ||
38 | 2.39.2 | ||
39 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb index f6d094f5..4b707875 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb | |||
@@ -178,9 +178,7 @@ FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" | |||
178 | 178 | ||
179 | DEFAULT_PREFERENCE = "-1" | 179 | DEFAULT_PREFERENCE = "-1" |
180 | 180 | ||
181 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" | 181 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770" |
182 | |||
183 | DEPENDS:append:imxgpu2d = " virtual/libg2d" | ||
184 | 182 | ||
185 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ | 183 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ |
186 | file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ | 184 | file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \ |
@@ -188,10 +186,9 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug | |||
188 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ | 186 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ |
189 | " | 187 | " |
190 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " | 188 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " |
191 | SRC_URI:append = " file://0001-autovideoconvert-add-imxvideoconvert_g2d.patch" | ||
192 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" | 189 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" |
193 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" | 190 | SRCBRANCH = "MM_04.09.02_2410_L6.6.y" |
194 | SRCREV = "7011fdfa6d60fb3ee1dc8545f675cfdb519203cd" | 191 | SRCREV = "bba296b75dfb3e7ae4c836255edbd2b3c085c269" |
195 | 192 | ||
196 | S = "${WORKDIR}/git" | 193 | S = "${WORKDIR}/git" |
197 | 194 | ||
@@ -214,13 +211,6 @@ PACKAGECONFIG_G2D:imxgpu2d ??= "g2d" | |||
214 | PACKAGECONFIG[g2d] = ",,virtual/libg2d" | 211 | PACKAGECONFIG[g2d] = ",,virtual/libg2d" |
215 | PACKAGECONFIG[tinycompress] = "-Dtinycompress=enabled,-Dtinycompress=disabled,tinycompress" | 212 | PACKAGECONFIG[tinycompress] = "-Dtinycompress=enabled,-Dtinycompress=disabled,tinycompress" |
216 | 213 | ||
217 | # GCC-14 otherwise errors out | ||
218 | CFLAGS += " \ | ||
219 | -Wno-error=implicit-function-declaration \ | ||
220 | -Wno-error=incompatible-pointer-types \ | ||
221 | -Wno-error=return-mismatch \ | ||
222 | -Wno-error=int-conversion \ | ||
223 | " | ||
224 | EXTRA_OEMESON += " \ | 214 | EXTRA_OEMESON += " \ |
225 | -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \ | 215 | -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \ |
226 | " | 216 | " |
@@ -229,8 +219,9 @@ EXTRA_OEMESON:remove = " \ | |||
229 | -Dkate=disabled \ | 219 | -Dkate=disabled \ |
230 | " | 220 | " |
231 | 221 | ||
232 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | ||
233 | # it uses nested functions sadly, in ext/wayland/gstwaylandsink.c for GST_ELEMENT_REGISTER_DEFINE | 222 | # it uses nested functions sadly, in ext/wayland/gstwaylandsink.c for GST_ELEMENT_REGISTER_DEFINE |
234 | # | 223 | # |
235 | TOOLCHAIN = "gcc" | 224 | TOOLCHAIN = "gcc" |
225 | |||
226 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | ||
236 | ########### End of i.MX overrides ######### | 227 | ########### End of i.MX overrides ######### |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb index 6e7bc20e..c15457ca 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb | |||
@@ -118,8 +118,8 @@ SRC_URI:remove = " \ | |||
118 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " | 118 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " |
119 | 119 | ||
120 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" | 120 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" |
121 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" | 121 | SRCBRANCH = "MM_04.09.02_2410_L6.6.y" |
122 | SRCREV = "97b1a45e945d3784790cafd2fcc4f6cb16e739d7" | 122 | SRCREV = "031d262e65333e58b2ce01aaf47ab1012f93b21e" |
123 | 123 | ||
124 | S = "${WORKDIR}/git" | 124 | S = "${WORKDIR}/git" |
125 | 125 | ||
@@ -135,8 +135,6 @@ PACKAGECONFIG_G2D:imxgpu2d ??= "g2d" | |||
135 | PACKAGECONFIG[g2d] = ",,virtual/libg2d" | 135 | PACKAGECONFIG[g2d] = ",,virtual/libg2d" |
136 | PACKAGECONFIG[viv-fb] = ",,virtual/libgles2" | 136 | PACKAGECONFIG[viv-fb] = ",,virtual/libgles2" |
137 | 137 | ||
138 | # GCC-14 otherwise errors out | ||
139 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
140 | EXTRA_OEMESON += "-Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}"" | 138 | EXTRA_OEMESON += "-Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}"" |
141 | 139 | ||
142 | # links with imx-gpu libs which are pre-built for glibc | 140 | # links with imx-gpu libs which are pre-built for glibc |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend index a834192e..528d7e1a 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend | |||
@@ -13,5 +13,5 @@ PACKAGECONFIG_GL:use-mainline-bsp = \ | |||
13 | # does not depend on the viv-fb feature. It used to, but that was actually a bug | 13 | # does not depend on the viv-fb feature. It used to, but that was actually a bug |
14 | # which was fixed in GStreamer 1.22.5. Since then, the direct texture support is | 14 | # which was fixed in GStreamer 1.22.5. Since then, the direct texture support is |
15 | # detected by Meson by checking for direct texture symbols like "glTexDirectVIV".) | 15 | # detected by Meson by checking for direct texture symbols like "glTexDirectVIV".) |
16 | PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb " | 16 | PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb" |
17 | PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb " | 17 | PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb index 67dc139f..5dd71743 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb | |||
@@ -94,11 +94,11 @@ FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" | |||
94 | DEFAULT_PREFERENCE = "-1" | 94 | DEFAULT_PREFERENCE = "-1" |
95 | 95 | ||
96 | LIC_FILES_CHKSUM = " \ | 96 | LIC_FILES_CHKSUM = " \ |
97 | file://LICENSE.txt;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | 97 | file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \ |
98 | file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \ | 98 | file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \ |
99 | " | 99 | " |
100 | # Enable pulsesink in gstreamer | 100 | # Enable pulsesink in gstreamer |
101 | PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" | 101 | PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', ' pulseaudio', '', d)}" |
102 | 102 | ||
103 | # fb implementation of v4l2 uses libdrm | 103 | # fb implementation of v4l2 uses libdrm |
104 | DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}" | 104 | DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}" |
@@ -111,20 +111,9 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu | |||
111 | 111 | ||
112 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " | 112 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " |
113 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" | 113 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" |
114 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" | 114 | SRCBRANCH = "MM_04.09.02_2410_L6.6.y" |
115 | SRCREV = "d8727edd56536a5c39de7905f073fce61896c0af" | 115 | SRCREV = "33b2732b873758a302064818b35dcad41b5bbc14" |
116 | 116 | ||
117 | # set 32bit compile timer for 32-bit platform | ||
118 | GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = "" | ||
119 | GLIBC_64BIT_TIME_FLAGS:mx7-nxp-bsp = "" | ||
120 | INSANE_SKIP:mx6-nxp-bsp:append = " 32bit-time" | ||
121 | INSANE_SKIP:mx7-nxp-bsp:append = " 32bit-time" | ||
122 | |||
123 | # GCC-14 otherwise errors out | ||
124 | CFLAGS += " \ | ||
125 | -Wno-error=implicit-function-declaration \ | ||
126 | -Wno-error=incompatible-pointer-types \ | ||
127 | " | ||
128 | S = "${WORKDIR}/git" | 117 | S = "${WORKDIR}/git" |
129 | 118 | ||
130 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | 119 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch deleted file mode 100644 index 1b9278db..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 559e1dd850b2b9eb3a415aa43e932e5e48f605cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | ||
3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 | ||
4 | Subject: [PATCH] tests: respect the idententaion used in meson | ||
5 | |||
6 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | ||
7 | |||
8 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
9 | |||
10 | --- | ||
11 | tests/check/meson.build | 10 +++++----- | ||
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/tests/check/meson.build b/tests/check/meson.build | ||
15 | index 9787b0a..16caac7 100644 | ||
16 | --- a/tests/check/meson.build | ||
17 | +++ b/tests/check/meson.build | ||
18 | @@ -145,11 +145,11 @@ foreach t : core_tests | ||
19 | |||
20 | if not skip_test | ||
21 | exe = executable(test_name, fname, | ||
22 | - c_args : gst_c_args + test_defines, | ||
23 | - cpp_args : gst_c_args + test_defines, | ||
24 | - include_directories : [configinc], | ||
25 | - link_with : link_with_libs, | ||
26 | - dependencies : gst_deps + test_deps, | ||
27 | + c_args : gst_c_args + test_defines, | ||
28 | + cpp_args : gst_c_args + test_defines, | ||
29 | + include_directories : [configinc], | ||
30 | + link_with : link_with_libs, | ||
31 | + dependencies : gst_deps + test_deps, | ||
32 | ) | ||
33 | |||
34 | env = environment() | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch deleted file mode 100644 index 456f0762..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +++ /dev/null | |||
@@ -1,109 +0,0 @@ | |||
1 | From 330e15374bb30ac29ee72c4b3de79c17b1157112 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | ||
3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 | ||
4 | Subject: [PATCH] tests: add support for install the tests | ||
5 | |||
6 | This will provide to run the tests using the gnome-desktop-testing [1] | ||
7 | |||
8 | [1] https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests | ||
9 | |||
10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | ||
11 | |||
12 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
13 | |||
14 | --- | ||
15 | meson.build | 4 ++++ | ||
16 | meson_options.txt | 1 + | ||
17 | tests/check/meson.build | 21 ++++++++++++++++++++- | ||
18 | tests/check/template.test.in | 3 +++ | ||
19 | 4 files changed, 28 insertions(+), 1 deletion(-) | ||
20 | create mode 100644 tests/check/template.test.in | ||
21 | |||
22 | diff --git a/meson.build b/meson.build | ||
23 | index 540d6d290e10..0267f22a79ea 100644 | ||
24 | --- a/meson.build | ||
25 | +++ b/meson.build | ||
26 | @@ -624,6 +624,10 @@ if bashcomp_dep.found() | ||
27 | endif | ||
28 | endif | ||
29 | |||
30 | +installed_tests_enabled = get_option('installed_tests') | ||
31 | +installed_tests_metadir = join_paths(datadir, 'installed-tests', meson.project_name()) | ||
32 | +installed_tests_execdir = join_paths(libexecdir, 'installed-tests', meson.project_name()) | ||
33 | + | ||
34 | plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') | ||
35 | |||
36 | pkgconfig = import('pkgconfig') | ||
37 | diff --git a/meson_options.txt b/meson_options.txt | ||
38 | index 340fb5801d02..5b87f68e8d7f 100644 | ||
39 | --- a/meson_options.txt | ||
40 | +++ b/meson_options.txt | ||
41 | @@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso | ||
42 | option('memory-alignment', type: 'combo', | ||
43 | choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], | ||
44 | value: 'malloc') | ||
45 | +option('installed_tests', type : 'boolean', value : false, description : 'Enable installed tests') | ||
46 | |||
47 | # Feature options | ||
48 | option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') | ||
49 | diff --git a/tests/check/meson.build b/tests/check/meson.build | ||
50 | index e9501feb2af5..fd5a99611e3d 100644 | ||
51 | --- a/tests/check/meson.build | ||
52 | +++ b/tests/check/meson.build | ||
53 | @@ -125,10 +125,16 @@ test_defines = [ | ||
54 | '-UG_DISABLE_ASSERT', | ||
55 | '-UG_DISABLE_CAST_CHECKS', | ||
56 | '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"', | ||
57 | - '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"', | ||
58 | '-DGST_DISABLE_DEPRECATED', | ||
59 | ] | ||
60 | |||
61 | +testfile = meson.current_source_dir() + '/meson.build' | ||
62 | +if installed_tests_enabled | ||
63 | + install_data(testfile, install_dir : installed_tests_metadir, rename : 'testfile') | ||
64 | + testfile = installed_tests_metadir + '/testfile' | ||
65 | +endif | ||
66 | +test_defines += '-DTESTFILE="@0@"'.format(testfile) | ||
67 | + | ||
68 | # sanity checking | ||
69 | if get_option('check').disabled() | ||
70 | if get_option('tests').enabled() | ||
71 | @@ -151,6 +157,8 @@ foreach t : core_tests | ||
72 | include_directories : [configinc], | ||
73 | link_with : link_with_libs, | ||
74 | dependencies : gst_deps + test_deps, | ||
75 | + install_dir: installed_tests_execdir, | ||
76 | + install: installed_tests_enabled, | ||
77 | ) | ||
78 | |||
79 | env = environment() | ||
80 | @@ -161,6 +169,17 @@ foreach t : core_tests | ||
81 | env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) | ||
82 | env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') | ||
83 | env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') | ||
84 | + if installed_tests_enabled | ||
85 | + test_conf = configuration_data() | ||
86 | + test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) | ||
87 | + test_conf.set('program', test_name) | ||
88 | + configure_file( | ||
89 | + input: 'template.test.in', | ||
90 | + output: test_name + '.test', | ||
91 | + install_dir: installed_tests_metadir, | ||
92 | + configuration: test_conf | ||
93 | + ) | ||
94 | + endif | ||
95 | |||
96 | test(test_name, exe, env: env, timeout : 3 * 60) | ||
97 | endif | ||
98 | diff --git a/tests/check/template.test.in b/tests/check/template.test.in | ||
99 | new file mode 100644 | ||
100 | index 000000000000..f701627f87a6 | ||
101 | --- /dev/null | ||
102 | +++ b/tests/check/template.test.in | ||
103 | @@ -0,0 +1,3 @@ | ||
104 | +[Test] | ||
105 | +Type=session | ||
106 | +Exec=@installed_tests_dir@/@program@ | ||
107 | -- | ||
108 | 2.39.2 | ||
109 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch deleted file mode 100644 index 83f3870c..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 1f13b802bdb1c1e414c70f770dc164c80e0dcd57 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | ||
3 | Date: Sat, 24 Apr 2021 10:34:47 +0100 | ||
4 | Subject: [PATCH 3/4] tests: use a dictionaries for environment | ||
5 | |||
6 | meson environment() can't be passed to configure_file and it is needed for installed_tests, | ||
7 | use a dictionary as this is simplest solution to install the environment. | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | ||
10 | |||
11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
12 | --- | ||
13 | tests/check/meson.build | 22 ++++++++++++++-------- | ||
14 | 1 file changed, 14 insertions(+), 8 deletions(-) | ||
15 | |||
16 | diff --git a/tests/check/meson.build b/tests/check/meson.build | ||
17 | index fd5a99611e3d..330abaaeadd5 100644 | ||
18 | --- a/tests/check/meson.build | ||
19 | +++ b/tests/check/meson.build | ||
20 | @@ -161,14 +161,20 @@ foreach t : core_tests | ||
21 | install: installed_tests_enabled, | ||
22 | ) | ||
23 | |||
24 | - env = environment() | ||
25 | - env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root()) | ||
26 | - env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') | ||
27 | - env.set('GST_STATE_IGNORE_ELEMENTS', '') | ||
28 | - env.set('CK_DEFAULT_TIMEOUT', '20') | ||
29 | - env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) | ||
30 | - env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') | ||
31 | - env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') | ||
32 | + # meson environment object can't be passed to configure_file and | ||
33 | + # installed tests uses configure_file to install the environment. | ||
34 | + # use a dictionary as this is the simplest solution | ||
35 | + # to install the environment. | ||
36 | + env = { | ||
37 | + 'GST_PLUGIN_PATH_1_0': meson.project_build_root(), | ||
38 | + 'GST_PLUGIN_SYSTEM_PATH_1_0': '', | ||
39 | + 'GST_STATE_IGNORE_ELEMENTS': '', | ||
40 | + 'CK_DEFAULT_TIMEOUT': '20', | ||
41 | + 'GST_REGISTRY': '@0@/@1@.registry'.format(meson.current_build_dir(), test_name), | ||
42 | + 'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner', | ||
43 | + 'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer', | ||
44 | + } | ||
45 | + | ||
46 | if installed_tests_enabled | ||
47 | test_conf = configuration_data() | ||
48 | test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) | ||
49 | -- | ||
50 | 2.39.2 | ||
51 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch deleted file mode 100644 index 0a312389..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | From 616c489d4ff1e7ed878bc3760180ba994fbd1974 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | ||
3 | Date: Sun, 2 May 2021 01:58:01 +0100 | ||
4 | Subject: [PATCH 4/4] tests: add helper script to run the installed_tests | ||
5 | |||
6 | - this is a bash script that will run the installed_tests | ||
7 | with some of the environment variables used in the meson | ||
8 | testing framework. | ||
9 | |||
10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | ||
11 | |||
12 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
13 | --- | ||
14 | tests/check/meson.build | 17 +++++++++++++++++ | ||
15 | tests/check/template.sh.in | 9 +++++++++ | ||
16 | tests/check/template.test.in | 2 +- | ||
17 | 3 files changed, 27 insertions(+), 1 deletion(-) | ||
18 | create mode 100644 tests/check/template.sh.in | ||
19 | |||
20 | diff --git a/tests/check/meson.build b/tests/check/meson.build | ||
21 | index 330abaaeadd5..5d383b14dc29 100644 | ||
22 | --- a/tests/check/meson.build | ||
23 | +++ b/tests/check/meson.build | ||
24 | @@ -185,6 +185,23 @@ foreach t : core_tests | ||
25 | install_dir: installed_tests_metadir, | ||
26 | configuration: test_conf | ||
27 | ) | ||
28 | + | ||
29 | + # All the tests will be deployed on the target machine and | ||
30 | + # we use the home folder ~ for the registry which will then expand at runtime. | ||
31 | + # Using the /tmp/gstreamer-1.0/@0@.registry can be problematic as it mostly | ||
32 | + # is mounted using tmpfs and if the machine crash from some reason we can lost the registry | ||
33 | + # that is useful for debug propose of the tests itself. | ||
34 | + env += {'GST_REGISTRY': '~/.cache/gstreamer-1.0/@0@.registry'.format(test_name)} | ||
35 | + | ||
36 | + # Set the full path for the test it self. | ||
37 | + env += {'TEST': '@0@/@1@'.format(join_paths(prefix, installed_tests_execdir), test_name)} | ||
38 | + | ||
39 | + configure_file( | ||
40 | + input : 'template.sh.in', | ||
41 | + output: test_name + '.sh', | ||
42 | + install_dir: installed_tests_execdir, | ||
43 | + configuration : env, | ||
44 | + ) | ||
45 | endif | ||
46 | |||
47 | test(test_name, exe, env: env, timeout : 3 * 60) | ||
48 | diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in | ||
49 | new file mode 100644 | ||
50 | index 000000000000..cf7d31b0ea5f | ||
51 | --- /dev/null | ||
52 | +++ b/tests/check/template.sh.in | ||
53 | @@ -0,0 +1,9 @@ | ||
54 | +#!/bin/sh | ||
55 | + | ||
56 | +set -ax | ||
57 | + | ||
58 | +CK_DEFAULT_TIMEOUT="@CK_DEFAULT_TIMEOUT@" | ||
59 | +GST_PLUGIN_LOADING_WHITELIST="@GST_PLUGIN_LOADING_WHITELIST@" | ||
60 | +GST_REGISTRY=@GST_REGISTRY@ | ||
61 | +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" | ||
62 | +exec @TEST@ | ||
63 | diff --git a/tests/check/template.test.in b/tests/check/template.test.in | ||
64 | index f701627f87a6..b74ef6ad732a 100644 | ||
65 | --- a/tests/check/template.test.in | ||
66 | +++ b/tests/check/template.test.in | ||
67 | @@ -1,3 +1,3 @@ | ||
68 | [Test] | ||
69 | Type=session | ||
70 | -Exec=@installed_tests_dir@/@program@ | ||
71 | +Exec=@installed_tests_dir@/@program@.sh | ||
72 | -- | ||
73 | 2.39.2 | ||
74 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb index 43cb6a4a..51a12f30 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.7.imx.bb | |||
@@ -26,8 +26,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x | |||
26 | file://run-ptest \ | 26 | file://run-ptest \ |
27 | file://0001-tests-respect-the-idententaion-used-in-meson.patch \ | 27 | file://0001-tests-respect-the-idententaion-used-in-meson.patch \ |
28 | file://0002-tests-add-support-for-install-the-tests.patch \ | 28 | file://0002-tests-add-support-for-install-the-tests.patch \ |
29 | file://0003-tests-use-a-dictionaries-for-environment.patch \ | 29 | file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ |
30 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ | 30 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ |
31 | " | 31 | " |
32 | SRC_URI[sha256sum] = "4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61" | 32 | SRC_URI[sha256sum] = "4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61" |
33 | 33 | ||
@@ -92,14 +92,21 @@ LIC_FILES_CHKSUM = " \ | |||
92 | " | 92 | " |
93 | 93 | ||
94 | # Use i.MX fork of GST for customizations | 94 | # Use i.MX fork of GST for customizations |
95 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" | 95 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ |
96 | file://0001-tests-respect-the-idententaion-used-in-meson.patch \ | ||
97 | file://0002-tests-add-support-for-install-the-tests.patch \ | ||
98 | file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ | ||
99 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ | ||
100 | " | ||
96 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " | 101 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " |
97 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" | 102 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" |
98 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" | 103 | SRCBRANCH = "MM_04.09.02_2410_L6.6.y" |
99 | SRCREV = "eb286c0766a4fbbae70c8e9dda074f5a90e52e42" | 104 | SRCREV = "1a8f23da16cd224574ab2386803149c76f2cb628" |
100 | 105 | ||
101 | S = "${WORKDIR}/git" | 106 | S = "${WORKDIR}/git" |
102 | 107 | ||
108 | PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled" | ||
109 | |||
103 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | 110 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
104 | 111 | ||
105 | ########### End of i.MX overrides ######### | 112 | ########### End of i.MX overrides ######### |
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb index e5898077..9ab20404 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb | |||
@@ -34,11 +34,11 @@ RREPLACES:${PN} = "gst1.0-fsl-plugin" | |||
34 | RPROVIDES:${PN} = "gst1.0-fsl-plugin" | 34 | RPROVIDES:${PN} = "gst1.0-fsl-plugin" |
35 | RCONFLICTS:${PN} = "gst1.0-fsl-plugin" | 35 | RCONFLICTS:${PN} = "gst1.0-fsl-plugin" |
36 | 36 | ||
37 | PV = "4.9.1+git${SRCPV}" | 37 | PV = "4.9.2+git${SRCPV}" |
38 | 38 | ||
39 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" | 39 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" |
40 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" | 40 | SRCBRANCH = "MM_04.09.02_2410_L6.6.y" |
41 | SRCREV = "87135d5f084b6c61efa6671cddc3a5509ab11640" | 41 | SRCREV = "ef9c1a080e739e6f0be878148d9f4a050dc83bec" |
42 | 42 | ||
43 | S = "${WORKDIR}/git" | 43 | S = "${WORKDIR}/git" |
44 | 44 | ||
@@ -54,15 +54,6 @@ PLATFORM:mx7ulp-nxp-bsp= "MX7ULP" | |||
54 | PLATFORM:mx8-nxp-bsp = "MX8" | 54 | PLATFORM:mx8-nxp-bsp = "MX8" |
55 | PLATFORM:mx9-nxp-bsp = "MX9" | 55 | PLATFORM:mx9-nxp-bsp = "MX9" |
56 | 56 | ||
57 | CFLAGS:append:toolchain-clang = " -Wno-implicit-int -Wno-int-conversion -Wno-incompatible-function-pointer-types" | ||
58 | # GCC-14 otherwise errors out | ||
59 | CFLAGS += " \ | ||
60 | -Wno-error=int-conversion \ | ||
61 | -Wno-error=incompatible-pointer-types \ | ||
62 | -Wno-error=return-mismatch \ | ||
63 | -Wno-error=implicit-function-declaration \ | ||
64 | " | ||
65 | |||
66 | # Todo add a mechanism to map possible build targets | 57 | # Todo add a mechanism to map possible build targets |
67 | EXTRA_OEMESON = "-Dplatform=${PLATFORM} \ | 58 | EXTRA_OEMESON = "-Dplatform=${PLATFORM} \ |
68 | -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \ | 59 | -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \ |
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.9.0.bb b/recipes-multimedia/imx-codec/imx-codec_4.9.0.bb index 2357d204..c2386efc 100644 --- a/recipes-multimedia/imx-codec/imx-codec_4.9.0.bb +++ b/recipes-multimedia/imx-codec/imx-codec_4.9.0.bb | |||
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" | |||
11 | PROVIDES += "libfslcodec" | 11 | PROVIDES += "libfslcodec" |
12 | 12 | ||
13 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 13 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
14 | SRC_URI[md5sum] = "2208aa871e51aacf1910c59c24694572" | ||
15 | SRC_URI[sha256sum] = "1a41a3cad9e0f4baa904fcec896105d3474e18d13f169dad1172d5691fc11c9a" | 14 | SRC_URI[sha256sum] = "1a41a3cad9e0f4baa904fcec896105d3474e18d13f169dad1172d5691fc11c9a" |
16 | 15 | ||
17 | inherit fsl-eula-unpack autotools pkgconfig | 16 | inherit fsl-eula-unpack autotools pkgconfig |
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb index 87cc0b30..d9986456 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.8.bb | |||
@@ -8,7 +8,6 @@ inherit fsl-eula-unpack autotools pkgconfig | |||
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "4250b61f23f49de9500ea8208f6e2be9" | ||
12 | SRC_URI[sha256sum] = "fa30f3e1b13e570d7c6f0a5f335c11fc3c6336a266fd3a4941e27c4c2a5b13d3" | 11 | SRC_URI[sha256sum] = "fa30f3e1b13e570d7c6f0a5f335c11fc3c6336a266fd3a4941e27c4c2a5b13d3" |
13 | 12 | ||
14 | EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp" | 13 | EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp" |
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb index d260c816..e1cf0877 100644 --- a/recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb +++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.8.bb | |||
@@ -9,7 +9,6 @@ inherit fsl-eula-unpack autotools pkgconfig | |||
9 | 9 | ||
10 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 10 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
11 | 11 | ||
12 | SRC_URI[md5sum] = "6699e619f941cfa2e2b99cc2a99b7575" | ||
13 | SRC_URI[sha256sum] = "5d42c8f39fb36bcc48e9f0c4caffd125b89c257fa8eccb3b61608bc690a16462" | 12 | SRC_URI[sha256sum] = "5d42c8f39fb36bcc48e9f0c4caffd125b89c257fa8eccb3b61608bc690a16462" |
14 | 13 | ||
15 | EXTRA_OECONF = " \ | 14 | EXTRA_OECONF = " \ |
diff --git a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb index 48be837a..9655b1f7 100644 --- a/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb +++ b/recipes-multimedia/imx-dspc-asrc/imx-dspc-asrc_1.0.1.bb | |||
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=72c0f70181bb6e83eee6aab8de12a9f3" | |||
6 | 6 | ||
7 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 7 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
8 | 8 | ||
9 | SRC_URI[md5sum] = "d46005ee29ca603caa2e1b1e82953ff1" | ||
10 | SRC_URI[sha256sum] = "e79cbf4788a86a0068bbe80c37317e3332ae76e3d5c3ff2eabd71f03121fab6a" | 9 | SRC_URI[sha256sum] = "e79cbf4788a86a0068bbe80c37317e3332ae76e3d5c3ff2eabd71f03121fab6a" |
11 | 10 | ||
12 | inherit fsl-eula-unpack autotools pkgconfig | 11 | inherit fsl-eula-unpack autotools pkgconfig |
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.5.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.5.0.bb index 890a25b4..6b9ad815 100644 --- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.5.0.bb +++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.5.0.bb | |||
@@ -8,7 +8,6 @@ DEPENDS = "virtual/opencl-icd" | |||
8 | SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" | 8 | SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" |
9 | IMX_SRCREV_ABBREV = "f2c3930" | 9 | IMX_SRCREV_ABBREV = "f2c3930" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "c57b978d29bf136be3523676ad088b07" | ||
12 | SRC_URI[sha256sum] = "eb3df72a7e1d16ec1660978cf36b7818b8ac7c7defe3222ae4bb7dabd4a5f4cc" | 11 | SRC_URI[sha256sum] = "eb3df72a7e1d16ec1660978cf36b7818b8ac7c7defe3222ae4bb7dabd4a5f4cc" |
13 | 12 | ||
14 | S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" | 13 | S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" |
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.9.1.bb b/recipes-multimedia/imx-parser/imx-parser_4.9.1.bb index 4094809f..a4bb2333 100644 --- a/recipes-multimedia/imx-parser/imx-parser_4.9.1.bb +++ b/recipes-multimedia/imx-parser/imx-parser_4.9.1.bb | |||
@@ -17,7 +17,6 @@ SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" | |||
17 | IMX_SRCREV_ABBREV = "5d91190" | 17 | IMX_SRCREV_ABBREV = "5d91190" |
18 | S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" | 18 | S = "${WORKDIR}/${BP}-${IMX_SRCREV_ABBREV}" |
19 | 19 | ||
20 | SRC_URI[md5sum] = "086773073ed8fba17eab80b35a740a46" | ||
21 | SRC_URI[sha256sum] = "087badea414540d1b9403be1a0c7fc91ac42a61f0374857972cd06d8c392ddec" | 20 | SRC_URI[sha256sum] = "087badea414540d1b9403be1a0c7fc91ac42a61f0374857972cd06d8c392ddec" |
22 | 21 | ||
23 | inherit fsl-eula-unpack autotools pkgconfig | 22 | inherit fsl-eula-unpack autotools pkgconfig |
diff --git a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb index 2b62b244..68919ac8 100644 --- a/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb +++ b/recipes-multimedia/imx-sw-pdm/imx-sw-pdm_1.0.3.bb | |||
@@ -6,7 +6,6 @@ SECTION = "multimedia" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657" |
7 | 7 | ||
8 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 8 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
9 | SRC_URI[md5sum] = "cbd5af6e9019db789c03c2d05a8bb444" | ||
10 | SRC_URI[sha256sum] = "f778a7b785fc500df5573f5b810a190ddc561267b47ca54b9ddf4ae12571cfe3" | 9 | SRC_URI[sha256sum] = "f778a7b785fc500df5573f5b810a190ddc561267b47ca54b9ddf4ae12571cfe3" |
11 | 10 | ||
12 | inherit fsl-eula-unpack autotools pkgconfig | 11 | inherit fsl-eula-unpack autotools pkgconfig |