diff options
Diffstat (limited to 'recipes-bsp/imx-test')
3 files changed, 36 insertions, 72 deletions
diff --git a/recipes-bsp/imx-test/imx-test/0001-mxc_v4l2_test-fix-compilation-error-produced-by-gcc9.patch b/recipes-bsp/imx-test/imx-test/0001-mxc_v4l2_test-fix-compilation-error-produced-by-gcc9.patch deleted file mode 100644 index 3fb9d4ef..00000000 --- a/recipes-bsp/imx-test/imx-test/0001-mxc_v4l2_test-fix-compilation-error-produced-by-gcc9.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d2e35983281a811b38e540ab82e7643322e84aab Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> -Date: Wed, 4 Dec 2019 14:17:50 +0000 -Subject: [PATCH] mxc_v4l2_test: fix compilation error produced by gcc9 - -Fix trivial compilation error when GCC9 is used: - -error: call to '__open_missing_mode' declared with attribute error: open -with O_CREAT or O_TMPFILE in second argument needs 3 arguments - -This is now caused by not explicitly supplying the mode when O_CREAT is -used as disposition. - -Upstream-Status: Pending - -Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> ---- - test/mxc_v4l2_test/mx8_v4l2_cap_drm.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/test/mxc_v4l2_test/mx8_v4l2_cap_drm.c b/test/mxc_v4l2_test/mx8_v4l2_cap_drm.c -index 6e10744..d63b2db 100644 ---- a/test/mxc_v4l2_test/mx8_v4l2_cap_drm.c -+++ b/test/mxc_v4l2_test/mx8_v4l2_cap_drm.c -@@ -561,11 +561,7 @@ static int open_save_file(struct video_channel *video_ch) - - for (i = 0; i < NUM_SENSORS; i++) { - if ((g_cam >> i) & 0x01) { --#ifdef BUILD_FOR_ANDROID - fd = open(video_ch[i].save_file_name, O_RDWR | O_CREAT, 0660); --#else -- fd = open(video_ch[i].save_file_name, O_RDWR | O_CREAT); --#endif - if (fd < 0) { - v4l2_err("Channel[%d] unable to create recording file\n", i); - while (i) --- -2.17.1 - diff --git a/recipes-bsp/imx-test/imx-test_00.00.00.bb b/recipes-bsp/imx-test/imx-test_00.00.00.bb index c29e6a62..1850a16a 100644 --- a/recipes-bsp/imx-test/imx-test_00.00.00.bb +++ b/recipes-bsp/imx-test/imx-test_00.00.00.bb @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf50|vf60)" +COMPATIBLE_MACHINE = "(imx-generic-bsp)" diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index 184ee406..930cdf94 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -1,28 +1,28 @@ # Copyright (C) 2012-2016 O.S. Systems Software LTDA. # Copyright (C) 2013-2016 Freescale Semiconductor -# Copyright (C) 2017-2019 NXP +# Copyright (C) 2017-2022 NXP SUMMARY = "Test programs for i.MX BSP" DESCRIPTION = "Unit tests for the i.MX BSP" SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" -DEPENDS = "alsa-lib libdrm" -DEPENDS_append_mx6 = " imx-lib" -DEPENDS_append_mx7 = " imx-lib" -DEPENDS_append_imxvpu = " virtual/imxvpu" +DEPENDS = "alsa-lib freetype libdrm" +DEPENDS:append:imxvpu = " virtual/imxvpu" +DEPENDS:append:mx6-nxp-bsp = " imx-lib" +DEPENDS:append:mx7-nxp-bsp = " imx-lib" +DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib" +DEPENDS:append:mx93-nxp-bsp = " imx-lib" PE = "1" PV = "7.0+${SRCPV}" -SRCBRANCH = "imx_4.19.35_1.1.0" -SRC_URI = " \ - git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-mxc_v4l2_test-fix-compilation-error-produced-by-gcc9.patch \ - file://memtool_profile \ -" -SRCREV = "709d14b037e7a45af018875c4a880f8f9c198288" +SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ + file://memtool_profile" +SRCBRANCH = "lf-6.6.3_1.0.0" +SRCREV = "8a1fa37664a1e470cf86f1185c08e265e4602a9b" + S = "${WORKDIR}/git" inherit module-base use-imx-headers @@ -30,24 +30,29 @@ inherit module-base use-imx-headers INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -PLATFORM_mx6q = "IMX6Q" -PLATFORM_mx6dl = "IMX6Q" -PLATFORM_mx6sl = "IMX6SL" -PLATFORM_mx6sll = "IMX6SL" -PLATFORM_mx6sx = "IMX6SX" -PLATFORM_mx6ul = "IMX6UL" -PLATFORM_mx7d = "IMX7D" -PLATFORM_mx7ulp = "IMX7D" -PLATFORM_mx8 = "IMX8" +PLATFORM:mx6q-nxp-bsp = "IMX6Q" +PLATFORM:mx6dl-nxp-bsp = "IMX6Q" +PLATFORM:mx6sl-nxp-bsp = "IMX6SL" +PLATFORM:mx6sll-nxp-bsp = "IMX6SL" +PLATFORM:mx6sx-nxp-bsp = "IMX6SX" +PLATFORM:mx6ul-nxp-bsp = "IMX6UL" +PLATFORM:mx7d-nxp-bsp = "IMX7D" +PLATFORM:mx7ulp-nxp-bsp = "IMX7D" +PLATFORM:mx8-nxp-bsp = "IMX8" +PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP" +PLATFORM:mx93-nxp-bsp = "IMX8ULP" +PLATFORM:mx95-nxp-bsp = "IMX8" PARALLEL_MAKE = "-j 1" EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG_append_imxvpu = " vpu" +PACKAGECONFIG:append:imxvpu = " vpu" +PACKAGECONFIG:append:mx8m-nxp-bsp = " swpdm" 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}" @@ -71,13 +76,11 @@ do_install() { if [ -e ${WORKDIR}/clocks.sh ]; then install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh fi - install -d -m 0755 ${D}/home/root/ - install -m 0644 ${WORKDIR}/memtool_profile ${D}/home/root/.profile + install -d -m 0755 ${D}${ROOT_HOME}/ + install -m 0644 ${WORKDIR}/memtool_profile ${D}${ROOT_HOME}/.profile } -FILES_${PN} += "/unit_tests /home/root/.profile" -RDEPENDS_${PN} = "bash" - -FILES_${PN}-dbg += "/unit_tests/.debug" +FILES:${PN} += "/unit_tests ${ROOT_HOME}/.profile" +RDEPENDS:${PN} = "bash" -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" +FILES:${PN}-dbg += "/unit_tests/.debug" |