From 99ee02c1aa0bae9f66ae78248a337366a128b620 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 19 Jan 2023 17:22:58 +0100 Subject: isp-imx: don't leave systemd service in failed state If no camera is configured in the device tree systemd imx8-isp.service goes to the failed state. Prevent that. Related-to: ELB-5002 Signed-off-by: Max Krummenacher (cherry picked from commit 9baec9cc6777638b44249877d453d03fcb298632) --- ...rt_isp-don-t-report-error-if-no-camera-is.patch | 32 ++++++++++++++++++++++ recipes-bsp/isp-imx/isp-imx_%.bbappend | 4 +++ 2 files changed, 36 insertions(+) create mode 100644 recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch create mode 100644 recipes-bsp/isp-imx/isp-imx_%.bbappend diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch new file mode 100644 index 0000000..2adcf8e --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch @@ -0,0 +1,32 @@ +From 3443f18dc9ab8950071d6299c7a5da86055f3318 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Thu, 19 Jan 2023 15:51:24 +0000 +Subject: [PATCH] isp-imx: start_isp: don't report error if no camera is + configured + +The script currently returns '6' when no known camera is configured +in the device tree. The end result is that the systemd imx8-isp.service +goes to the failed state. +Return '0' in that case as obviously the device tree doesn't have a +camera configured and the service is not needed. + +Related-to: ELB-5002 +Signed-off-by: Max Krummenacher +--- + imx/start_isp.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/imx/start_isp.sh b/imx/start_isp.sh +index 95cbc19..d603f8f 100755 +--- a/imx/start_isp.sh ++++ b/imx/start_isp.sh +@@ -74,5 +74,5 @@ elif [ $NR_DEVICE_TREE_OS08A20 -eq 2 ]; then + else + # no device tree found exit with code no device or address + echo "No device tree found for Basler camera or os08a20, check dtb file!" >&2 +- exit 6 ++ exit 0 + fi +-- +2.35.3 + diff --git a/recipes-bsp/isp-imx/isp-imx_%.bbappend b/recipes-bsp/isp-imx/isp-imx_%.bbappend new file mode 100644 index 0000000..ff5a0bf --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx_%.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/isp-imx/:" +SRC_URI:append:tdx = " \ + file://0001-isp-imx-start_isp-don-t-report-error-if-no-camera-is.patch \ +" -- cgit v1.2.3