2 files changed, 3 insertions, 35 deletions

diff --git a/recipes-bsp/imx-test/imx-test/0001-pxp-test-Fix-format-security-error.patch b/recipes-bsp/imx-test/imx-test/0001-pxp-test-Fix-format-security-error.patch
deleted file mode 100644
index 1fe997d79..000000000
--- a/recipes-bsp/imx-test/imx-test/0001-pxp-test-Fix-format-security-error.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 97a55fe4b1e02b9a4992517234a8b24f8f9f0009 Mon Sep 17 00:00:00 2001
-From: "i.MX Yocto Project Build" <imx.build@nxp.com>
-Date: Mon, 27 Jan 2020 13:43:47 -0600
-Subject: [PATCH] pxp test: Fix format-security error
-
-| pxp_lib_test/pxp_test.c: In function 'main':
-| pxp_lib_test/pxp_test.c:541:2: error: format not a string literal and no format arguments [-Werror=format-security]
-|   541 |  printf(usage);
-|       |  ^~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
----
- test/pxp_lib_test/pxp_test.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/pxp_lib_test/pxp_test.c b/test/pxp_lib_test/pxp_test.c
-index 107198f..72c984d 100644
---- a/test/pxp_lib_test/pxp_test.c
-+++ b/test/pxp_lib_test/pxp_test.c
-@@ -538,6 +538,6 @@ int main(int argc, char *argv[])
- 
-        return 0;
- usage:
--       printf(usage);
-+       printf("%s", usage);
-        return -1;
- }
--- 
-2.17.1
-
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index b9c12e183..da488bd31 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -16,13 +16,12 @@ DEPENDS_append_imxvpu = " virtual/imxvpu"
 PE = "1"
 PV = "7.0+${SRCPV}"
 
-SRCBRANCH = "imx_5.4.47_2.2.0"
+SRCBRANCH = "imx_5.4.70_2.3.0"
 SRC_URI = " \
     git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
-    file://0001-pxp-test-Fix-format-security-error.patch \
     file://memtool_profile \
 "
-SRCREV = "31623a4972bf6f2f4239b4667aeb33baba07a3c8"
+SRCREV = "90fd7168fe5f15de9b2b1992a719024fc73a185a"
 S = "${WORKDIR}/git"
 
 inherit module-base use-imx-headers
@@ -48,6 +47,7 @@ PACKAGECONFIG_append_imxvpu = " vpu"
 
 PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
 PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu"
+PACKAGECONFIG[swpdm] = "HAS_IMX_SW_PDM=true,HAS_IMX_SW_PDM=false,imx-sw-pdm"
 
 do_compile() {
     CFLAGS="${TOOLCHAIN_OPTIONS}"