summaryrefslogtreecommitdiffstats
path: root/recipes-bsp
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx-8.12.inc (renamed from recipes-bsp/firmware-imx/firmware-imx-8.10.1.inc)6
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb (renamed from recipes-bsp/firmware-imx/firmware-imx-8_8.10.1.bb)0
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx-8m_8.12.bb (renamed from recipes-bsp/firmware-imx/firmware-imx-8m_8.10.1.bb)0
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx_8.12.bb (renamed from recipes-bsp/firmware-imx/firmware-imx_8.10.1.bb)0
-rw-r--r--recipes-bsp/firmware-qca/firmware-qca.inc15
-rw-r--r--recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb27
-rw-r--r--recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb27
-rw-r--r--recipes-bsp/firmware-qca/qca-tools_3.0.2.bb20
-rw-r--r--recipes-bsp/imx-atf/imx-atf_2.4.bb6
-rw-r--r--recipes-bsp/imx-mkimage/imx-mkimage_git.bb15
-rw-r--r--recipes-bsp/imx-mkimage/imx-mkimage_git.inc7
-rw-r--r--recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb (renamed from recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb)8
-rw-r--r--recipes-bsp/imx-seco/imx-seco-libs_git.bb8
-rw-r--r--recipes-bsp/imx-seco/imx-seco_3.8.1.bb (renamed from recipes-bsp/imx-seco/imx-seco_3.7.5.bb)8
-rw-r--r--recipes-bsp/imx-test/imx-test_git.bb6
-rw-r--r--recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb (renamed from recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.3.0.bb)8
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch33
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb32
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-decoder_sw-resolve-compilation-error-with-fcommon.patch54
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb35
-rw-r--r--recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb35
-rw-r--r--recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb (renamed from recipes-bsp/isp-imx/basler-camera_4.2.2.11.0.bb)6
-rw-r--r--recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch14
-rw-r--r--recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb (renamed from recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb)6
-rw-r--r--recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc (renamed from recipes-bsp/u-boot/u-boot-imx-common.inc)6
-rw-r--r--recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb (renamed from recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-imx_2021.04.bb (renamed from recipes-bsp/u-boot/u-boot-imx_2020.04.bb)6
-rw-r--r--recipes-bsp/u-boot/u-boot-mfgtool.inc4
28 files changed, 151 insertions, 241 deletions
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.10.1.inc b/recipes-bsp/firmware-imx/firmware-imx-8.12.inc
index 582beb18..b9699a86 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.10.1.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.12.inc
@@ -3,14 +3,14 @@
3# Copyright (C) 2018 O.S. Systems Software LTDA. 3# Copyright (C) 2018 O.S. Systems Software LTDA.
4SECTION = "base" 4SECTION = "base"
5LICENSE = "Proprietary" 5LICENSE = "Proprietary"
6LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb" 6LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
7 7
8SRC_URI = " \ 8SRC_URI = " \
9 ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \ 9 ${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
10" 10"
11 11
12SRC_URI[md5sum] = "1a9414928c3f30e7a911700fe83cd62e" 12SRC_URI[md5sum] = "6062247e9f12f3ec27247079e59fb935"
13SRC_URI[sha256sum] = "da415c32063c08fce8f52734f198b19ab06bd7d4333a4df900f8831df562f8fc" 13SRC_URI[sha256sum] = "6b6747bf36ecc53e385234afdce01f69c5775adf0d6685c885281ca6e4e322ef"
14 14
15S = "${WORKDIR}/firmware-imx-${PV}" 15S = "${WORKDIR}/firmware-imx-${PV}"
16 16
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.10.1.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb
index 650c1cfd..650c1cfd 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8_8.10.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.1.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.12.bb
index a48356ed..a48356ed 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.12.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.10.1.bb b/recipes-bsp/firmware-imx/firmware-imx_8.12.bb
index 8ff4a321..8ff4a321 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.10.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.12.bb
diff --git a/recipes-bsp/firmware-qca/firmware-qca.inc b/recipes-bsp/firmware-qca/firmware-qca.inc
deleted file mode 100644
index f33f4eb9..00000000
--- a/recipes-bsp/firmware-qca/firmware-qca.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1# Copyright (C) 2018-2020 NXP
2
3SUMMARY = "Qualcomm Wi-Fi and Bluetooth firmware"
4SECTION = "base"
5LICENSE = "Proprietary"
6LIC_FILES_CHKSUM = "file://COPYING;md5=fd4b227530cd88a82af6a5982cfb724d \
7 file://QUALCOMM_ATHEROS_LICENSE_AGREEMENT.pdf;md5=e629669cf17f6a2a6872e067582986e3 \
8"
9
10SRC_URI = " ${FSL_MIRROR}/firmware-qca-${PV}.bin;fsl-eula=true"
11SRC_URI[md5sum] = "75b1b2a8dea8f81609ccfc072d42fa86"
12SRC_URI[sha256sum] = "6ad56ac1df841e252ac6db0a8966082715a3cb6dc7189426bade13333a16fd9d"
13S = "${WORKDIR}/firmware-qca-${PV}"
14
15inherit fsl-eula-unpack
diff --git a/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb b/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb
deleted file mode 100644
index 47b289af..00000000
--- a/recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
1# Copyright (C) 2019-2020 NXP
2
3require firmware-qca.inc
4
5SUMMARY = "Qualcomm Wi-Fi and Bluetooth firmware"
6DESCRIPTION = "Qualcomm Wi-Fi and Bluetooth firmware for modules such as QCA6174A"
7SECTION = "base"
8LICENSE = "Proprietary"
9
10inherit allarch
11
12do_install () {
13 # Install firmware.conf for QCA modules
14 install -d ${D}${sysconfdir}/bluetooth
15 install -m 644 ${S}/1CQ_QCA6174A_LEA_2.0/etc/bluetooth/firmware.conf ${D}${sysconfdir}/bluetooth
16
17 # Install firmware files
18 install -d ${D}${base_libdir}
19 cp -r ${S}/1CQ_QCA6174A_LEA_2.0/lib/firmware ${D}${base_libdir}
20}
21
22FILES_${PN} = " \
23 ${sysconfdir}/bluetooth/firmware.conf \
24 ${base_libdir}/firmware/qca6174 \
25 ${base_libdir}/firmware/wlan \
26 ${base_libdir}/firmware/* \
27"
diff --git a/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb b/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb
deleted file mode 100644
index 26c41d50..00000000
--- a/recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
1# Copyright (C) 2018-2020 NXP
2
3require firmware-qca.inc
4
5SUMMARY = "Qualcomm Wi-Fi and Bluetooth firmware"
6DESCRIPTION = "Qualcomm Wi-Fi and Bluetooth firmware for modules such as QCA9377-3"
7SECTION = "base"
8LICENSE = "Proprietary"
9
10inherit allarch
11
12do_install () {
13 # Install firmware.conf for QCA modules
14 install -d ${D}${sysconfdir}/bluetooth
15 install -m 644 ${S}/1PJ_QCA9377-3_LEA_3.0/etc/bluetooth/firmware.conf ${D}${sysconfdir}/bluetooth
16
17 # Install firmware files
18 install -d ${D}${base_libdir}
19 cp -r ${S}/1PJ_QCA9377-3_LEA_3.0/lib/firmware ${D}${base_libdir}
20}
21
22FILES_${PN} = " \
23 ${sysconfdir}/bluetooth/firmware.conf \
24 ${base_libdir}/firmware/qca \
25 ${base_libdir}/firmware/qca9377 \
26 ${base_libdir}/firmware/wlan \
27"
diff --git a/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb b/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb
deleted file mode 100644
index e996c62d..00000000
--- a/recipes-bsp/firmware-qca/qca-tools_3.0.2.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1# Copyright (C) 2018-2020 NXP
2
3require firmware-qca.inc
4
5SUMMARY = "Qualcomm Wi-Fi and Bluetooth tools"
6DESCRIPTION = "Qualcomm Wi-Fi and Bluetooth tools for modules such as QCA6174A and QCA9377"
7LICENSE = "Proprietary"
8
9DEPENDS = "libnl zlib"
10
11FCC_TOOLS_FOLDER ?= "qca9377_qca6174_arm32"
12FCC_TOOLS_FOLDER_aarch64 = "qca9377_qca6174_arm64"
13
14do_install() {
15 install -d ${D}${sbindir}/fcc_tools
16 cp -r ${S}/fcc_tools/${FCC_TOOLS_FOLDER} ${D}${sbindir}/fcc_tools
17}
18
19COMPATIBLE_HOST = '(aarch64|arm).*-linux'
20COMPATIBLE_HOST_libc-musl = 'null'
diff --git a/recipes-bsp/imx-atf/imx-atf_2.4.bb b/recipes-bsp/imx-atf/imx-atf_2.4.bb
index 07807eff..f4db002b 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.4.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.4.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m
7 7
8PV .= "+git${SRCPV}" 8PV .= "+git${SRCPV}"
9 9
10SRCBRANCH = "imx_5.4.70_2.3.0" 10SRCBRANCH = "lf_v2.4"
11SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ 11SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \
12" 12"
13SRCREV = "2a26786460edd4f0ec3111e7027c93c57fc572c1" 13SRCREV = "ec35fef92b71a79075f214f8cff0738cd4482ed0"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
@@ -27,6 +27,8 @@ EXTRA_OEMAKE += " \
27 27
28BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" 28BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
29 29
30CFLAGS_remove_mx8mq = "-O2"
31
30do_compile() { 32do_compile() {
31 # Clear LDFLAGS to avoid the option -Wl recognize issue 33 # Clear LDFLAGS to avoid the option -Wl recognize issue
32 unset LDFLAGS 34 unset LDFLAGS
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
index 4e154f6d..f9943342 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.bb
@@ -1,5 +1,5 @@
1# Copyright (C) 2016 Freescale Semiconductor 1# Copyright (C) 2016 Freescale Semiconductor
2# Copyright (C) 2017-2020 NXP 2# Copyright (C) 2017-2021 NXP
3 3
4require imx-mkimage_git.inc 4require imx-mkimage_git.inc
5 5
@@ -12,18 +12,11 @@ inherit deploy native
12 12
13CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR} -L ${STAGING_LIBDIR}" 13CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR} -L ${STAGING_LIBDIR}"
14 14
15REV_CHIP ?= "B0"
16REV_CHIP_mx8qxp = \
17 "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'B0', \
18 'C0', d)}"
19
20do_compile () { 15do_compile () {
21 cd ${S} 16 cd ${S}
22 oe_runmake clean 17 oe_runmake clean
23 oe_runmake bin 18 oe_runmake bin
24 oe_runmake -C iMX8M -f soc.mak mkimage_imx8 19 oe_runmake -C iMX8M -f soc.mak mkimage_imx8
25 oe_runmake -C iMX8QM REV=${REV_CHIP} -f soc.mak imx8qm_dcd.cfg.tmp
26 oe_runmake -C iMX8QX REV=${REV_CHIP} -f soc.mak imx8qx_dcd.cfg.tmp
27} 20}
28 21
29do_install () { 22do_install () {
@@ -32,9 +25,3 @@ do_install () {
32 install -m 0755 iMX8M/mkimage_imx8 ${D}${bindir}/mkimage_imx8m 25 install -m 0755 iMX8M/mkimage_imx8 ${D}${bindir}/mkimage_imx8m
33 install -m 0755 mkimage_imx8 ${D}${bindir}/mkimage_imx8 26 install -m 0755 mkimage_imx8 ${D}${bindir}/mkimage_imx8
34} 27}
35
36do_deploy () {
37 install -m 0644 ${S}/iMX8QM/imx8qm_dcd.cfg.tmp ${DEPLOYDIR}
38 install -m 0644 ${S}/iMX8QX/imx8qx_dcd.cfg.tmp ${DEPLOYDIR}
39}
40addtask deploy before do_build after do_install
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index e52fd722..1288d877 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -1,13 +1,12 @@
1# Copyright 2017-2020 NXP 1# Copyright 2017-2021 NXP
2 2
3DEPENDS = "zlib-native openssl-native" 3DEPENDS = "zlib-native openssl-native"
4 4
5SRCBRANCH = "imx_5.4.70_2.3.0" 5SRCBRANCH = "lf-5.10.y_2.0.0"
6SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ 6SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
7 file://0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch \ 7 file://0001-mkimage_fit_atf-fix-fit-generator-node-naming.patch \
8" 8"
9 9SRCREV = "5138add7602a50d1730a54d0b67219f0ce0666b4"
10SRCREV = "8947fea369ab3932259630232cfb9f87b8f9dda1"
11S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
12 11
13BOOT_TOOLS = "imx-boot-tools" 12BOOT_TOOLS = "imx-boot-tools"
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb
index ade228d0..f8ad829e 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb
@@ -1,17 +1,17 @@
1# Copyright (C) 2016 Freescale Semiconductor 1# Copyright (C) 2016 Freescale Semiconductor
2# Copyright (C) 2017-2020 NXP 2# Copyright (C) 2017-2021 NXP
3 3
4DESCRIPTION = "i.MX System Controller Firmware" 4DESCRIPTION = "i.MX System Controller Firmware"
5LICENSE = "Proprietary" 5LICENSE = "Proprietary"
6LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 6LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
7SECTION = "BSP" 7SECTION = "BSP"
8 8
9inherit fsl-eula-unpack pkgconfig deploy 9inherit fsl-eula-unpack pkgconfig deploy
10 10
11SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" 11SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
12 12
13SRC_URI[md5sum] = "962aebbb0100cc0e049fa88cea594a00" 13SRC_URI[md5sum] = "5fb6fd285b18717614b5ba67f023e51c"
14SRC_URI[sha256sum] = "9a37353c07c187078be02d76ac55f615cd0c60ea9a1c4233c1929e4b2c43aebc" 14SRC_URI[sha256sum] = "df0fe17c93e4c2835542d6b1b2557524f034e378b643100cd838225e82336158"
15 15
16BOARD_TYPE ?= "mek" 16BOARD_TYPE ?= "mek"
17SC_FIRMWARE_NAME ?= "INVALID" 17SC_FIRMWARE_NAME ?= "INVALID"
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index dc37cdfc..4813d27e 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -1,17 +1,17 @@
1# Copyright (C) 2019-2020 NXP 1# Copyright (C) 2019-2021 NXP
2 2
3SUMMARY = "NXP i.MX SECO library" 3SUMMARY = "NXP i.MX SECO library"
4DESCRIPTION = "NXP IMX SECO library" 4DESCRIPTION = "NXP IMX SECO library"
5SECTION = "base" 5SECTION = "base"
6LICENSE = "Proprietary" 6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://EULA.txt;md5=228c72f2a91452b8a03c4cab30f30ef9" 7LIC_FILES_CHKSUM = "file://EULA.txt;md5=85d06b38f17b935ca11784d67075b846"
8 8
9DEPENDS = "zlib" 9DEPENDS = "zlib"
10 10
11SRCBRANCH = "imx_5.4.70_2.3.1" 11SRCBRANCH = "lf-5.10.y_2.0.0"
12SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \ 12SRC_URI = "git://github.com/NXP/imx-seco-libs.git;protocol=https;branch=${SRCBRANCH} \
13 file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch" 13 file://0002-Makefile-Fix-install-to-clear-host-user-contaminated.patch"
14SRCREV = "79e5fb5d096c61b1c3163c9fa8e42719509d95a0" 14SRCREV = "44caf511023012e9eda93f8bf64c90eaff1bade6"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
diff --git a/recipes-bsp/imx-seco/imx-seco_3.7.5.bb b/recipes-bsp/imx-seco/imx-seco_3.8.1.bb
index 0539b887..d6d165d7 100644
--- a/recipes-bsp/imx-seco/imx-seco_3.7.5.bb
+++ b/recipes-bsp/imx-seco/imx-seco_3.8.1.bb
@@ -1,17 +1,17 @@
1# Copyright (C) 2019-2020 NXP 1# Copyright (C) 2019-2021 NXP
2 2
3SUMMARY = "NXP i.MX SECO firmware" 3SUMMARY = "NXP i.MX SECO firmware"
4DESCRIPTION = "NXP IMX SECO firmware" 4DESCRIPTION = "NXP IMX SECO firmware"
5SECTION = "base" 5SECTION = "base"
6LICENSE = "Proprietary" 6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 7LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
8 8
9inherit fsl-eula-unpack use-imx-security-controller-firmware deploy 9inherit fsl-eula-unpack use-imx-security-controller-firmware deploy
10 10
11SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" 11SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
12 12
13SRC_URI[md5sum] = "d4faca131abfc51a1dd0278d7d201159" 13SRC_URI[md5sum] = "3043817d797fbd7417442ef3709d69b3"
14SRC_URI[sha256sum] = "08cf25a4be6841ca7264a50b29c311b386eae1c02fced8a3b55fd04213acb4bc" 14SRC_URI[sha256sum] = "fe6cff8ee0b66cc4e048ad4ad17e663867c5509809a436a3da62a73a80c1140f"
15 15
16do_compile[noexec] = "1" 16do_compile[noexec] = "1"
17 17
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index 4e139cc4..90594f39 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -1,6 +1,6 @@
1# Copyright (C) 2012-2016 O.S. Systems Software LTDA. 1# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
2# Copyright (C) 2013-2016 Freescale Semiconductor 2# Copyright (C) 2013-2016 Freescale Semiconductor
3# Copyright (C) 2017-2019 NXP 3# Copyright (C) 2017-2021 NXP
4 4
5SUMMARY = "Test programs for i.MX BSP" 5SUMMARY = "Test programs for i.MX BSP"
6DESCRIPTION = "Unit tests for the i.MX BSP" 6DESCRIPTION = "Unit tests for the i.MX BSP"
@@ -16,12 +16,12 @@ DEPENDS_append_imxvpu = " virtual/imxvpu"
16PE = "1" 16PE = "1"
17PV = "7.0+${SRCPV}" 17PV = "7.0+${SRCPV}"
18 18
19SRCBRANCH = "imx_5.4.70_2.3.0" 19SRCBRANCH = "lf-5.10.y_2.0.0"
20SRC_URI = " \ 20SRC_URI = " \
21 git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ 21 git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
22 file://memtool_profile \ 22 file://memtool_profile \
23" 23"
24SRCREV = "90fd7168fe5f15de9b2b1992a719024fc73a185a" 24SRCREV = "e55c83b939dbb1989181f48b2b3f3e32f7b5b380"
25S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
26 26
27inherit module-base use-imx-headers 27inherit module-base use-imx-headers
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.3.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb
index bd087898..58a140b4 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.3.0.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb
@@ -1,8 +1,8 @@
1# Copyright (C) 2019-2020 NXP 1# Copyright (C) 2019-2021 NXP
2 2
3DESCRIPTION = "i.MX VC8000E Encoder library" 3DESCRIPTION = "i.MX VC8000E Encoder library"
4LICENSE = "Proprietary" 4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 5LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
6 6
7inherit fsl-eula-unpack 7inherit fsl-eula-unpack
8 8
@@ -10,8 +10,8 @@ SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
10 10
11S = "${WORKDIR}/${BPN}-${PV}" 11S = "${WORKDIR}/${BPN}-${PV}"
12 12
13SRC_URI[md5sum] = "37c61718602ff08041b81319cfd6a8d9" 13SRC_URI[md5sum] = "b5270450ba2da5b7468b67ae8c0bcdca"
14SRC_URI[sha256sum] = "8425796fc63d7107f2f57c51497281c4d54c883b2670817347fbe55f39dc2b8c" 14SRC_URI[sha256sum] = "d5efae484c4271c098286d007590d6bf40c272d4f35702ff65625f2362715ab3"
15 15
16# SCR is the location and name of the Software Content Register file 16# SCR is the location and name of the Software Content Register file
17# relative to ${D}${D_SUBDIR}. 17# relative to ${D}${D_SUBDIR}.
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch
new file mode 100644
index 00000000..dff2fb8f
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch
@@ -0,0 +1,33 @@
1From 94ae72948f1ed1a8bad1c13b4edc4b9189207e35 Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Mon, 26 Jul 2021 09:06:26 -0500
4Subject: [PATCH] Makefile: Honor LDFLAGS from toolchain
5
6The LDFLAGS variable is standard from the toolchain and should be
7honored. Yocto detects the problem with a QA check:
8
9ERROR: imx-vpu-hantro-daemon-1.1.0-r0 do_package_qa: QA Issue: File /usr/bin/vsidaemon in package imx-vpu-hantro-daemon doesn't have GNU_HASH (didn't pass LDFLAGS?) [ldflags]
10
11Upstream-Status: Pending
12
13Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
14---
15 Makefile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/Makefile b/Makefile
19index 9a775b0..e73ff47 100755
20--- a/Makefile
21+++ b/Makefile
22@@ -22,7 +22,7 @@ OUT_FILE = vsidaemon
23 DEC = nxp_enc_hw
24 ENC = nxp_dec_hw
25 LIBFILES =
26-LD_FLAGS = -lpthread -lm
27+LD_FLAGS = $(LDFLAGS) -lpthread -lm
28
29 PLATFORM ?= IMX8MP
30
31--
322.17.1
33
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb
new file mode 100644
index 00000000..88b9ee0e
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb
@@ -0,0 +1,32 @@
1# Copyright 2021 NXP
2DESCRIPTION = "i.MX Hantro V4L2 Daemon"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1"
5
6DEPENDS = "imx-vpu-hantro"
7DEPENDS_append_mx8mp = " imx-vpu-hantro-vc"
8
9SRC_URI = " \
10 ${FSL_MIRROR}/${BP}.tar.gz \
11 file://0001-Makefile-Honor-LDFLAGS-from-toolchain.patch \
12"
13SRC_URI[md5sum] = "65417710ef22214523c37f50f34b6ab2"
14SRC_URI[sha256sum] = "897d174c4c0818f31012d8a60ed51fc83fdfc55fca2d2b0fc24a0db3e9f3b6e8"
15
16PLATFORM_mx8mm = "IMX8MM"
17PLATFORM_mx8mq = "IMX8MQ"
18PLATFORM_mx8mp = "IMX8MP"
19
20EXTRA_OEMAKE = " \
21 CROSS_COMPILE="${HOST_PREFIX}" \
22 SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
23 CTRLSW_HDRPATH="${STAGING_INCDIR}" \
24 PLATFORM="${PLATFORM}" \
25"
26
27do_install () {
28 oe_runmake install DEST_DIR="${D}"
29}
30
31PACKAGE_ARCH = "${MACHINE_SOCARCH}"
32COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-decoder_sw-resolve-compilation-error-with-fcommon.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-decoder_sw-resolve-compilation-error-with-fcommon.patch
deleted file mode 100644
index 8d9610d5..00000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-decoder_sw-resolve-compilation-error-with-fcommon.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From 5bfb24738c47003fd04a86bfd5a49f8c6354ed23 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
3Date: Fri, 28 Aug 2020 07:46:35 +0000
4Subject: [PATCH] decoder_sw: resolve compilation error with -fcommon
5
6-fcommon is enabled by default in gcc10 compiler, which results in
7following build errors:
8
9decoder_sw/software/source/inc/decapicommon.h:272: multiple definition
10of `DecPicCodingType'; decoder_sw/software/linux/dwl/dwl_linux.o:
11decoder_sw/software/source/inc/decapicommon.h:272: first defined here
12
13decoder_sw/software/source/inc/dwl.h:94: multiple definition of
14`DWLInitParam'; decoder_sw/software/linux/dwl/dwl_linux.o:
15decoder_sw/software/source/inc/dwl.h:94: first defined here
16
17Drop multiple enum name definitions, which solves above compilation
18issues.
19
20Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
21---
22 decoder_sw/software/source/inc/decapicommon.h | 2 +-
23 decoder_sw/software/source/inc/dwl.h | 2 +-
24 2 files changed, 2 insertions(+), 2 deletions(-)
25
26diff --git a/decoder_sw/software/source/inc/decapicommon.h b/decoder_sw/software/source/inc/decapicommon.h
27index 0f02092..fc8cccf 100755
28--- a/decoder_sw/software/source/inc/decapicommon.h
29+++ b/decoder_sw/software/source/inc/decapicommon.h
30@@ -269,7 +269,7 @@ enum DecPicCodingType {
31 DEC_PIC_TYPE_D = 3,
32 DEC_PIC_TYPE_FI = 4,
33 DEC_PIC_TYPE_BI = 5
34-} DecPicCodingType;
35+};
36
37 /* Output picture pixel format types for raster scan or down scale output */
38 enum DecPicturePixelFormat {
39diff --git a/decoder_sw/software/source/inc/dwl.h b/decoder_sw/software/source/inc/dwl.h
40index 6991f03..fd357b3 100755
41--- a/decoder_sw/software/source/inc/dwl.h
42+++ b/decoder_sw/software/source/inc/dwl.h
43@@ -91,7 +91,7 @@ struct DWLLinearMem {
44 /* DWLInitParam is used to pass parameters when initializing the DWL */
45 struct DWLInitParam {
46 u32 client_type;
47-} DWLInitParam;
48+};
49
50 /* Hardware configuration description, same as in top API */
51 typedef struct DecHwConfig DWLHwConfig;
52--
532.17.1
54
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb
deleted file mode 100644
index b7c64cbb..00000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.20.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1# Copyright (C) 2017-2020 NXP
2
3DESCRIPTION = "i.MX Hantro VPU library"
4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a"
6
7PROVIDES = "virtual/imxvpu"
8
9SRC_URI = " \
10 ${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \
11"
12SRC_URI[md5sum] = "682b3a73bf5aa22a37d56a433d11fc91"
13SRC_URI[sha256sum] = "e6cdd5b4c628604906466fc9620e2b048cf1b2c863f9ee49616dd5212b9261b0"
14
15inherit fsl-eula-unpack use-imx-headers
16
17PARALLEL_MAKE="-j 1"
18
19PLATFORM_mx8mm = "IMX8MM"
20PLATFORM_mx8mq = "IMX8MQ"
21PLATFORM_mx8mp = "IMX8MP"
22
23do_compile () {
24 oe_runmake CROSS_COMPILE="${HOST_PREFIX}" \
25 SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
26 PLATFORM="${PLATFORM}" all
27}
28
29do_install () {
30 oe_runmake DEST_DIR="${D}" PLATFORM="${PLATFORM}" install
31}
32
33FILES_${PN} += "/unit_tests"
34
35COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb
new file mode 100644
index 00000000..20ac87c7
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb
@@ -0,0 +1,35 @@
1# Copyright (C) 2017-2020 NXP
2
3DESCRIPTION = "i.MX Hantro VPU library"
4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
6
7PROVIDES = "virtual/imxvpu"
8
9SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
10SRC_URI[md5sum] = "b65b49eadb6463b784e1a9e44a94fca1"
11SRC_URI[sha256sum] = "03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00"
12
13inherit fsl-eula-unpack use-imx-headers
14
15PARALLEL_MAKE="-j 1"
16
17PLATFORM_mx8mm = "IMX8MM"
18PLATFORM_mx8mq = "IMX8MQ"
19PLATFORM_mx8mp = "IMX8MP"
20
21EXTRA_OEMAKE = " \
22 CROSS_COMPILE="${HOST_PREFIX}" \
23 SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \
24 PLATFORM="${PLATFORM}" \
25"
26
27do_install () {
28 oe_runmake install DEST_DIR="${D}"
29}
30
31FILES_${PN} += "/unit_tests"
32
33RDEPENDS_${PN} += "imx-vpu-hantro-daemon"
34
35COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.11.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb
index 88cdd1c5..e7d4b652 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.11.0.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb
@@ -2,14 +2,14 @@
2 2
3DESCRIPTION = "Basler camera binary drivers" 3DESCRIPTION = "Basler camera binary drivers"
4LICENSE = "Proprietary" 4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb" 5LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
6 6
7inherit fsl-eula-unpack 7inherit fsl-eula-unpack
8 8
9SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" 9SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
10 10
11SRC_URI[md5sum] = "2e0bd011f8d72e1957c4d6da55364be5" 11SRC_URI[md5sum] = "8d99375cc9e7f1573d984c6a989655b1"
12SRC_URI[sha256sum] = "4be5c4f26dc0f3f5e031c2d8ac295ff5768489e7e978aaa901030fd77b5209c2" 12SRC_URI[sha256sum] = "3f09f7a2de290b0580faee9e180a78a322144d316fbbbc80b8a36fb83ab538b1"
13 13
14do_install() { 14do_install() {
15 dest_dir=${D}/opt/imx8-isp/bin 15 dest_dir=${D}/opt/imx8-isp/bin
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch
index 1b62afe5..be2e1c61 100644
--- a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch
+++ b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch
@@ -10,20 +10,20 @@ Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
10 imx/start_isp.sh | 13 +++++-------- 10 imx/start_isp.sh | 13 +++++--------
11 1 file changed, 5 insertions(+), 8 deletions(-) 11 1 file changed, 5 insertions(+), 8 deletions(-)
12 12
13Index: isp-imx-4.2.2.11.0/imx/start_isp.sh 13Index: isp-imx-4.2.2.13.0/imx/start_isp.sh
14=================================================================== 14===================================================================
15--- isp-imx-4.2.2.11.0.orig/imx/start_isp.sh 15--- isp-imx-4.2.2.13.0.orig/imx/start_isp.sh
16+++ isp-imx-4.2.2.11.0/imx/start_isp.sh 16+++ isp-imx-4.2.2.13.0/imx/start_isp.sh
17@@ -8,6 +8,7 @@ 17@@ -9,6 +9,7 @@
18
19 RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" 18 RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
20 NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null) 19 NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null)
20 NR_DEVICE_TREE_OV5640=$(grep ov5640 /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null)
21+DMESG_BASLER=`dmesg | grep Basler` 21+DMESG_BASLER=`dmesg | grep Basler`
22 22
23 # check if the basler device has been enabled in the device tree 23 # check if the basler device has been enabled in the device tree
24 if [ $NR_DEVICE_TREE_BASLER -eq 1 ]; then 24 if [ $NR_DEVICE_TREE_BASLER -eq 1 ]; then
25@@ -28,8 +29,15 @@ elif [ $NR_DEVICE_TREE_BASLER -eq 2 ]; t 25@@ -40,8 +41,15 @@ elif [ $NR_DEVICE_TREE_BASLER -eq 2 ]; t
26 # Available configurations: dual_basler_1080p60, dual_basler_1080p60hdr 26 # Available configurations: dual_basler_1080p60, dual_basler_1080p60hdr, dual_basler_1080p25hdr
27 exec ./run.sh -c dual_basler_1080p60 -lm 27 exec ./run.sh -c dual_basler_1080p60 -lm
28 28
29+elif [ ! -z "$DMESG_BASLER" ]; then 29+elif [ ! -z "$DMESG_BASLER" ]; then
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb
index 3d25229f..ec15dfb9 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb
@@ -2,15 +2,15 @@
2 2
3DESCRIPTION = "i.MX Verisilicon Software ISP" 3DESCRIPTION = "i.MX Verisilicon Software ISP"
4LICENSE = "Proprietary" 4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb" 5LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b"
6DEPENDS = "python3 libdrm virtual/libg2d" 6DEPENDS = "python3 libdrm virtual/libg2d"
7 7
8SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ 8SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
9 file://0001-start_isp.sh-fix-test-to-be-generic.patch \ 9 file://0001-start_isp.sh-fix-test-to-be-generic.patch \
10" 10"
11 11
12SRC_URI[md5sum] = "75f79ba556c47172b9a0cbc3a877e604" 12SRC_URI[md5sum] = "123feed48302fea2a1be8572e913ae47"
13SRC_URI[sha256sum] = "28e2ee909f29a256c4eac87ef8336932d90a88a2a183389ac0868212954af42c" 13SRC_URI[sha256sum] = "e775975684aab4211f0bf8c5e2c6604ba46b83c5586937000675e044a50d77b8"
14 14
15inherit fsl-eula-unpack cmake systemd use-imx-headers 15inherit fsl-eula-unpack cmake systemd use-imx-headers
16 16
diff --git a/recipes-bsp/u-boot/u-boot-imx-common.inc b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
index f1edc92c..2abcac9b 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2021.04.inc
@@ -3,9 +3,9 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
3LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" 4LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5 5
6SRCBRANCH = "imx_v2020.04_5.4.70_2.3.0" 6SRCBRANCH = "lf_v2021.04"
7SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" 7SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
8SRCREV = "185bdaaaf5644319284566e5c340927d28954a1a" 8SRCREV = "3463140881c523e248d2fcb6bfc9ed25c0db93bd"
9 9
10DEPENDS += "flex-native bison-native bc-native dtc-native" 10DEPENDS += "flex-native bison-native bc-native dtc-native"
11 11
@@ -14,7 +14,7 @@ B = "${WORKDIR}/build"
14 14
15inherit fsl-u-boot-localversion 15inherit fsl-u-boot-localversion
16 16
17LOCALVERSION ?= "-imx_v2020.04_5.4.70_2.3.2" 17LOCALVERSION ?= "-imx_v2021.04_5.10.35_2.0.0"
18 18
19BOOT_TOOLS = "imx-boot-tools" 19BOOT_TOOLS = "imx-boot-tools"
20 20
diff --git a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.bb b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb
index 2b296c19..2b296c19 100644
--- a/recipes-bsp/u-boot/u-boot-imx-mfgtool_2020.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb
diff --git a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
index 058229e2..6a279a12 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
@@ -3,12 +3,12 @@
3# Copyright (C) 2017-2021 NXP 3# Copyright (C) 2017-2021 NXP
4 4
5require recipes-bsp/u-boot/u-boot.inc 5require recipes-bsp/u-boot/u-boot.inc
6require u-boot-imx-common.inc 6require u-boot-imx-common_${PV}.inc
7 7
8PROVIDES += "u-boot" 8PROVIDES += "u-boot"
9 9
10do_deploy_append_mx8m() { 10do_deploy_append_mx8m() {
11 # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary 11 # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
12 if [ -n "${UBOOT_CONFIG}" ] 12 if [ -n "${UBOOT_CONFIG}" ]
13 then 13 then
14 for config in ${UBOOT_MACHINE}; do 14 for config in ${UBOOT_MACHINE}; do
@@ -19,7 +19,7 @@ do_deploy_append_mx8m() {
19 then 19 then
20 install -d ${DEPLOYDIR}/${BOOT_TOOLS} 20 install -d ${DEPLOYDIR}/${BOOT_TOOLS}
21 install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS} 21 install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME} ${DEPLOYDIR}/${BOOT_TOOLS}
22 install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG} 22 install -m 0777 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type}
23 fi 23 fi
24 done 24 done
25 unset j 25 unset j
diff --git a/recipes-bsp/u-boot/u-boot-mfgtool.inc b/recipes-bsp/u-boot/u-boot-mfgtool.inc
index 91526ad7..92d055bf 100644
--- a/recipes-bsp/u-boot/u-boot-mfgtool.inc
+++ b/recipes-bsp/u-boot/u-boot-mfgtool.inc
@@ -17,5 +17,5 @@ UBOOT_CONFIG = "mfgtool"
17# Add 'mfgtool' suffix 17# Add 'mfgtool' suffix
18UBOOT_IMAGE = "u-boot-${MACHINE}-mfgtool-${PV}-${PR}.${UBOOT_SUFFIX}" 18UBOOT_IMAGE = "u-boot-${MACHINE}-mfgtool-${PV}-${PR}.${UBOOT_SUFFIX}"
19UBOOT_SYMLINK = "u-boot-${MACHINE}-mfgtool.${UBOOT_SUFFIX}" 19UBOOT_SYMLINK = "u-boot-${MACHINE}-mfgtool.${UBOOT_SUFFIX}"
20SPL_IMAGE = "${SPL_BINARY}-${MACHINE}-mfgtool-${PV}-${PR}" 20SPL_IMAGE = "${SPL_BINARYNAME}-${MACHINE}-mfgtool-${PV}-${PR}"
21SPL_SYMLINK = "${SPL_BINARY}-mfgtool-${MACHINE}" 21SPL_SYMLINK = "${SPL_BINARYNAME}-mfgtool-${MACHINE}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-28 17:06:34 +0000