isp-imx: Upgrade to 4.2.2.11.0

Drop upstreamed patches:
- 0001-BufferManager.h-add-missing-header-file.patch
- 0001-imx8-isp.service-do-not-prevent-restart-of-service.patch
- 0001-run.sh-fix-bashism.patch

Rework patch 0001-start_isp.sh-fix-test-to-be-generic.patch. Let the
startup use the default device tree-based implementation as-is, and
failing that, try the generic dmesg-based implementation.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

5 files changed, 22 insertions, 107 deletions

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 @@
-From 325b4bf687ead6598de702df9829a4dad0b6458c Mon Sep 17 00:00:00 2001
-From: Chris Dimich <Chris.Dimich@boundarydevices.com>
-Date: Mon, 15 Feb 2021 22:51:01 -0800
-Subject: [PATCH 1/1] BufferManager.h: add missing header file
-
-Needed to compile with Yocto Gatesgarth.
-
-Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
----
- mediacontrol/buffer/BufferManager.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mediacontrol/buffer/BufferManager.h b/mediacontrol/buffer/BufferManager.h
-index f5691e111..4d5ce6965 100755
---- a/mediacontrol/buffer/BufferManager.h
-+++ b/mediacontrol/buffer/BufferManager.h
-@@ -16,6 +16,7 @@
- #include <deque>
- #include <map>
- #include <EAutoLock.h>
-+#include <stdint.h>
- 
- enum {
-     BUFFER_TYPE_INPUT_FREE = 0,
--- 
-2.29.0
-
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 @@
-From ce8dd8db37de85952419a5b28a48ec20d1310cf7 Mon Sep 17 00:00:00 2001
-From: Chris Dimich <Chris.Dimich@boundarydevices.com>
-Date: Wed, 17 Feb 2021 14:09:39 -0800
-Subject: [PATCH 1/1] imx8-isp.service: do not prevent restart of service
-
-Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
----
- imx/imx8-isp.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/imx/imx8-isp.service b/imx/imx8-isp.service
-index 93d2e9b3a..4f0cd88ca 100644
---- a/imx/imx8-isp.service
-+++ b/imx/imx8-isp.service
-@@ -10,7 +10,7 @@ StartLimitBurst=5
- Restart=on-failure
- RestartSec=5s
- # ENXIO            
--RestartPreventExitStatus=6
-+#RestartPreventExitStatus=6
- ExecStart=/opt/imx8-isp/bin/start_isp.sh
- 
- [Install]
--- 
-2.29.0
-
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 @@
-From 7070abd558e753b89955a966bb83e11f5a7b8462 Mon Sep 17 00:00:00 2001
-From: Chris Dimich <Chris.Dimich@boundarydevices.com>
-Date: Wed, 17 Feb 2021 14:06:26 -0800
-Subject: [PATCH 1/1] run.sh: fix bashism
-
-Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
----
- imx/run.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/imx/run.sh b/imx/run.sh
-index c0d676ae7..ebeb7a6e7 100755
---- a/imx/run.sh
-+++ b/imx/run.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Start the isp_media_server in the configuration from user
- # (c) NXP 2020
--- 
-2.29.0
-
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>
  imx/start_isp.sh | 13 +++++--------
  1 file changed, 5 insertions(+), 8 deletions(-)
 
-diff --git a/imx/start_isp.sh b/imx/start_isp.sh
-index 02ee7d3b5..fee0492ad 100755
---- a/imx/start_isp.sh
-+++ b/imx/start_isp.sh
-@@ -7,21 +7,18 @@
- #
+Index: isp-imx-4.2.2.11.0/imx/start_isp.sh
+===================================================================
+--- isp-imx-4.2.2.11.0.orig/imx/start_isp.sh
++++ isp-imx-4.2.2.11.0/imx/start_isp.sh
+@@ -8,6 +8,7 @@
  
  RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
--DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l 2> /dev/null)
--
-+BASLER=`dmesg | grep Basler`
+ NR_DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null)
++DMESG_BASLER=`dmesg | grep Basler`
  
  # check if the basler device has been enabled in the device tree
--if [ -f "$DEVICE_TREE_BASLER" ]; then
--
-+if [ ! -z "$BASLER" ]; then
-        echo "Starting isp_media_server for Basler daA3840-30mc"
--
-        cd $RUNTIME_DIR
-        # Default configuration for Basler daA3840-30mc: basler_4k
-        # Available configurations: basler_4k, basler_1080p60, basler_4khdr, basler_1080p60hdr
--       exec ./run.sh -c basler_4k -lm
--
-+       #exec ./run.sh -c basler_4k
+ if [ $NR_DEVICE_TREE_BASLER -eq 1 ]; then
+@@ -28,8 +29,15 @@ elif [ $NR_DEVICE_TREE_BASLER -eq 2 ]; t
+        # Available configurations: dual_basler_1080p60, dual_basler_1080p60hdr
+        exec ./run.sh -c dual_basler_1080p60 -lm
+ 
++elif [ ! -z "$DMESG_BASLER" ]; then
++
++       echo "Starting isp_media_server for generic Basler"
++
++       cd $RUNTIME_DIR
 +       exec ./run.sh -c basler_1080p60
++
  else
         # no device tree found exit with code no device or address
 -       echo "No device tree found for Basler, check dtb file!" >&2
 +       echo "Basler camera not found!" >&2
         exit 6
  fi
--- 
-2.29.2
-
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..1e363d13 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,21 +1,17 @@
-# Copyright 2020 NXP
+# Copyright 2020-2021 NXP
 
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a"
-
+LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
 
 inherit fsl-eula-unpack cmake systemd
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \
-           file://0001-BufferManager.h-add-missing-header-file.patch;patchdir=.. \
-           file://0001-imx8-isp.service-do-not-prevent-restart-of-service.patch;patchdir=.. \
-           file://0001-run.sh-fix-bashism.patch;patchdir=.. \
            file://0001-start_isp.sh-fix-test-to-be-generic.patch;patchdir=.. \
 "
 
-SRC_URI[md5sum] = "2246009411af32b1e02fbb0b242a0fc0"
-SRC_URI[sha256sum] = "7a245abb5fee23319f59b970db0bb014a2932fd6d5bd44f16f7dd31bbe25003a"
+SRC_URI[md5sum] = "75f79ba556c47172b9a0cbc3a877e604"
+SRC_URI[sha256sum] = "28e2ee909f29a256c4eac87ef8336932d90a88a2a183389ac0868212954af42c"
 
 S = "${WORKDIR}/${PN}-${PV}/appshell"