diff options
-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.patch | 14 | ||||
-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-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.13.0.bb (renamed from recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.11.0.bb) | 4 |
4 files changed, 15 insertions, 15 deletions
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 | ||
3 | DESCRIPTION = "Basler camera binary drivers" | 3 | DESCRIPTION = "Basler camera binary drivers" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b" |
6 | 6 | ||
7 | inherit fsl-eula-unpack | 7 | 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] = "2e0bd011f8d72e1957c4d6da55364be5" | 11 | SRC_URI[md5sum] = "8d99375cc9e7f1573d984c6a989655b1" |
12 | SRC_URI[sha256sum] = "4be5c4f26dc0f3f5e031c2d8ac295ff5768489e7e978aaa901030fd77b5209c2" | 12 | SRC_URI[sha256sum] = "3f09f7a2de290b0580faee9e180a78a322144d316fbbbc80b8a36fb83ab538b1" |
13 | 13 | ||
14 | do_install() { | 14 | do_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 | ||
13 | Index: isp-imx-4.2.2.11.0/imx/start_isp.sh | 13 | Index: 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 3c717c8d..ad44065a 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,7 +2,7 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "i.MX Verisilicon Software ISP" | 3 | DESCRIPTION = "i.MX Verisilicon Software ISP" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b" |
6 | DEPENDS = "python3 libdrm virtual/libg2d" | 6 | DEPENDS = "python3 libdrm virtual/libg2d" |
7 | 7 | ||
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
@@ -11,8 +11,8 @@ SRC_URI = " \ | |||
11 | file://0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch \ | 11 | file://0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[md5sum] = "75f79ba556c47172b9a0cbc3a877e604" | 14 | SRC_URI[md5sum] = "123feed48302fea2a1be8572e913ae47" |
15 | SRC_URI[sha256sum] = "28e2ee909f29a256c4eac87ef8336932d90a88a2a183389ac0868212954af42c" | 15 | SRC_URI[sha256sum] = "e775975684aab4211f0bf8c5e2c6604ba46b83c5586937000675e044a50d77b8" |
16 | 16 | ||
17 | inherit fsl-eula-unpack cmake systemd use-imx-headers | 17 | inherit fsl-eula-unpack cmake systemd use-imx-headers |
18 | 18 | ||
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.11.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.13.0.bb index 973cc51b..7eee17d1 100644 --- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.11.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.13.0.bb | |||
@@ -4,13 +4,13 @@ DESCRIPTION = "Kernel loadable module for ISP" | |||
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" | 5 | LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" |
6 | 6 | ||
7 | SRCBRANCH = "imx_5.4.70_2.3.2" | 7 | SRCBRANCH = "imx_5.10_2.0.0" |
8 | ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https" | 8 | ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https" |
9 | 9 | ||
10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
11 | ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \ | 11 | ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \ |
12 | " | 12 | " |
13 | SRCREV = "6cbf264313b4859c985c8d66bae19b522996de6c" | 13 | SRCREV = "47588cb88cc75400b5d2c35a17527e99b752d9be" |
14 | 14 | ||
15 | S = "${WORKDIR}/git/vvcam/v4l2" | 15 | S = "${WORKDIR}/git/vvcam/v4l2" |
16 | 16 | ||