qmss-lld: Upgrade to version 2.1.0.12

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>

3 files changed, 25 insertions, 6 deletions

diff --git a/recipes-bsp/qmss-lld/qmss-lld-test_git.bb b/recipes-bsp/qmss-lld/qmss-lld-test_git.bb
index 60a35b12..5b9ad4ed 100644
--- a/recipes-bsp/qmss-lld/qmss-lld-test_git.bb
+++ b/recipes-bsp/qmss-lld/qmss-lld-test_git.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "TI QMSS low level driver unit test and example binaries"
 
-DEPENDS="common-csl-ip rm-lld cppi-lld qmss-lld"
+DEPENDS="common-csl-ip rm-lld cppi-lld qmss-lld cmem"
 
 include qmss-lld.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 CHOICELIST = "yes no"
 
diff --git a/recipes-bsp/qmss-lld/qmss-lld.inc b/recipes-bsp/qmss-lld/qmss-lld.inc
index 9520cea6..fae58e18 100644
--- a/recipes-bsp/qmss-lld/qmss-lld.inc
+++ b/recipes-bsp/qmss-lld/qmss-lld.inc
@@ -9,15 +9,15 @@ QMSS_LLD_GIT_PROTOCOL = "git"
 QMSS_LLD_GIT_BRANCH = "master"
 QMSS_LLD_GIT_DESTSUFFIX = "git/ti/drv/qmss"
 
-# commit ID corresponding to DEV.QMSS_LLD.02.01.00.11
-QMSS_LLD_SRCREV = "2024ab2d411c1a6dd3f5e768a3cb30c2a685f1e4"
+# commit ID corresponding to DEV.QMSS_LLD.02.01.00.12
+QMSS_LLD_SRCREV = "6b093515f38c6e4d3a8014903a563a9b89fd7c98"
 
 BRANCH ="${QMSS_LLD_GIT_BRANCH}"
 SRC_URI = "${QMSS_LLD_GIT_URI};destsuffix=${QMSS_LLD_GIT_DESTSUFFIX};protocol=${QMSS_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${QMSS_LLD_SRCREV}"
 
-PV = "02.01.00.11"
-INC_PR = "r2"
+PV = "02.01.00.12"
+INC_PR = "r0"
 
 DEVICELIST = "k2h k2k k2l k2e"
 DEVICELIST_k2hk-evm = "k2h k2k"
@@ -25,3 +25,9 @@ DEVICELIST_k2l-evm = "k2l"
 DEVICELIST_k2e-evm = "k2e"
 
 S = "${WORKDIR}/${QMSS_LLD_GIT_DESTSUFFIX}"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/qmss-lld:"
+
+SRC_URI_append = " \
+    file://qmss-ld-fix-firmware-installation.patch \
+"
diff --git a/recipes-bsp/qmss-lld/qmss-lld/qmss-ld-fix-firmware-installation.patch b/recipes-bsp/qmss-lld/qmss-lld/qmss-ld-fix-firmware-installation.patch
new file mode 100644
index 00000000..a48aae19
--- /dev/null
+++ b/recipes-bsp/qmss-lld/qmss-lld/qmss-ld-fix-firmware-installation.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile_armv7 b/makefile_armv7
+index a1fd5c0..d050ace 100644
+--- a/makefile_armv7
++++ b/makefile_armv7
+@@ -117,7 +117,7 @@ install:
+        install -d $(INSTALL_LIB_BASE_DIR)
+        $(CP) ./*.h                $(INSTALL_INC_BASE_DIR)/ti/drv/qmss
+        $(CP) ./include/*.h        $(INSTALL_INC_BASE_DIR)/ti/drv/qmss/include
+-       $(CP) ./firmware/*.h       $(INSTALL_INC_BASE_DIR)/ti/drv/qmss/firmware
++       $(CP) -r ./firmware/*      $(INSTALL_INC_BASE_DIR)/ti/drv/qmss/firmware
+        $(CP) -r ./device $(INSTALL_INC_BASE_DIR)/ti/drv/qmss/
+        @$(CP) -r $(ARMV7LIBDIR)/*.a         $(INSTALL_LIB_BASE_DIR)
+        @$(CP) -r $(ARMV7LIBDIR)/*.so        $(INSTALL_LIB_BASE_DIR)