Skip to contentSkip to conversation

cmem-mod: Remove CMEM kernel module

PATCH New Andrew Davis 1 participant 1 message Aug 3, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmem-mod: Remove CMEM kernel module

CMEM has been deprecated for removal for some time now. All users should have migrated to the Linux upstream DMA-BUF Heaps framework. Remove CMEM.

We only remove the kernel module part in this patch to prevent builds from breaking in the meta-arago layer due to dependencies on the CMEM library. These packages should either be updated or disabled. After that we will remove the library.

---
 meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb  | 18 ----
 meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb      |  2 -
 meta-ti-bsp/recipes-kernel/linux/cmem.inc     | 96 -------------------
 .../recipes-kernel/linux/files/cmem.dtsi      | 38 --------
 .../linux/files/dra7xx/cmem-am571x.dtsi       | 29 ------
 .../dra7xx/cmem-am5729-beagleboneai.dtsi      | 40 --------
 .../linux/files/dra7xx/cmem-am572idk.dtsi     | 40 --------
 .../linux/files/dra7xx/cmem-am574x.dtsi       | 40 --------
 .../linux/files/dra7xx/cmem-dra71x.dtsi       | 29 ------
 .../linux/files/dra7xx/cmem-dra72x.dtsi       | 29 ------
 .../linux/files/dra7xx/cmem-dra76x.dtsi       | 29 ------
 .../linux/files/dra7xx/cmem.dtsi              | 40 --------
 .../linux/linux-ti-staging_5.10.bb            |  1 -
 .../linux/linux-ti-staging_5.4.bb             |  1 -
 14 files changed, 432 deletions(-)
 delete mode 100644 meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/cmem.inc
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/cmem.dtsi
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am574x.dtsi
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra71x.dtsi
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi
 delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem.dtsi
meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb deleted +0 -18
deleted file mode 100644
index ea2cc5f4..00000000
@@ -1,18 +0,0 @@
-DESCRIPTION = "Kernel module for contiguous memory allocation from userspace"
-
-include cmem.inc
-
-# This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR:append = "a"
-PR = "${MACHINE_KERNEL_PR}"
-
-inherit module
-
-EXTRA_OEMAKE += '-f lu.mak KERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}" EXEC_DIR="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra"'
-MAKE_TARGETS = "module"
-
-KERNEL_MODULE_AUTOLOAD += "cmemk"
-
-do_install:prepend() {
-    cp ${B}/src/cmem/module/Module.symvers ${B}/ || true
-}
meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb +0 -2
index f69c22fb..2042b08a 100644
@@ -2,8 +2,6 @@ DESCRIPTION = "The cmem component supports contiguous memory allocation from use
 
 include cmem.inc
 
-RDEPENDS:${PN} = "cmem-mod"
-
 PR = "r0"
 
 PACKAGES =+ "${PN}-test"
meta-ti-bsp/recipes-kernel/linux/cmem.inc deleted +0 -96

96 lines not on this page · raw message

meta-ti-bsp/recipes-kernel/linux/files/cmem.dtsi deleted +0 -38
deleted file mode 100644
index 23119861..00000000
@@ -1,38 +0,0 @@
-/*
- * This is a placeholder for CMEM reserved memory declarations. This
- * is simply an example and does not actually reserve any memory for
- * CMEM.
- *
- * The commented sections below provide an example for how to provide
- * a reserved memory region for CMEM to use as a buffer pool.
- */
-/ {
-/*
-	reserved-memory {
-		cmem_block_mem_0: cmem_block_mem@a0000000 {
-			reg = <0x0 0xa0000000 0x0 0x0a000000>;
-			no-map;
-			status = "okay";
-		};
-	};
-*/
-
-	cmem {
-		compatible = "ti,cmem";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		#pool-size-cells = <2>;
-
-		status = "disabled";
-/*
-		status = "okay";
-
-                cmem_block_0: cmem_block@0 {
-                        reg = <0>;
-                        memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x0 0x0a000000>;
-                };
-*/
-        };
-};
meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi deleted +0 -29
deleted file mode 100644
index ebd61296..00000000
@@ -1,29 +0,0 @@
-/ {
-        reserved-memory {
-                #address-cells = <2>;
-                #size-cells = <2>;
-                ranges;
-
-                cmem_block_mem_0: cmem_block_mem@a0000000 {
-                        reg = <0x0 0xa0000000 0x0 0x0c000000>;
-                        no-map;
-                        status = "okay";
-                };
-        };
-
-        cmem {
-                compatible = "ti,cmem";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-		#pool-size-cells = <2>;
-
-                status = "okay";
-
-                cmem_block_0: cmem_block@0 {
-                        reg = <0>;
-                        memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x0 0x0c000000>;
-                };
-        };
-};
meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi deleted +0 -40
deleted file mode 100644
index e0511d08..00000000
@@ -1,40 +0,0 @@
-/ {
-	reserved-memory {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		cmem_block_mem_0: cmem_block_mem@a0000000 {
-			reg = <0x0 0xa0000000 0x0 0x18000000>;
-			no-map;
-			status = "okay";
-		};
-
-		cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 {
-			reg = <0x0 0x40500000 0x0 0x100000>;
-			no-map;
-			status = "okay";
-		};
-	};
-
-	cmem {
-		compatible = "ti,cmem";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		#pool-size-cells = <2>;
-
-		status = "okay";
-
-		cmem_block_0: cmem_block@0 {
-			reg = <0>;
-			memory-region = <&cmem_block_mem_0>;
-			cmem-buf-pools = <1 0x0 0x18000000>;
-		};
-
-		cmem_block_1: cmem_block@1 {
-			reg = <1>;
-			memory-region = <&cmem_block_mem_1_ocmc3>;
-		};
-	};
-};
meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi deleted +0 -40
deleted file mode 100644
index 6c39e22c..00000000
@@ -1,40 +0,0 @@
-/ {
-        reserved-memory {
-                #address-cells = <2>;
-                #size-cells = <2>;
-                ranges;
-
-                cmem_block_mem_0: cmem_block_mem@a0000000 {
-                        reg = <0x0 0xa0000000 0x0 0x20000000>;
-                        no-map;
-                        status = "okay";
-                };
-
-		cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 {
-			reg = <0x0 0x40500000 0x0 0x100000>;
-			no-map;
-			status = "okay";
-		};
-        };
-
-        cmem {
-                compatible = "ti,cmem";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-		#pool-size-cells = <2>;
-
-                status = "okay";
-
-                cmem_block_0: cmem_block@0 {
-                        reg = <0>;
-                        memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x0 0x20000000>;
-                };
-
-		cmem_block_1: cmem_block@1 {
-			reg = <1>;
-			memory-region = <&cmem_block_mem_1_ocmc3>;
-		};
-        };
-};
meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am574x.dtsi deleted +0 -40
deleted file mode 100644
index 8fb3e871..00000000
@@ -1,40 +0,0 @@
-/ {
-        reserved-memory {
-                #address-cells = <2>;
-                #size-cells = <2>;
-                ranges;
-
-                cmem_block_mem_0: cmem_block_mem@a0000000 {
-                        reg = <0x0 0xa0000000 0x0 0x18000000>;
-                        no-map;
-                        status = "okay";
-                };
-
-		cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 {
-			reg = <0x0 0x40500000 0x0 0x100000>;
-			no-map;
-			status = "okay";
-		};
-        };
-
-        cmem {
-                compatible = "ti,cmem";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-		#pool-size-cells = <2>;
-
-                status = "okay";
-
-                cmem_block_0: cmem_block@0 {
-                        reg = <0>;
-                        memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x0 0x18000000>;
-                };
-
-		cmem_block_1: cmem_block@1 {
-			reg = <1>;
-			memory-region = <&cmem_block_mem_1_ocmc3>;
-		};
-        };
-};
meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra71x.dtsi deleted +0 -29
deleted file mode 100644
index ebd61296..00000000
@@ -1,29 +0,0 @@
-/ {
-        reserved-memory {
-                #address-cells = <2>;
-                #size-cells = <2>;
-                ranges;
-
-                cmem_block_mem_0: cmem_block_mem@a0000000 {
-                        reg = <0x0 0xa0000000 0x0 0x0c000000>;
-                        no-map;
-                        status = "okay";
-                };
-        };
-
-        cmem {
-                compatible = "ti,cmem";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-		#pool-size-cells = <2>;
-
-                status = "okay";
-
-                cmem_block_0: cmem_block@0 {
-                        reg = <0>;
-                        memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x0 0x0c000000>;
-                };
-        };
-};
meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi deleted +0 -29
deleted file mode 100644
index ebd61296..00000000
@@ -1,29 +0,0 @@
-/ {
-        reserved-memory {
-                #address-cells = <2>;
-                #size-cells = <2>;
-                ranges;
-
-                cmem_block_mem_0: cmem_block_mem@a0000000 {
-                        reg = <0x0 0xa0000000 0x0 0x0c000000>;
-                        no-map;
-                        status = "okay";
-                };
-        };
-
-        cmem {
-                compatible = "ti,cmem";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-		#pool-size-cells = <2>;
-
-                status = "okay";
-
-                cmem_block_0: cmem_block@0 {
-                        reg = <0>;
-                        memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x0 0x0c000000>;
-                };
-        };
-};
meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi deleted +0 -29
deleted file mode 100644
index 9d207db5..00000000
@@ -1,29 +0,0 @@
-/ {
-        reserved-memory {
-                #address-cells = <2>;
-                #size-cells = <2>;
-                ranges;
-
-                cmem_block_mem_0: cmem_block_mem@a0000000 {
-                        reg = <0x0 0xa0000000 0x0 0x18000000>;
-                        no-map;
-                        status = "okay";
-                };
-        };
-
-        cmem {
-                compatible = "ti,cmem";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-		#pool-size-cells = <2>;
-
-                status = "okay";
-
-                cmem_block_0: cmem_block@0 {
-                        reg = <0>;
-                        memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x0 0x18000000>;
-                };
-        };
-};
meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem.dtsi deleted +0 -40
deleted file mode 100644
index c7781c48..00000000
@@ -1,40 +0,0 @@
-/ {
-        reserved-memory {
-                #address-cells = <2>;
-                #size-cells = <2>;
-                ranges;
-
-                cmem_block_mem_0: cmem_block_mem@a0000000 {
-                        reg = <0x0 0xa0000000 0x0 0x0c000000>;
-                        no-map;
-                        status = "okay";
-                };
-
-		cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 {
-			reg = <0x0 0x40500000 0x0 0x100000>;
-			no-map;
-			status = "okay";
-		};
-        };
-
-        cmem {
-                compatible = "ti,cmem";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-		#pool-size-cells = <2>;
-
-                status = "okay";
-
-                cmem_block_0: cmem_block@0 {
-                        reg = <0>;
-                        memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x0 0x0c000000>;
-                };
-
-		cmem_block_1: cmem_block@1 {
-			reg = <1>;
-			memory-region = <&cmem_block_mem_1_ocmc3>;
-		};
-        };
-};
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +0 -1
index a0581cb4..69a31128 100644
@@ -7,7 +7,6 @@ inherit kernel
 
 DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh"
 require recipes-kernel/linux/setup-defconfig.inc
-require recipes-kernel/linux/cmem.inc
 require recipes-kernel/linux/ti-uio.inc
 require recipes-kernel/linux/bundle-devicetree.inc
 require recipes-kernel/linux/kernel-rdepends.inc
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.4.bb +0 -1
index 9b2d1be1..62a12c59 100644
@@ -7,7 +7,6 @@ inherit kernel
 
 DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh"
 require recipes-kernel/linux/setup-defconfig.inc
-require recipes-kernel/linux/cmem.inc
 require recipes-kernel/linux/ti-uio.inc
 require recipes-kernel/linux/bundle-devicetree.inc
 require recipes-kernel/linux/kernel-rdepends.inc
Signature · 1 line
2.36.1