diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-11-09 10:11:47 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-17 15:24:29 +0000 |
| commit | f1324787acb724cb050ce3cdd72bad2057152318 (patch) | |
| tree | 8482914c2fc0e2d14c32050abec7e834d54b5aa9 | |
| parent | cbb18566cc13fbc1514015f9c4506b63e8f71c00 (diff) | |
fsl, toradex: update meta layers
- Update meta-freescale & -freescale-3rdparty layers to
the latest revisions in hardknott branch
- Update meta-toradex-nxp & -toradex-bsp-common layers
to "5.4.1" tagged revisions
Change-Id: I11600f7c234d8c0250430bdec60ad167b2b8e65b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit c8d60f0badc220c8a0f426755cbd32bb6c9cef92)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt-distro/conf/distro/include/fsl.inc | 15 | ||||
| -rw-r--r-- | scripts/manifest.xml | 8 |
2 files changed, 12 insertions, 11 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc index 1aa049be..7439b2f3 100644 --- a/meta-boot2qt-distro/conf/distro/include/fsl.inc +++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc @@ -53,12 +53,13 @@ QBSP_IMAGE_CONTENT += "\ QBSP_LICENSE_FILE ?= "${FSL_EULA_FILE}" QBSP_LICENSE_NAME ?= "NXP Semiconductors Software License Agreement" -# Use gstreamer 1.16 from meta-freescale -PREFERRED_VERSION_gstreamer1.0:use-nxp-bsp ?= "1.16.2.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:use-nxp-bsp ?= "1.16.2.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:use-nxp-bsp ?= "1.16.3.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-nxp-bsp ?= "1.16.3.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:use-nxp-bsp ?= "1.16.0" -PREFERRED_VERSION_gstreamer1.0-libav:use-nxp-bsp ?= "1.16.0" +# Use gstreamer from meta-freescale +PREFERRED_VERSION_gstreamer1.0:use-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:use-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:use-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly:use-nxp-bsp ?= "1.18.0" +PREFERRED_VERSION_gstreamer1.0-libav:use-nxp-bsp ?= "1.18.0" +PREFERRED_VERSION_gstreamer1.0-rtsp-server:use-nxp-bsp ?= "1.18.0" MACHINE_GSTREAMER_1_0_PLUGIN:append:imxgpu = " imx-gst1.0-plugin" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 161c5a04..1c3fb0e2 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -45,12 +45,12 @@ fetch="https://github.com/Freescale"/> <project name="meta-freescale" remote="freescale" - revision="25e9cbddbd32802634bafef62ba08da9821c604d" + revision="3158e7f2b505074dec80307ad3db7e9d51b08fab" upstream="hardknott" path="sources/meta-freescale"/> <project name="meta-freescale-3rdparty" remote="freescale" - revision="7ca4269e9710fd9a8e6430e89e06bf5dfb33e421" + revision="f8150f3b37cb83cba1f9e2378e57bb63e02d4610" upstream="hardknott" path="sources/meta-freescale-3rdparty"/> @@ -92,12 +92,12 @@ fetch="git://git.toradex.com"/> <project name="meta-toradex-bsp-common" remote="toradex" - revision="9f07b468d6cecb6fcda469866c305d37fb20f230" + revision="789e231008c7fd1ca2b2535ea0ac1ee3c29f3233" upstream="dunfell-5.x.y" path="sources/meta-toradex-bsp-common"/> <project name="meta-toradex-nxp" remote="toradex" - revision="91233079b4167fe0be7e1f37af67c261ef9afb78" + revision="c2de495bfbd1ce09f06e41ed0feb9f7041b8c65c" upstream="dunfell-5.x.y" path="sources/meta-toradex-nxp"/> |