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.10.1.inc (renamed from recipes-bsp/firmware-imx/firmware-imx-8.10.inc)8
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx-8_8.10.1.bb (renamed from recipes-bsp/firmware-imx/firmware-imx-8_8.10.bb)0
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx-8m_8.10.1.bb (renamed from recipes-bsp/firmware-imx/firmware-imx-8m_8.10.bb)0
-rw-r--r--recipes-bsp/firmware-imx/firmware-imx_8.10.1.bb (renamed from recipes-bsp/firmware-imx/firmware-imx_8.10.bb)0
-rw-r--r--recipes-bsp/imx-atf/imx-atf_2.4.bb6
-rw-r--r--recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb3
-rw-r--r--recipes-bsp/imx-seco/imx-seco-libs_git.bb4
-rw-r--r--recipes-bsp/imx-seco/imx-seco_3.7.5.bb4
-rw-r--r--recipes-bsp/isp-imx/basler-camera_4.2.2.11.0.bb (renamed from recipes-bsp/isp-imx/basler-camera_4.2.2.6.0.bb)10
-rw-r--r--recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch27
-rw-r--r--recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch26
-rw-r--r--recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch72
-rw-r--r--recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch23
-rw-r--r--recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch41
-rw-r--r--recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb (renamed from recipes-bsp/isp-imx/isp-imx_4.2.2.6.0.bb)56
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc (renamed from recipes-bsp/u-boot/u-boot-fslc-common_2021.04.inc)8
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb (renamed from recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.04.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb (renamed from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.04.bb)0
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc_2021.07.bb (renamed from recipes-bsp/u-boot/u-boot-fslc_2021.04.bb)2
-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)2
22 files changed, 147 insertions, 151 deletions
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8.10.inc b/recipes-bsp/firmware-imx/firmware-imx-8.10.1.inc
index 6f1222aa..582beb18 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8.10.inc
+++ b/recipes-bsp/firmware-imx/firmware-imx-8.10.1.inc
@@ -1,16 +1,16 @@
1# Copyright (C) 2012-2016 Freescale Semiconductor 1# Copyright (C) 2012-2016 Freescale Semiconductor
2# Copyright (C) 2017-2020 NXP 2# Copyright (C) 2017-2021 NXP
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=cf3f9b8d09bc3926b1004ea71f7a248a" 6LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
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] = "3f8c4661ca0f64ca30fd239f66b6a471" 12SRC_URI[md5sum] = "1a9414928c3f30e7a911700fe83cd62e"
13SRC_URI[sha256sum] = "2b70f169d4065b2a7ac7a676afe24636128bd2dacc9f5230346758c3b146b2be" 13SRC_URI[sha256sum] = "da415c32063c08fce8f52734f198b19ab06bd7d4333a4df900f8831df562f8fc"
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.bb b/recipes-bsp/firmware-imx/firmware-imx-8_8.10.1.bb
index 650c1cfd..650c1cfd 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8_8.10.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.10.1.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.bb b/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.1.bb
index a48356ed..a48356ed 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx-8m_8.10.1.bb
diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.10.bb b/recipes-bsp/firmware-imx/firmware-imx_8.10.1.bb
index 8ff4a321..8ff4a321 100644
--- a/recipes-bsp/firmware-imx/firmware-imx_8.10.bb
+++ b/recipes-bsp/firmware-imx/firmware-imx_8.10.1.bb
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-sc-firmware/imx-sc-firmware_1.7.1.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb
index ade228d0..bd69f6ea 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.7.1.bb
@@ -17,7 +17,6 @@ BOARD_TYPE ?= "mek"
17SC_FIRMWARE_NAME ?= "INVALID" 17SC_FIRMWARE_NAME ?= "INVALID"
18SC_FIRMWARE_NAME_mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin" 18SC_FIRMWARE_NAME_mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
19SC_FIRMWARE_NAME_mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin" 19SC_FIRMWARE_NAME_mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
20SC_FIRMWARE_NAME_mx8phantomdxl = "mx8dxl-phantom-${BOARD_TYPE}-scfw-tcm.bin"
21SC_FIRMWARE_NAME_mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin" 20SC_FIRMWARE_NAME_mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
22SC_FIRMWARE_NAME_mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin" 21SC_FIRMWARE_NAME_mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
23 22
@@ -39,4 +38,4 @@ INHIBIT_PACKAGE_STRIP = "1"
39INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 38INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
40PACKAGE_ARCH = "${MACHINE_ARCH}" 39PACKAGE_ARCH = "${MACHINE_ARCH}"
41 40
42COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl|mx8dx)" 41COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
diff --git a/recipes-bsp/imx-seco/imx-seco-libs_git.bb b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
index dc37cdfc..af51529b 100644
--- a/recipes-bsp/imx-seco/imx-seco-libs_git.bb
+++ b/recipes-bsp/imx-seco/imx-seco-libs_git.bb
@@ -1,7 +1,7 @@
1# Copyright (C) 2019-2020 NXP 1# Copyright (C) 2019-2020 NXP
2 2
3SUMMARY = "NXP i.MX SECO library" 3SUMMARY = "NXP i.MX SECO library"
4DESCRIPTION = "NXP IMX SECO library" 4DESCRIPTION = "NXP i.MX Security Controller library"
5SECTION = "base" 5SECTION = "base"
6LICENSE = "Proprietary" 6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://EULA.txt;md5=228c72f2a91452b8a03c4cab30f30ef9" 7LIC_FILES_CHKSUM = "file://EULA.txt;md5=228c72f2a91452b8a03c4cab30f30ef9"
@@ -21,4 +21,4 @@ do_install () {
21 oe_runmake DESTDIR=${D} install 21 oe_runmake DESTDIR=${D} install
22} 22}
23 23
24COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl)" 24COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
diff --git a/recipes-bsp/imx-seco/imx-seco_3.7.5.bb b/recipes-bsp/imx-seco/imx-seco_3.7.5.bb
index 0539b887..c3d86e7a 100644
--- a/recipes-bsp/imx-seco/imx-seco_3.7.5.bb
+++ b/recipes-bsp/imx-seco/imx-seco_3.7.5.bb
@@ -1,7 +1,7 @@
1# Copyright (C) 2019-2020 NXP 1# Copyright (C) 2019-2020 NXP
2 2
3SUMMARY = "NXP i.MX SECO firmware" 3SUMMARY = "NXP i.MX SECO firmware"
4DESCRIPTION = "NXP IMX SECO firmware" 4DESCRIPTION = "NXP i.MX Security Controller firmware"
5SECTION = "base" 5SECTION = "base"
6LICENSE = "Proprietary" 6LICENSE = "Proprietary"
7LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 7LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a"
@@ -23,4 +23,4 @@ do_deploy () {
23 install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR} 23 install -m 0644 ${S}/firmware/seco/${SECO_FIRMWARE_NAME} ${DEPLOYDIR}
24} 24}
25 25
26COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8phantomdxl|mx8dxl)" 26COMPATIBLE_MACHINE = "(mx8qm|mx8qxp|mx8dxl|mx8dx)"
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.6.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.11.0.bb
index 369ca5ce..88cdd1c5 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.6.0.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.11.0.bb
@@ -1,15 +1,15 @@
1# Copyright 2020 NXP 1# Copyright 2020-2021 NXP
2 2
3DESCRIPTION = "Basler camera binary drivers" 3DESCRIPTION = "Basler camera binary drivers"
4LICENSE = "Proprietary" 4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 5LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
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] = "8c94839802598853f7b91f6386b4643e" 11SRC_URI[md5sum] = "2e0bd011f8d72e1957c4d6da55364be5"
12SRC_URI[sha256sum] = "6456dbb0095d988cce65f94e92a3ea80d796e02fd410987c937cfc0a09ca2e4a" 12SRC_URI[sha256sum] = "4be5c4f26dc0f3f5e031c2d8ac295ff5768489e7e978aaa901030fd77b5209c2"
13 13
14do_install() { 14do_install() {
15 dest_dir=${D}/opt/imx8-isp/bin 15 dest_dir=${D}/opt/imx8-isp/bin
@@ -24,4 +24,4 @@ SYSTEMD_AUTO_ENABLE = "enable"
24FILES_${PN} = "${libdir} /opt" 24FILES_${PN} = "${libdir} /opt"
25INSANE_SKIP_${PN} = "file-rdeps already-stripped" 25INSANE_SKIP_${PN} = "file-rdeps already-stripped"
26 26
27COMPATIBLE_MACHINE = "(imx|use-nxp-bsp)" 27COMPATIBLE_MACHINE = "(mx8mp)"
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch b/recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch
deleted file mode 100644
index 725a9907..00000000
--- a/recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 325b4bf687ead6598de702df9829a4dad0b6458c Mon Sep 17 00:00:00 2001
2From: Chris Dimich <Chris.Dimich@boundarydevices.com>
3Date: Mon, 15 Feb 2021 22:51:01 -0800
4Subject: [PATCH 1/1] BufferManager.h: add missing header file
5
6Needed to compile with Yocto Gatesgarth.
7
8Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
9---
10 mediacontrol/buffer/BufferManager.h | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/mediacontrol/buffer/BufferManager.h b/mediacontrol/buffer/BufferManager.h
14index f5691e111..4d5ce6965 100755
15--- a/mediacontrol/buffer/BufferManager.h
16+++ b/mediacontrol/buffer/BufferManager.h
17@@ -16,6 +16,7 @@
18 #include <deque>
19 #include <map>
20 #include <EAutoLock.h>
21+#include <stdint.h>
22
23 enum {
24 BUFFER_TYPE_INPUT_FREE = 0,
25--
262.29.0
27
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch b/recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch
deleted file mode 100644
index 86391d4b..00000000
--- a/recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From ce8dd8db37de85952419a5b28a48ec20d1310cf7 Mon Sep 17 00:00:00 2001
2From: Chris Dimich <Chris.Dimich@boundarydevices.com>
3Date: Wed, 17 Feb 2021 14:09:39 -0800
4Subject: [PATCH 1/1] imx8-isp.service: do not prevent restart of service
5
6Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
7---
8 imx/imx8-isp.service | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/imx/imx8-isp.service b/imx/imx8-isp.service
12index 93d2e9b3a..4f0cd88ca 100644
13--- a/imx/imx8-isp.service
14+++ b/imx/imx8-isp.service
15@@ -10,7 +10,7 @@ StartLimitBurst=5
16 Restart=on-failure
17 RestartSec=5s
18 # ENXIO
19-RestartPreventExitStatus=6
20+#RestartPreventExitStatus=6
21 ExecStart=/opt/imx8-isp/bin/start_isp.sh
22
23 [Install]
24--
252.29.0
26
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch
new file mode 100644
index 00000000..d8d12267
--- /dev/null
+++ b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch
@@ -0,0 +1,72 @@
1From accaeb1ae77eb40b89e70df3efcb00d0dc2af758 Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Mon, 14 Jun 2021 08:20:48 +0000
4Subject: [PATCH] isp-imx: drop use of __TIME__, __DATE__
5
6With reproducible build enabled the compiler is configured to throw
7an error if __TIME__, __DATE__ preprocessor macros are used.
8
9| isp-imx-4.2.2.11.0/mediacontrol/daemon/main_v4l2.cpp:99:44: error: macro "__DATE__" might prevent reproducible builds [-Werror=date-time]
10| 99 | std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
11| | ^~~~~~~~
12
13Fix this by replacing __DATE__, __TIME__ with BUILD_DATE and setting
14BUILD_DATE from CMakeLists.txt to either SOURCE_DATE_EPOCH if present
15or the local time otherwise.
16
17Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
18---
19 mediacontrol/CMakeLists.txt | 3 +++
20 mediacontrol/daemon/main_v4l2.cpp | 8 ++++----
21 2 files changed, 7 insertions(+), 4 deletions(-)
22
23diff --git a/mediacontrol/CMakeLists.txt b/mediacontrol/CMakeLists.txt
24index 48cd7633e..f587758e0 100755
25--- a/mediacontrol/CMakeLists.txt
26+++ b/mediacontrol/CMakeLists.txt
27@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1.0)
28
29 project(ISP_MEDIA_CONTROL)
30
31+string(TIMESTAMP BUILD_DATE "%b %d %Y" UTC)
32+add_compile_definitions(BUILD_DATE="${BUILD_DATE}")
33+
34 if( NOT DEFINED APPSHELL_TOP_COMPILE)
35 if(DEFINED PLATFORM)
36 if(${PLATFORM} STREQUAL ARM64)
37diff --git a/mediacontrol/daemon/main_v4l2.cpp b/mediacontrol/daemon/main_v4l2.cpp
38index a3033cf83..d08dee127 100644
39--- a/mediacontrol/daemon/main_v4l2.cpp
40+++ b/mediacontrol/daemon/main_v4l2.cpp
41@@ -96,7 +96,7 @@ int main(int argc, char* argv[]) {
42 if (argc == 2){
43 if(!(string2Version.find(argv[1])==string2Version.end())){
44 std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl;
45- std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
46+ std::cout << "Build Time : "<<BUILD_DATE<<std::endl;
47 return 0;
48 }
49 }
50@@ -105,8 +105,8 @@ int main(int argc, char* argv[]) {
51 if(fd_running >= 0)
52 {
53 ALOGI("******************************************************************");
54- ALOGI("VIV ISP Media Control Framework V%s (%s, %s)",
55- MEDIA_SERVER_VERSION, __DATE__, __TIME__);
56+ ALOGI("VIV ISP Media Control Framework V%s (%s)",
57+ MEDIA_SERVER_VERSION, BUILD_DATE);
58 ALOGI("******************************************************************\n");
59
60 if (argc < 2) {
61@@ -123,7 +123,7 @@ int main(int argc, char* argv[]) {
62 while( i < argc ){
63 if(!(string2Version.find(argv[i])==string2Version.end())){
64 std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl;
65- std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
66+ std::cout << "Build Time : "<<BUILD_DATE<<std::endl;
67 i++;
68 continue;
69 }
70--
712.20.1
72
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch b/recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch
deleted file mode 100644
index 715bed2a..00000000
--- a/recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 7070abd558e753b89955a966bb83e11f5a7b8462 Mon Sep 17 00:00:00 2001
2From: Chris Dimich <Chris.Dimich@boundarydevices.com>
3Date: Wed, 17 Feb 2021 14:06:26 -0800
4Subject: [PATCH 1/1] run.sh: fix bashism
5
6Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
7---
8 imx/run.sh | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/imx/run.sh b/imx/run.sh
12index c0d676ae7..ebeb7a6e7 100755
13--- a/imx/run.sh
14+++ b/imx/run.sh
15@@ -1,4 +1,4 @@
16-#!/bin/bash
17+#!/bin/sh
18 #
19 # Start the isp_media_server in the configuration from user
20 # (c) NXP 2020
21--
222.29.0
23
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 cb93223e..1b62afe5 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,37 +10,32 @@ 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
13diff --git a/imx/start_isp.sh b/imx/start_isp.sh 13Index: isp-imx-4.2.2.11.0/imx/start_isp.sh
14index 02ee7d3b5..fee0492ad 100755 14===================================================================
15--- a/imx/start_isp.sh 15--- isp-imx-4.2.2.11.0.orig/imx/start_isp.sh
16+++ b/imx/start_isp.sh 16+++ isp-imx-4.2.2.11.0/imx/start_isp.sh
17@@ -7,21 +7,18 @@ 17@@ -8,6 +8,7 @@
18 #
19 18
20 RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" 19 RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
21-DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l 2> /dev/null) 20 NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null)
22- 21+DMESG_BASLER=`dmesg | grep Basler`
23+BASLER=`dmesg | grep Basler`
24 22
25 # 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
26-if [ -f "$DEVICE_TREE_BASLER" ]; then 24 if [ $NR_DEVICE_TREE_BASLER -eq 1 ]; then
27- 25@@ -28,8 +29,15 @@ elif [ $NR_DEVICE_TREE_BASLER -eq 2 ]; t
28+if [ ! -z "$BASLER" ]; then 26 # Available configurations: dual_basler_1080p60, dual_basler_1080p60hdr
29 echo "Starting isp_media_server for Basler daA3840-30mc" 27 exec ./run.sh -c dual_basler_1080p60 -lm
30- 28
31 cd $RUNTIME_DIR 29+elif [ ! -z "$DMESG_BASLER" ]; then
32 # Default configuration for Basler daA3840-30mc: basler_4k 30+
33 # Available configurations: basler_4k, basler_1080p60, basler_4khdr, basler_1080p60hdr 31+ echo "Starting isp_media_server for generic Basler"
34- exec ./run.sh -c basler_4k -lm 32+
35- 33+ cd $RUNTIME_DIR
36+ #exec ./run.sh -c basler_4k
37+ exec ./run.sh -c basler_1080p60 34+ exec ./run.sh -c basler_1080p60
35+
38 else 36 else
39 # no device tree found exit with code no device or address 37 # no device tree found exit with code no device or address
40- echo "No device tree found for Basler, check dtb file!" >&2 38- echo "No device tree found for Basler, check dtb file!" >&2
41+ echo "Basler camera not found!" >&2 39+ echo "Basler camera not found!" >&2
42 exit 6 40 exit 6
43 fi 41 fi
44--
452.29.2
46
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.6.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb
index 363089f0..3c717c8d 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.6.0.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb
@@ -1,26 +1,25 @@
1# Copyright 2020 NXP 1# Copyright 2020-2021 NXP
2 2
3DESCRIPTION = "i.MX Verisilicon Software ISP" 3DESCRIPTION = "i.MX Verisilicon Software ISP"
4LICENSE = "Proprietary" 4LICENSE = "Proprietary"
5LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" 5LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
6DEPENDS = "python3 libdrm virtual/libg2d"
6 7
7 8SRC_URI = " \
8inherit fsl-eula-unpack cmake systemd 9 ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
9 10 file://0001-start_isp.sh-fix-test-to-be-generic.patch \
10SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \ 11 file://0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch \
11 file://0001-BufferManager.h-add-missing-header-file.patch;patchdir=.. \
12 file://0001-imx8-isp.service-do-not-prevent-restart-of-service.patch;patchdir=.. \
13 file://0001-run.sh-fix-bashism.patch;patchdir=.. \
14 file://0001-start_isp.sh-fix-test-to-be-generic.patch;patchdir=.. \
15" 12"
16 13
17SRC_URI[md5sum] = "2246009411af32b1e02fbb0b242a0fc0" 14SRC_URI[md5sum] = "75f79ba556c47172b9a0cbc3a877e604"
18SRC_URI[sha256sum] = "7a245abb5fee23319f59b970db0bb014a2932fd6d5bd44f16f7dd31bbe25003a" 15SRC_URI[sha256sum] = "28e2ee909f29a256c4eac87ef8336932d90a88a2a183389ac0868212954af42c"
19 16
20S = "${WORKDIR}/${PN}-${PV}/appshell" 17inherit fsl-eula-unpack cmake systemd use-imx-headers
21 18
22DEPENDS = "python3 libdrm" 19# Build the sub-folder appshell
20OECMAKE_SOURCEPATH = "${S}/appshell"
23 21
22# Use make instead of ninja
24OECMAKE_GENERATOR = "Unix Makefiles" 23OECMAKE_GENERATOR = "Unix Makefiles"
25 24
26SYSTEMD_SERVICE_${PN} = "imx8-isp.service" 25SYSTEMD_SERVICE_${PN} = "imx8-isp.service"
@@ -39,6 +38,7 @@ EXTRA_OECMAKE += " \
39 -DENABLE_IRQ=1 \ 38 -DENABLE_IRQ=1 \
40 -DPARTITION_BUILD=0 \ 39 -DPARTITION_BUILD=0 \
41 -D3A_SRC_BUILD=0 \ 40 -D3A_SRC_BUILD=0 \
41 -DIMX_G2D=ON \
42 -Wno-dev \ 42 -Wno-dev \
43" 43"
44 44
@@ -55,30 +55,34 @@ do_install() {
55 cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin 55 cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin
56 cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin 56 cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin
57 cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin 57 cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin
58 cp -r ${WORKDIR}/${PN}-${PV}/mediacontrol/case/ ${D}/opt/imx8-isp/bin 58 cp -r ${WORKDIR}/${BP}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin
59 cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} 59 cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir}
60 cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} 60 cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir}
61 61
62 cp ${WORKDIR}/${PN}-${PV}/imx/run.sh ${D}/opt/imx8-isp/bin 62 cp ${WORKDIR}/${BP}/imx/run.sh ${D}/opt/imx8-isp/bin
63 cp ${WORKDIR}/${PN}-${PV}/imx/start_isp.sh ${D}/opt/imx8-isp/bin 63 cp ${WORKDIR}/${BP}/imx/start_isp.sh ${D}/opt/imx8-isp/bin
64 64
65 chmod +x ${D}/opt/imx8-isp/bin/run.sh 65 chmod +x ${D}/opt/imx8-isp/bin/run.sh
66 chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh 66 chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh
67 67
68 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 68 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
69 install -d ${D}${systemd_system_unitdir} 69 install -d ${D}${systemd_system_unitdir}
70 install -m 0644 ${WORKDIR}/${PN}-${PV}/imx/imx8-isp.service ${D}${systemd_system_unitdir} 70 install -m 0644 ${WORKDIR}/${BP}/imx/imx8-isp.service ${D}${systemd_system_unitdir}
71 fi 71 fi
72} 72}
73 73
74RDEPENDS_${PN} = "libdrm libpython3" 74# The build contains a mix of versioned and unversioned libraries, so
75 75# the default packaging configuration needs some modifications
76PACKAGES = "${PN} ${PN}-dev ${PN}-dbg" 76FILES_SOLIBSDEV = ""
77FILES_${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
78FILES_${PN}-dev += " \
79 ${libdir}/libjsoncpp.so \
80 ${libdir}/libos08a20.so \
81 ${libdir}/libov2775.so \
82"
77 83
78FILES_${PN} = "${libdir} /opt ${systemd_system_unitdir}/imx8-isp.service" 84INSANE_SKIP_${PN} = "rpaths"
79FILES_${PN}-dbg += "${libdir}/.debug"
80 85
81INSANE_SKIP_${PN} += "rpaths dev-deps dev-so" 86RDEPENDS_${PN} = "libdrm libpython3"
82INSANE_SKIP_${PN}-dev += "rpaths dev-elf"
83 87
84COMPATIBLE_MACHINE = "(imx|use-nxp-bsp)" 88COMPATIBLE_MACHINE = "(mx8mp)"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2021.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc
index 05f3d951..839a503d 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2021.04.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc
@@ -6,14 +6,14 @@ inherit fsl-u-boot-localversion
6LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" 7LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
8 8
9DEPENDS += "bison-native" 9DEPENDS += "flex-native bison-native"
10 10
11SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" 11SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
12 12
13SRCREV = "31cf6b483b580898c7387ed97e69304ea8cc7c96" 13SRCREV = "587e796995604fb669a3552daae682b4d6d346d9"
14SRCBRANCH = "2021.04+fslc" 14SRCBRANCH = "2021.07+fslc"
15 15
16PV = "v2021.04+git${SRCPV}" 16PV = "v2021.07+git${SRCPV}"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19B = "${WORKDIR}/build" 19B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb
index 7f02746b..7f02746b 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb
index 2492f450..2492f450 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2021.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb
index 86620c44..4f97c722 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2021.07.bb
@@ -8,7 +8,7 @@ version, or because it is not applicable for upstreaming."
8 8
9inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')} 9inherit ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '1', 'imx-boot-container', '')}
10 10
11DEPENDS += "bc-native dtc-native lzop-native" 11DEPENDS += "bc-native dtc-native python3-setuptools-native"
12 12
13# Location known to imx-boot component, where U-Boot artifacts 13# Location known to imx-boot component, where U-Boot artifacts
14# should be additionally deployed. 14# should be additionally deployed.
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..40772e2b 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2020.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2021.04.bb
@@ -3,7 +3,7 @@
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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-01 13:40:47 +0000