summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/imx93-14x14-lpddr4x-evk.conf2
-rw-r--r--recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb4
-rw-r--r--recipes-multimedia/alsa/alsa-lib_%.bbappend3
-rw-r--r--recipes-multimedia/alsa/imx-alsa-plugins_git.bb6
-rw-r--r--recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb10
5 files changed, 13 insertions, 12 deletions
diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf
index 97559104..61aba723 100644
--- a/conf/machine/imx93-14x14-lpddr4x-evk.conf
+++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf
@@ -13,6 +13,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
13 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-serdes.dtb \ 13 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-serdes.dtb \
14 freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \ 14 freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
15 freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \ 15 freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
16 freescale/${KERNEL_DEVICETREE_BASENAME}-lvds-it6263.dtb \
17 freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
16 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \ 18 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
17 freescale/${KERNEL_DEVICETREE_BASENAME}-sja1105.dtb \ 19 freescale/${KERNEL_DEVICETREE_BASENAME}-sja1105.dtb \
18 freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \ 20 freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index e713336e..3e5f3d48 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -111,7 +111,7 @@ RCONFLICTS:${PN}-nxp8997-pcie = "linux-firmware-nxp8997-pcie"
111 111
112FILES:${PN}-nxp8997-sdio = " \ 112FILES:${PN}-nxp8997-sdio = " \
113 ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \ 113 ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \
114 ${nonarch_base_libdir}/firmware/nxp/sdio*8997* \ 114 ${nonarch_base_libdir}/firmware/nxp/sd*8997* \
115" 115"
116RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common" 116RDEPENDS:${PN}-nxp8997-sdio += "${PN}-nxp8997-common"
117RPROVIDES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio" 117RPROVIDES:${PN}-nxp8997-sdio = "linux-firmware-nxp8997-sdio"
@@ -137,7 +137,7 @@ RREPLACES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
137RCONFLICTS:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie" 137RCONFLICTS:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
138 138
139FILES:${PN}-nxp9098-sdio = " \ 139FILES:${PN}-nxp9098-sdio = " \
140 ${nonarch_base_libdir}/firmware/nxp/sdio*9098* \ 140 ${nonarch_base_libdir}/firmware/nxp/sd*9098* \
141" 141"
142RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common" 142RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common"
143RPROVIDES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio" 143RPROVIDES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
index 65498aed..230cf095 100644
--- a/recipes-multimedia/alsa/alsa-lib_%.bbappend
+++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -10,6 +10,3 @@ IMX_PATCH = " \
10SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}" 10SRC_URI:append:imx-nxp-bsp = "${IMX_PATCH}"
11 11
12PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}" 12PACKAGE_ARCH:imx-nxp-bsp = "${MACHINE_SOCARCH}"
13
14GLIBC_64BIT_TIME_FLAGS = ""
15INSANE_SKIP:append = " 32bit-time"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index 7b17ccb0..7ad815b1 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -1,5 +1,5 @@
1# Copyright 2013-2016 Freescale Semiconductor 1# Copyright 2013-2016 Freescale Semiconductor
2# Copyright 2017-2023 NXP 2# Copyright 2017-2024 NXP
3# Released under the MIT license (see COPYING.MIT for the terms) 3# Released under the MIT license (see COPYING.MIT for the terms)
4 4
5DESCRIPTION = "Freescale alsa-lib plugins" 5DESCRIPTION = "Freescale alsa-lib plugins"
@@ -20,8 +20,8 @@ inherit autotools pkgconfig use-imx-headers
20PV = "1.0.26+${SRCPV}" 20PV = "1.0.26+${SRCPV}"
21 21
22SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" 22SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
23SRCBRANCH = "MM_04.09.02_2410_L6.6.y" 23SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
24SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331" 24SRCREV = "eaf0900662d6381bcc433165219280cca1752890"
25 25
26S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
27 27
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index de9b0daf..98e9ea4d 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -1,11 +1,11 @@
1# Copyright (C) 2013-2016 Freescale Semiconductor 1# Copyright (C) 2013-2016 Freescale Semiconductor
2# Copyright 2017-2023 NXP 2# Copyright (C) 2017-2023 NXP
3# Released under the MIT license (see COPYING.MIT for the terms) 3# Released under the MIT license (see COPYING.MIT for the terms)
4 4
5DESCRIPTION = "Freescale Multimedia VPU wrapper" 5DESCRIPTION = "Freescale Multimedia VPU wrapper"
6LICENSE = "Proprietary" 6LICENSE = "Proprietary"
7SECTION = "multimedia" 7SECTION = "multimedia"
8LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" 8LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
9 9
10DEPENDS = "virtual/imxvpu" 10DEPENDS = "virtual/imxvpu"
11DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" 11DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
@@ -14,13 +14,15 @@ SRC_URI = " \
14 git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH} \ 14 git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH} \
15 file://0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch \ 15 file://0001-vpu_wrapper_hantro_encoder-fix-missing-include.patch \
16" 16"
17SRCBRANCH = "MM_04.09.02_2410_L6.6.y" 17SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
18SRCREV = "378e33989cf72d6c2eb57a585072ba9abe87c6ff" 18SRCREV = "d8703ee3245797111ad21c52982efa8b6db33241"
19 19
20S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
21 21
22inherit autotools pkgconfig 22inherit autotools pkgconfig
23 23
24CFLAGS += " -Wno-error=implicit-function-declaration"
25
24do_install:append() { 26do_install:append() {
25 # FIXME: Drop examples for now 27 # FIXME: Drop examples for now
26 rm -r ${D}${datadir} 28 rm -r ${D}${datadir}