diff mbox series

[meta-arago,master/kirkstone,3/7] cmem: Remove Makefile_cmem-mod and cmem refrences

Message ID 20221006150628.17044-3-afd@ti.com
State Superseded, archived
Delegated to: Denys Dmytriyenko
Headers show
Series [meta-arago,master/kirkstone,1/7] ti-crypto-examples: Remove ti-crypto-examples | expand

Commit Message

Andrew Davis Oct. 6, 2022, 3:06 p.m. UTC 
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 <afd@ti.com>
---
 .../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 mbox series

Patch

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 e3042974..52322a86 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 6d1d8661..f8c07164 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
@@ -80,12 +80,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 3e76a527..99a6cc82 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-test.bb
@@ -62,7 +62,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)}"
@@ -71,7 +70,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 c47ae172..e47e0756 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 \