From 141399fa45667f852bb606055a54305c2f35f503 Mon Sep 17 00:00:00 2001
From: Neel Gandhi <neel.gandhi@amd.com>
Date: Tue, 20 Jun 2023 19:37:38 +0530
Subject: vcu: Update recipes to keep makefiles compatible with original vcu
 patches

Install vcu-omx-il and ctrl-sw application executables with the help of makefiles
instead of build recipes by providing INSTALL_PATH macro to the makefile, so that
vcu makefiles will be compatible with original files.

kernel-module-vcu change:
    dmaproxy: Fix leak in case of DMA channel is not available

libomxil-xlnx changes:
    Revert "Update name of omx test application binaries"
    Makefile: Enable install rules

libvcu-xlnx changes:
    chore: update to revision 20230530
    Makefile: Copy executables from bin directory

vcu-firmware change:
    chore: update to revision 20230530

Signed-off-by: Neel Gandhi <neel.gandhi@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 .../recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb             | 2 +-
 meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb    | 5 ++---
 meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb      | 7 ++-----
 meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb     | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
index 007e473b..7f2b205f 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2023.2.bb
@@ -13,7 +13,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 BRANCH = "master"
 REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https"
-SRCREV = "b7664198e562afa3e2c96174b6e746f3770672f1"
+SRCREV = "689c8d823b383e2a8a5249be49de627f866cfaf2"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = " \
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb
index 7902ec6d..80d0155e 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2023.2.bb
@@ -8,7 +8,7 @@ PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE',
 
 BRANCH ?= "master"
 REPO   ?= "git://github.com/Xilinx/vcu-omx-il.git;protocol=https"
-SRCREV = "10531499e0361b1ce97e0214ffa4e4b32887565e"
+SRCREV = "3a04b5adc661a0eced626c1373dbbfe699ae6fe0"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
@@ -37,8 +37,7 @@ do_install() {
 
     install -m 0644 ${S}/omx_header/*.h ${D}${includedir}/vcu-omx-il
 
-    install -Dm 0755 ${S}/bin/omx_decoder ${D}/${bindir}/omx_decoder
-    install -Dm 0755 ${S}/bin/omx_encoder ${D}/${bindir}/omx_encoder
+    oe_runmake install INSTALL_PATH=${D}${bindir}
 
     oe_libinstall -C ${S}/bin/ -so libOMX.allegro.core ${D}/${libdir}/
     oe_libinstall -C ${S}/bin/ -so libOMX.allegro.video_decoder ${D}/${libdir}/
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb
index 0c0548d7..fdadca3f 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2023.2.bb
@@ -8,7 +8,7 @@ PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE',
 
 BRANCH ?= "master"
 REPO   ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
-SRCREV = "5cff15b1f76e10e727798967428030af9c8a9a33"
+SRCREV = "84b0856cad7844d69f57ac4d9447c20930875475"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
@@ -27,10 +27,7 @@ do_install() {
     install -d ${D}${libdir}
     install -d ${D}${includedir}/vcu-ctrl-sw/include
 
-    install -Dm 0755 ${S}/bin/ctrlsw_encoder ${D}/${bindir}/ctrlsw_encoder
-    install -Dm 0755 ${S}/bin/ctrlsw_decoder ${D}/${bindir}/ctrlsw_decoder
-
-    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include
+    oe_runmake install_headers INSTALL_HDR_PATH=${D}${includedir}/vcu-ctrl-sw/include INSTALL_PATH=${D}/${bindir}
     oe_libinstall -C ${S}/bin/ -so liballegro_decode ${D}/${libdir}/
     oe_libinstall -C ${S}/bin/ -so liballegro_encode ${D}/${libdir}/
 }
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb
index 837a06b3..4ab139fc 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2023.2.bb
@@ -10,7 +10,7 @@ S  = "${WORKDIR}/git"
 
 BRANCH ?= "master"
 REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
-SRCREV = "535a1a4101d3231cd59521f7cdd871d091a4cc39"
+SRCREV = "f4ab98d26aa3e244a487f518f5a76071137c8402"
 
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI   = "${REPO};${BRANCHARG}"
-- 
cgit v1.2.3-54-g00ecf