From patchwork Mon Jul 11 16:49:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10062 X-Patchwork-Delegate: denis@denix.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B00AAC433EF for ; Mon, 11 Jul 2022 16:49:41 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web12.31289.1657558177015845791 for ; Mon, 11 Jul 2022 09:49:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=GruivVbV; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 26BGnY3Y002754; Mon, 11 Jul 2022 11:49:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1657558174; bh=Q7ZI1GLkFfiRGLIKqp9e8Zfh2lrLh9EoIJWH0VD8jPU=; h=From:To:CC:Subject:Date; b=GruivVbVfJtCI5C35hb4vXU34Nh1KNHqCEZQYO4RyxKyg5TFxcT4JOgSDOMO0Lzg6 RR3Z1Fy/oF795szzLBC2pHyZh4Y4+Q/7emzHF0ruWnd4byJ2SGkqviSSNNuJndpNnC /NASF18hvwrfA3k7PRNKe0KrxfYAyUwo4bZ0KhSQ= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 26BGnYlk000505 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 11 Jul 2022 11:49:34 -0500 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Mon, 11 Jul 2022 11:49:34 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Mon, 11 Jul 2022 11:49:34 -0500 Received: from ula0226330.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 26BGnXpp030722; Mon, 11 Jul 2022 11:49:33 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-arago][kirkstone/master][PATCH 1/3] ti-crypto-examples: Remove ti-crypto-examples Date: Mon, 11 Jul 2022 11:49:31 -0500 Message-ID: <20220711164933.21445-1-afd@ti.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 11 Jul 2022 16:49:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/13945 These examples have not been updated in a long time and are arguably not correct anymore. Remove this. Signed-off-by: Andrew Davis --- .../conf/distro/include/arago-source-ipk.inc | 3 -- .../packagegroup-arago-tisdk-crypto.bb | 1 - .../Makefile_ti-crypto-examples | 24 --------------- .../ti-tisdk-makefile_1.0.bb | 3 -- .../ti-crypto-examples_git.bb | 30 ------------------- 5 files changed, 61 deletions(-) delete mode 100644 meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ti-crypto-examples delete mode 100644 meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb diff --git a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc index c03d5383..75355710 100644 --- a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc +++ b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc @@ -46,9 +46,6 @@ SRCIPK_INSTALL_DIR:pn-ti-tisdk-licenses ?= "docs/licenses" CREATE_SRCIPK:pn-matrix-gui ?= "1" SRCIPK_INSTALL_DIR:pn-matrix-gui ?= "example-applications/${PN}-${PV}" -CREATE_SRCIPK:pn-ti-crypto-examples ?= "1" -SRCIPK_INSTALL_DIR:pn-ti-crypto-examples ?= "example-applications/${PN}-${PV}" - CREATE_SRCIPK:pn-qml-carinfo ?= "1" SRCIPK_INSTALL_DIR:pn-qml-carinfo ?= "example-applications/${PN}-${PV}" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb index f217f7d8..d2189a50 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb @@ -13,7 +13,6 @@ CRYPTO_SUPPORT = "\ openssl-engines \ " -#ti-crypto-examples CRYPTO_SUPPORT:append:ti33x = " cryptodev-module cryptodev-tests" CRYPTO_SUPPORT:append:ti43x = " cryptodev-module cryptodev-tests" CRYPTO_SUPPORT:append:dra7xx = " cryptodev-module cryptodev-tests" diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ti-crypto-examples b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ti-crypto-examples deleted file mode 100644 index 6ad07e9a..00000000 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_ti-crypto-examples +++ /dev/null @@ -1,24 +0,0 @@ -# ti-crypto-examples build targets -ti-crypto-examples: - @echo ================================= - @echo Building TI Crypto Examples - @echo ================================= - @cd example-applications; cd `find . -maxdepth 1 -type d -name "*ti-crypto-examples*"`; make release - -ti-crypto-examples_clean: - @echo ================================= - @echo Cleaning TI Crypto Examples - @echo ================================= - @cd example-applications; cd `find . -maxdepth 1 -type d -name "*ti-crypto-examples*"`; make clean - -ti-crypto-examples_install: - @echo =================================================== - @echo Installing TI Crypto Examples - Release version - @echo =================================================== - @cd example-applications; cd `find . -maxdepth 1 -type d -name "*ti-crypto-examples*"`; make install - -ti-crypto-examples_install_debug: - @echo ================================================= - @echo Installing TI Crypto Examples - Debug Version - @echo ================================================= - @cd example-applications; cd `find . -maxdepth 1 -type d -name "*ti-crypto-examples*"`; make install_debug diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb index 85b99bf2..6737d7fd 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb @@ -18,7 +18,6 @@ SRC_URI = "\ file://Makefile_u-boot-legacy \ file://Makefile_matrix-gui \ file://Makefile_arm-benchmarks \ - file://Makefile_ti-crypto-examples \ file://Makefile_am-sysinfo \ file://Makefile_av-examples \ file://Makefile_u-boot-spl \ @@ -76,7 +75,6 @@ MAKEFILES = "" # Add device specific make targets MAKEFILES:append:ti33x = " u-boot-spl \ - ti-crypto-examples \ linux-dtbs \ cryptodev \ ti-sgx-ddk-km \ @@ -86,7 +84,6 @@ MAKEFILES:append:ti33x = " u-boot-spl \ pdm-anomaly-detection \ " MAKEFILES:append:ti43x = " u-boot-spl \ - ti-crypto-examples \ linux-dtbs \ cryptodev \ dual-camera-demo \ diff --git a/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb b/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb deleted file mode 100644 index 943a1b2b..00000000 --- a/meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "TI Cryptography Example Applications" -HOMEPAGE = "http://arago-project.org/git/projects/?p=crypto-example-apps.git;a=summary" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://AES/aes_256.c;beginline=9;endline=35;md5=8edbb4dee965d2f2eb5ca2822addcae5" -SECTION = "console" -DEPENDS += "openssl" - -PR = "r7" - -BRANCH ?= "master" -SRCREV = "6f4b09fffe970bb6b448369875874e798ef282f6" - -SRC_URI = "git://arago-project.org/git/projects/crypto-example-apps.git;protocol=git;branch=${BRANCH}" - -S = "${WORKDIR}/git" - -do_compile() { - export CROSS_COMPILE=${TARGET_PREFIX} - export CFLAGS='${TARGET_CC_ARCH}' - # build the release version - oe_runmake release -} - -do_install() { - oe_runmake DESTDIR=${D} install -} - -python () { - raise bb.parse.SkipRecipe("skipping ti-crypto-examples") -} From patchwork Mon Jul 11 16:49:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10064 X-Patchwork-Delegate: denis@denix.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0FE4CCA47B for ; Mon, 11 Jul 2022 16:49:41 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web09.31386.1657558177171920065 for ; Mon, 11 Jul 2022 09:49:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=THNMCbwi; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 26BGnZlj002759; Mon, 11 Jul 2022 11:49:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1657558175; bh=NmhKLVjdcpMjdGTHaKxwdUVeLPMgcVjdDe0EJUaDOac=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=THNMCbwifod/AbD2pWgQkOfD9bChQjiR3MYfBzUeBapZZ22SjpynyKYI2N9x5Ampu rCBNxbhKZcsxwm/FUkPa/VCCZ8rEnqywev4qUWco5x+wRzC6DhV5HWo3hWdf2bgzwA IRHbtkz9IElB1Uk+zaES2YHi2Abfcr1hy+r+t1N8= Received: from DLEE102.ent.ti.com (dlee102.ent.ti.com [157.170.170.32]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 26BGnZNM046112 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 11 Jul 2022 11:49:35 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Mon, 11 Jul 2022 11:49:34 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Mon, 11 Jul 2022 11:49:34 -0500 Received: from ula0226330.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 26BGnXpq030722; Mon, 11 Jul 2022 11:49:34 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-arago][kirkstone/master][PATCH 2/3] big-data-ipc-demo: Merge include file and rename Date: Mon, 11 Jul 2022 11:49:32 -0500 Message-ID: <20220711164933.21445-2-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220711164933.21445-1-afd@ti.com> References: <20220711164933.21445-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 11 Jul 2022 16:49:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/13946 The include might have been intended to be used by an TI RTOS build but without this in the roadmap lets merge the include and rename this recipe without the -linux postfix. Signed-off-by: Andrew Davis --- .../conf/distro/include/arago-source-ipk.inc | 4 +-- ...ackagegroup-arago-tisdk-addons-sdk-host.bb | 2 +- .../packagegroup-arago-tisdk-addons.bb | 2 +- .../big-data-ipc-demo/big-data-ipc-demo.inc | 30 ------------------- ...-linux_git.bb => big-data-ipc-demo_git.bb} | 30 ++++++++++++------- 5 files changed, 24 insertions(+), 44 deletions(-) delete mode 100644 meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc rename meta-arago-extras/recipes-apps/big-data-ipc-demo/{big-data-ipc-demo-linux_git.bb => big-data-ipc-demo_git.bb} (54%) diff --git a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc index 75355710..ffa76ed3 100644 --- a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc +++ b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc @@ -361,5 +361,5 @@ SRCIPK_INSTALL_DIR:pn-imglib-c66x ?= "component-sources/imglib_c66x_${PV}" CREATE_SRCIPK:pn-vlib-c66x ?= "1" SRCIPK_INSTALL_DIR:pn-vlib-c66x ?= "component-sources/vlib_c66x_${PV}" -CREATE_SRCIPK:pn-big-data-ipc-demo-linux ?= "1" -SRCIPK_INSTALL_DIR:pn-big-data-ipc-demo-linux ?= "example-applications/${PN}-${PV}" +CREATE_SRCIPK:pn-big-data-ipc-demo ?= "1" +SRCIPK_INSTALL_DIR:pn-big-data-ipc-demo ?= "example-applications/${PN}-${PV}" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb index a741eb03..eabec6c4 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb @@ -58,7 +58,7 @@ EXTRA_LIBS = "" EXTRA_LIBS:append:omap-a15 = " \ cmem-mod-source \ uio-module-drv-source \ - big-data-ipc-demo-linux-source \ + big-data-ipc-demo-source \ " #EXTRA_LIBS:append:dra7xx = " \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb index 46182c9d..992549e6 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb @@ -109,7 +109,7 @@ EXTRA_PACKAGES:append:omap-a15 = " ti-ipc-examples-linux" EXTRA_PACKAGES:append:omapl138 = " ti-ipc-examples-linux" EXTRA_PACKAGES:append:omap-a15 = " \ - ${@bb.utils.contains('MACHINE_FEATURES','dsp','big-data-ipc-demo-linux big-data-ipc-demo-linux-firmware','',d)} \ + ${@bb.utils.contains('MACHINE_FEATURES','dsp','big-data-ipc-demo big-data-ipc-demo-firmware','',d)} \ " # acontis-atemsys diff --git a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc b/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc deleted file mode 100644 index 32ead99c..00000000 --- a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo.inc +++ /dev/null @@ -1,30 +0,0 @@ -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://makefile;beginline=1;endline=31;md5=2f2ea348b98d5cc7807ece7adcc2c43a" - -COMPATIBLE_MACHINE = "omap-a15" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -BIG_DATA_IPC_GIT_URI = "git://git.ti.com/processor-sdk/big-data-ipc-examples.git" -BIG_DATA_IPC_GIT_PROTOCOL = "git" -BIG_DATA_IPC_GIT_BRANCH = "master" - -# Below commit ID corresponds to "DEV.BIG_DATA_IPC.01.03.00.00" -BIG_DATA_IPC_SRCREV = "984edb3c69c8a1f51da02e0abcd2201319650894" - -BRANCH = "${BIG_DATA_IPC_GIT_BRANCH}" -SRC_URI = "${BIG_DATA_IPC_GIT_URI};protocol=${BIG_DATA_IPC_GIT_PROTOCOL};branch=${BRANCH}" - -SRCREV = "${BIG_DATA_IPC_SRCREV}" -PV = "01.03.00.00" - -S = "${WORKDIR}/git" - -PLATFORM = "UNKNOWN" -PLATFORM:omap-a15 = "DRA7XX" - -IPC_TARGETS = "" -IPC_TARGETS:omap-a15 = "\ - gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \ - ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \ - ti.targets.arm.elf.M4="${M4_TOOLCHAIN_INSTALL_DIR}" \ -" diff --git a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo-linux_git.bb b/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo_git.bb similarity index 54% rename from meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo-linux_git.bb rename to meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo_git.bb index b384bf87..779cef7f 100644 --- a/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo-linux_git.bb +++ b/meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo_git.bb @@ -1,7 +1,15 @@ SUMMARY = "TI Big data IPC: Host linux examples" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://makefile;beginline=1;endline=31;md5=2f2ea348b98d5cc7807ece7adcc2c43a" -require recipes-ti/includes/ti-paths.inc -require big-data-ipc-demo.inc +SRC_URI = "git://git.ti.com/processor-sdk/big-data-ipc-examples.git;protocol=git;branch=master" +SRCREV = "984edb3c69c8a1f51da02e0abcd2201319650894" +PV = "01.03.00.00" + +S = "${WORKDIR}/git" + +COMPATIBLE_MACHINE = "omap-a15" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit features_check @@ -15,30 +23,32 @@ DEPENDS = "ti-ipc \ ti-cgt6x-native \ " +PLATFORM = "UNKNOWN" +PLATFORM:omap-a15 = "DRA7XX" + +require recipes-ti/includes/ti-paths.inc + EXTRA_OEMAKE = "\ PLATFORM=${PLATFORM} \ XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ BIOS_INSTALL_DIR="${SYSBIOS_INSTALL_DIR}" \ IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \ LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \ - ${IPC_TARGETS} \ - JOBS="${PARALLEL_MAKE}" \ + gnu.targets.arm.A15F="${GCC_ARM_NONE_TOOLCHAIN}" \ + ti.targets.elf.C66="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \ + ti.targets.arm.elf.M4="${M4_TOOLCHAIN_INSTALL_DIR}" \ " do_create_srcipk:prepend() { - rm -rf host_bios + rm -rf host_bios } do_compile() { - if [ "${PLATFORM}" != "UNKNOWN" ]; then - oe_runmake host_linux - fi + oe_runmake host_linux } do_install() { - if [ "${PLATFORM}" != "UNKNOWN" ]; then oe_runmake EXEC_DIR="${D}${bindir}" install_linux_bin - fi } PACKAGES =+ "${PN}-firmware" From patchwork Mon Jul 11 16:49:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10063 X-Patchwork-Delegate: denis@denix.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0518C43334 for ; Mon, 11 Jul 2022 16:49:41 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.31191.1657558176478528676 for ; Mon, 11 Jul 2022 09:49:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=H46L9Uak; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 26BGnZNQ116546; Mon, 11 Jul 2022 11:49:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1657558175; bh=apP4iVDc3VR6OI/fXIlvkB8z4rMYuVWV8cLDLedcMH4=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=H46L9Uak258H5e+kIUTKM3nC2oN38vDKUzDUvbcJH12uQfr9uwKyFVolv+FpcgXj8 AEJ3vR3FiYpZH3MXZ6AZtbf3fhenbtyohgWJIUqP1F5rhwJJK4G1pSrTL64mfu9JG7 dx/fsVOxY/DC6D5gpPIs16mDlG44vLDL1o8jLtV8= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 26BGnZpo103002 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 11 Jul 2022 11:49:35 -0500 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Mon, 11 Jul 2022 11:49:35 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Mon, 11 Jul 2022 11:49:35 -0500 Received: from ula0226330.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 26BGnXpr030722; Mon, 11 Jul 2022 11:49:34 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-arago][kirkstone/master][PATCH 3/3] cmem: Remove Makefile_cmem-mod and cmem refrences Date: Mon, 11 Jul 2022 11:49:33 -0500 Message-ID: <20220711164933.21445-3-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220711164933.21445-1-afd@ti.com> References: <20220711164933.21445-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 11 Jul 2022 16:49:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/13944 The cmem allocator has been deprecated for removal for some time now. Lets remove the kernel module first, then start removing projects that have not migrated to DMA-BUF Heaps yet. Signed-off-by: Andrew Davis --- .../conf/distro/include/arago-source-ipk.inc | 3 -- ...ackagegroup-arago-tisdk-addons-sdk-host.bb | 2 -- ...kagegroup-arago-tisdk-addons-sdk-target.bb | 5 --- .../packagegroup-arago-tisdk-addons.bb | 2 -- .../recipes-core/packagegroups/ti-test.bb | 2 -- .../ti-tisdk-makefile/Makefile_cmem-mod | 33 ------------------- .../ti-tisdk-makefile_1.0.bb | 3 -- 7 files changed, 50 deletions(-) delete mode 100644 meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_cmem-mod diff --git a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc index ffa76ed3..afce2fc8 100644 --- a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc +++ b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc @@ -169,9 +169,6 @@ CREATE_SRCIPK:pn-cryptodev-module ?= "1" SRCIPK_INSTALL_DIR:pn-cryptodev-module ?= "board-support/extra-drivers/cryptodev-module-${PV}" SRCIPK_PRESERVE_GIT:pn-cryptodev-module ?= "true" -CREATE_SRCIPK:pn-cmem-mod ?= "1" -SRCIPK_INSTALL_DIR:pn-cmem-mod ?= "board-support/extra-drivers/${PN}-${PV}" - CREATE_SRCIPK:pn-debugss-module-drv ?= "1" SRCIPK_INSTALL_DIR:pn-debugss-module-drv ?= "board-support/extra-drivers/${PN}-${PV}" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb index eabec6c4..5083ebcb 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb @@ -56,7 +56,6 @@ UTILS:append:am64xx = " \ EXTRA_LIBS = "" EXTRA_LIBS:append:omap-a15 = " \ - cmem-mod-source \ uio-module-drv-source \ big-data-ipc-demo-source \ " @@ -71,7 +70,6 @@ EXTRA_LIBS:append:ti33x = " \ " EXTRA_LIBS:append:ti43x = " \ - cmem-mod-source \ uio-module-drv-source \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb index 43a043e1..e110fad8 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb @@ -26,11 +26,6 @@ UTILS:append:k3 = "\ " EXTRA_LIBS = "" -EXTRA_LIBS:append:ti43x = "\ - cmem-dev \ - cmem-staticdev \ -" -EXTRA_LIBS:append:omap-a15 = " cmem-dev" EXTRA_LIBS:append:dra7xx = " libulm-dev \ libulm-staticdev \ gdbserver-c6x-dev \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb index 992549e6..e19180af 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb @@ -81,12 +81,10 @@ UTILS:append:dra7xx = " \ EXTRA_LIBS = "" EXTRA_LIBS:append:omap-a15 = " \ - cmem \ uio-module-drv \ " EXTRA_LIBS:append:ti43x = " \ - cmem \ uio-module-drv \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb index 07dbdf38..34048e2c 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb @@ -63,7 +63,6 @@ ARAGO_TI_TEST:append:ti33x = " \ ARAGO_TI_TEST:append:ti43x = " \ omapconf \ - ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'cmem-test', d)} \ " NOT_MAINLINE_MMIP_DEPS = "${@bb.utils.contains('MACHINE_FEATURES', 'mmip', 'omapdrmtest', '', d)}" @@ -72,7 +71,6 @@ ARAGO_TI_TEST:append:omap-a15 = " \ omapconf \ ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', " \ ti-ipc-test \ - cmem-test \ ${NOT_MAINLINE_MMIP_DEPS} \ ", d)} \ " diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_cmem-mod b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_cmem-mod deleted file mode 100644 index cbb86aa5..00000000 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile/Makefile_cmem-mod +++ /dev/null @@ -1,33 +0,0 @@ -# CMEM module -cmem-mod: linux - @echo ================================ - @echo Building CMEM Module - @echo ================================ - @cd board-support/extra-drivers; \ - cd `find . -maxdepth 1 -type d -name "cmem-mod*"`; \ - . $(ENV_SETUP); \ - make -f lu.mak ARCH=__KERNEL_ARCH__ KERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR) module - -cmem-mod_clean: - @echo ================================ - @echo Cleaning CMEM Module - @echo ================================ - @cd board-support/extra-drivers; \ - cd `find . -maxdepth 1 -type d -name "cmem-mod*"`; \ - . $(ENV_SETUP); \ - make -f lu.mak ARCH=__KERNEL_ARCH__ KERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR) modules_clean - -cmem-mod_install: - @echo ================================ - @echo Installing CMEM Module - @echo ================================ - @if [ ! -d $(DESTDIR) ] ; then \ - echo "The extracted target filesystem directory doesn't exist."; \ - echo "Please run setup.sh in the SDK's root directory and then try again."; \ - exit 1; \ - fi - @cd board-support/extra-drivers; \ - cd `find . -maxdepth 1 -type d -name "cmem-mod*"`; \ - . $(ENV_SETUP); \ - make -C $(LINUXKERNEL_INSTALL_DIR) SUBDIRS=`pwd`/src/cmem/module INSTALL_MOD_PATH=$(DESTDIR) PREFIX=$(SDK_PATH_TARGET) INSTALL_MOD_STRIP=$(INSTALL_MOD_STRIP) modules_install - diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb index 6737d7fd..610d255c 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb @@ -31,7 +31,6 @@ SRC_URI = "\ file://Makefile_dual-camera-demo \ file://Makefile_image-gallery \ file://Makefile_cryptodev \ - file://Makefile_cmem-mod \ file://Makefile_debugss-module-drv \ file://Makefile_gdbserverproxy-module-drv \ file://Makefile_ti-sgx-ddk-km \ @@ -89,7 +88,6 @@ MAKEFILES:append:ti43x = " u-boot-spl \ dual-camera-demo \ image-gallery \ ti-sgx-ddk-km \ - cmem-mod \ pru-icss \ uio-module-drv \ mmwavegesture-hmi \ @@ -110,7 +108,6 @@ MAKEFILES:append:omap-a15 = " u-boot-spl \ omapconf \ linux-dtbs \ ti-sgx-ddk-km \ - cmem-mod \ pru-icss \ ti-gc320-driver \ barcode-roi \