From e8fb1c9fed1981494134e945bf7978113583dba6 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Tue, 12 Jan 2021 22:46:10 +0000 Subject: [PATCH] imx-test: upgrade to release 5.4.70_2.3.0 Upgrade recipe to match with release 5.4.70_2.3.0 from NXP. Drop patch from the layer that is applied upstream, it is covered by the commit (35881dd "MLK-24751 pxp_test: fix build break with GCC 9.2") Add new package config option to include SW PDM. Following commits are included in this update: ---- 90fd716 MLK-25007: mxc_audio_monitor: use double type to improve the precision 9e3378e MLK-24989: mxc_audio_monitor: Add support for 8MP f98b5a8 MLK-24896 mxc_v4l2_vpu_test: integrate VSI unit-test parser 838ea7f MLK-24829:mxc_v4l2_vpu_test: encoder: fix crop setting doesn't take effect 8939e71 MLK-24797: mx8_v4l2_cap_drm.c: fix camera preview not working when run six sensors af1091d MLK-24692: camera: mx8_v4l2_cap_drm.c support sixteen camera channels 35881dd MLK-24751 pxp_test: fix build break with GCC 9.2 709656b MLK-24736 mxc_v4l2_vpu_test: add parser for JPEG format 7169666 MLK-24533:mxc_v4l2_vpu_test: encoder: align the max buffer count to the v4l2 max buffer count 2ae964b MLK-24499: [8QM_MEK/8QXP_MEK]mxc:vpu_windsor: set low latency mode through set bframe 5ea9607 set hevc profile and level 527092b MLK-24466-2 mxc_v4l2_vpu_test: encoder: refine parser ---- Signed-off-by: Andrey Zhizhikin --- ...1-pxp-test-Fix-format-security-error.patch | 32 ------------------- recipes-bsp/imx-test/imx-test_git.bb | 6 ++-- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 recipes-bsp/imx-test/imx-test/0001-pxp-test-Fix-format-security-error.patch 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 1fe997d7..00000000 --- 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" -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 ---- - 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 b9c12e18..da488bd3 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}" -- 2.40.1