From d4700b7b6f366683fcd64c30ecffab3a534a55b5 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair@alistair23.me>
Date: Wed, 25 Sep 2024 19:50:44 +1000
Subject: [PATCH] Add CONFIG_UDMABUF to libcamera kconfigcheck
This patch adds CONFIG_UDMABUF to the libcamera kconfigcheck
and also reverts the older libcamera CONFIG_DMABUF_HEAPS and
CONFIG_CMA checks that were added in
https://gitlab.com/postmarketOS/pmaports/-/merge_requests/5391
Resolves: https://gitlab.com/postmarketOS/pmaports/-/issues/3155
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
device/community/linux-lenovo-21bx/APKBUILD | 2 +-
.../config-lenovo-21bx.aarch64 | 2 +-
.../APKBUILD | 4 ++--
...onfig-postmarketos-mediatek-mt8173.aarch64 | 23 +++---------------
.../APKBUILD | 4 ++--
...onfig-postmarketos-mediatek-mt8183.aarch64 | 24 +++----------------
.../linux-postmarketos-qcom-msm8916/APKBUILD | 4 ++--
.../config-postmarketos-qcom-msm8916.aarch64 | 6 ++---
.../linux-postmarketos-qcom-msm8996/APKBUILD | 4 ++--
.../config-postmarketos-qcom-msm8996.aarch64 | 6 ++---
.../linux-postmarketos-qcom-sc7180/APKBUILD | 4 ++--
.../config-postmarketos-qcom-sc7180.aarch64 | 24 +++----------------
.../linux-postmarketos-qcom-sm6350/APKBUILD | 4 ++--
.../config-postmarketos-qcom-sm6350.aarch64 | 19 +++------------
.../linux-postmarketos-rockchip/APKBUILD | 4 ++--
.../config-postmarketos-rockchip.aarch64 | 6 ++---
device/testing/linux-lenovo-q706f/APKBUILD | 2 +-
.../config-lenovo-q706f.aarch64 | 2 +-
.../APKBUILD | 4 ++--
...onfig-postmarketos-mediatek-mt81xx.aarch64 | 4 +---
.../linux-postmarketos-qcom-sc7280/APKBUILD | 4 ++--
.../config-postmarketos-qcom-sc7280.aarch64 | 19 +++------------
.../linux-postmarketos-qcom-sdm660/APKBUILD | 4 ++--
.../config-postmarketos-qcom-sdm660.aarch64 | 6 ++---
.../linux-postmarketos-qcom-sm6115/APKBUILD | 4 ++--
.../config-postmarketos-qcom-sm6115.aarch64 | 6 ++---
.../linux-postmarketos-qcom-sm8250/APKBUILD | 4 ++--
.../config-postmarketos-qcom-sm8250.aarch64 | 6 ++---
.../APKBUILD | 4 ++--
...onfig-postmarketos-rockchip-rk3588.aarch64 | 6 ++---
device/testing/linux-powkiddy-x55/APKBUILD | 4 ++--
.../config-powkiddy-x55.aarch64 | 18 +-------------
kconfigcheck.toml | 5 +---
33 files changed, 64 insertions(+), 178 deletions(-)
diff --git a/device/community/linux-lenovo-21bx/APKBUILD b/device/community/linux-lenovo-21bx/APKBUILD
index 568cbc0f587..b9bb13e5781 100644
--- a/device/community/linux-lenovo-21bx/APKBUILD
+++ b/device/community/linux-lenovo-21bx/APKBUILD
@@ -68,5 +68,5 @@ package() {
sha512sums="
efbf5fdaba513098c9c0f8eb2a559e58c6fd1180bcdf897514b2104480f0d2de2065f073d12204989804b61b083c2b3f9d605493ca6e89bb25e0beeae8545273 linux-lenovo-21bx-f0239008542ebdcd4a94755124b5700649df5c39.tar.gz
-b1ad53eab677711b27505a9a6eac3ab34e83196a3fc2496855c1103d0b78e3e97dabdefd7f86bd318c516f4ab7cb6e303df92e60e1c1ee16ae0bb80ba6f1e08a config-lenovo-21bx.aarch64
+d6cac679d13008b48d9c00fb7a80aa947c661511a304ad4e83ba56391dc9f94d9071e2f748eaf8b5ab152cc90a7fff8a98132c07ed5ea341c88be60b7bca7e6c config-lenovo-21bx.aarch64
"
diff --git a/device/community/linux-lenovo-21bx/config-lenovo-21bx.aarch64 b/device/community/linux-lenovo-21bx/config-lenovo-21bx.aarch64
index c69f0e638ce..c537de17056 100644
--- a/device/community/linux-lenovo-21bx/config-lenovo-21bx.aarch64
+++ b/device/community/linux-lenovo-21bx/config-lenovo-21bx.aarch64
@@ -5141,7 +5141,7 @@ CONFIG_DMA_OF=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
diff --git a/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD b/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD
index 295f0b6a28f..0fab5f33e7e 100644
--- a/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD
+++ b/device/community/linux-postmarketos-mediatek-mt8173/APKBUILD
@@ -2,7 +2,7 @@
# Co-Maintainer: Jenneron <jenneron@protonmail.com>
pkgname=linux-postmarketos-mediatek-mt8173
pkgver=6.10.10
-pkgrel=0
+pkgrel=1
pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
arch="aarch64"
_carch="arm64"
@@ -69,7 +69,7 @@ package() {
sha512sums="
affaa3690150ca13f0ee14f91f0e09a5ad3340a7ea6404e34286dfb4bd4fdfe12fcac47e83da7878681bf28a8a8b78e0b315e1563408885dbb07aac5bd2e4dce linux-6.10.10.tar.xz
-078f06d292c3a44efcac50eb5b9b4036d4008cba446b4d8442bae998c040dac9f3aaa97bb25f583eca97f5bc51a9a1be100bbfb042a24e93809e6c863e517596 config-postmarketos-mediatek-mt8173.aarch64
+507cd54a582b64a5411b1128daf6060a0cd0e93f9ce3b4588e3e603f10aac11efa395bca153be597717229917f5078c6f2553a3990450be74ae48f016d71c365 config-postmarketos-mediatek-mt8173.aarch64
4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710 fix-mmc1-speed.patch
c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849 fix-mmc-order.patch
caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de fix-spi-nor-max-frequency.patch
diff --git a/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64 b/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64
index 445dc359467..4df86883e8c 100644
--- a/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64
+++ b/device/community/linux-postmarketos-mediatek-mt8173/config-postmarketos-mediatek-mt8173.aarch64
@@ -959,10 +959,7 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUGFS is not set
-# CONFIG_CMA_SYSFS is not set
-CONFIG_CMA_AREAS=20
+# CONFIG_CMA is not set
CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_IDLE_PAGE_TRACKING is not set
@@ -6372,14 +6369,12 @@ CONFIG_DMA_ENGINE_RAID=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
@@ -8441,18 +8436,6 @@ CONFIG_DMA_NEED_SYNC=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_CMA=y
-# CONFIG_DMA_NUMA_CMA is not set
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
diff --git a/device/community/linux-postmarketos-mediatek-mt8183/APKBUILD b/device/community/linux-postmarketos-mediatek-mt8183/APKBUILD
index 66b57b4ea0b..4a52a518335 100644
--- a/device/community/linux-postmarketos-mediatek-mt8183/APKBUILD
+++ b/device/community/linux-postmarketos-mediatek-mt8183/APKBUILD
@@ -2,7 +2,7 @@
# Co-Maintainer: Jenneron <jenneron@protonmail.com>
pkgname=linux-postmarketos-mediatek-mt8183
pkgver=6.6.36
-pkgrel=0
+pkgrel=1
pkgdesc="Mainline kernel for mediatek mt8183"
arch="aarch64"
_flavor="${pkgname#linux-}"
@@ -101,5 +101,5 @@ e9a128a8ddd98c6c8957ba45186afa2ea8ebeac83d4f2db3ff9ee8a5dd8027af90868c334a7b456b
d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2 mt8183-fix-bluetooth.patch
9e64ef057ecd9bb23b0b0e830007c50ea9c481f64f460d063e9f64735d70d5a4bcf87d9148aa5cc90963ccd5860fe4a9e6f25556a902332b95ef48537d6ee045 Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch
9b8707de42635734031495da055c5860addeb656051540f1a14404b10aa8b501168d8b0e274b37bce989db3bc050e9beef722189556f6d782b92cc907731488d mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch
-c5411538314d47c808a0036c7ba20a83b09f0eec609910d618119888f2e60b51da5fd72c1c16c350428ee62e6f3300569070f12263ba6123e655f6203e939b37 config-postmarketos-mediatek-mt8183.aarch64
+b406af4458550f705008c618db2d2ba28894da79413b80111ba98df5d593e66615efe6f04b3a75350bf269ababd2b194f61be65a3045202e2ee84d586c118396 config-postmarketos-mediatek-mt8183.aarch64
"
diff --git a/device/community/linux-postmarketos-mediatek-mt8183/config-postmarketos-mediatek-mt8183.aarch64 b/device/community/linux-postmarketos-mediatek-mt8183/config-postmarketos-mediatek-mt8183.aarch64
index 0bd8deaead1..2636b858f21 100644
--- a/device/community/linux-postmarketos-mediatek-mt8183/config-postmarketos-mediatek-mt8183.aarch64
+++ b/device/community/linux-postmarketos-mediatek-mt8183/config-postmarketos-mediatek-mt8183.aarch64
@@ -933,11 +933,7 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-# CONFIG_CMA_SYSFS is not set
-CONFIG_CMA_AREAS=19
+# CONFIG_CMA is not set
CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_IDLE_PAGE_TRACKING is not set
@@ -6286,14 +6282,12 @@ CONFIG_DMA_ENGINE_RAID=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
@@ -8295,18 +8289,6 @@ CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_CMA=y
-# CONFIG_DMA_NUMA_CMA is not set
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
diff --git a/device/community/linux-postmarketos-qcom-msm8916/APKBUILD b/device/community/linux-postmarketos-qcom-msm8916/APKBUILD
index 234edc6c057..31f1b283cfd 100644
--- a/device/community/linux-postmarketos-qcom-msm8916/APKBUILD
+++ b/device/community/linux-postmarketos-qcom-msm8916/APKBUILD
@@ -8,7 +8,7 @@ pkgver=6.6
# When making kernel config changes please also submit a PR to
# https://github.com/msm8916-mainline/linux/blob/master/kernel/configs/pmos.config
# since the kernel config is regenerated on upgrades and all changes will be lost!
-pkgrel=8
+pkgrel=9
pkgdesc="Mainline kernel fork for Qualcomm MSM8909/MSM8916/MSM8939 devices"
arch="aarch64 armv7"
url="https://github.com/msm8916-mainline/linux"
@@ -92,6 +92,6 @@ package() {
sha512sums="
5fbbdf333412667e0a0e38dcc7e83f640bd5a1e0b07e1c7786ff3e18f17b9cdec088936263d68986b3869ee305cfcecdf22970134ca8fb8d2a2769874a5a4676 linux-postmarketos-qcom-msm8916-v6.6-msm8916.tar.gz
-6c90d4dd5942d837e296d3facb997ab6415e24c17840269e123493834d214ce7868ebbd23e1dea33c744d96ed2d0096bc2e47339cc27b858c1260cfd246eadbd config-postmarketos-qcom-msm8916.aarch64
+3ac92eee421ec3f15958258f655bd2e61f746160215e2580fa271256d6c60fbea7451b31e1ebaad966bb1eb1a15a404637b009069d628272c6844593aeb5dd26 config-postmarketos-qcom-msm8916.aarch64
5a5d45f5a3dbefe8eaf5c796c5362a2c0b6e94b2b27cb5a139315c7894d74a37619800c549bf1d0eec6ca2d9d69b36d3957cc5ac6853e8fa43b4de022be246b0 config-postmarketos-qcom-msm8916.armv7
"
diff --git a/device/community/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64 b/device/community/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64
index 6ca64e50562..3c83f149516 100644
--- a/device/community/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64
+++ b/device/community/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64
@@ -4845,14 +4845,12 @@ CONFIG_QCOM_BAM_DMA=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
diff --git a/device/community/linux-postmarketos-qcom-msm8996/APKBUILD b/device/community/linux-postmarketos-qcom-msm8996/APKBUILD
index 940f1e02ab6..5756d8676f7 100644
--- a/device/community/linux-postmarketos-qcom-msm8996/APKBUILD
+++ b/device/community/linux-postmarketos-qcom-msm8996/APKBUILD
@@ -4,7 +4,7 @@
_flavor="postmarketos-qcom-msm8996"
pkgname=linux-$_flavor
pkgver=6.3.1
-pkgrel=6
+pkgrel=7
pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
arch="aarch64"
_carch="arm64"
@@ -52,5 +52,5 @@ package() {
}
sha512sums="
3d842c6fa3e1f93875f9c8d4f51e66b267bbd6b0eabccc25b461cbc0616a632ee6f1f2001b77bef2aff6aa36a788277ab9fc930fcd6e71732e5cbffec2dcb269 linux-v6.3.1-msm8996.tar.gz
-d8e4b6b583dfb172915c9a26c2710d794d99f4e0999556c86eaeff41a39d1ed55bec72ad24795f71f1d9d1ccf86488665566b1465d2db25886662bc25d7c8523 config-postmarketos-qcom-msm8996.aarch64
+e2eec32ea392a97628fb57f6b5c7affcd96db0b4c6521bd1d801f15209fcdad13bfa7c80097d3535a6fee80df2e9e83b1f31b13cac5ffd10a8260e33ab14bebb config-postmarketos-qcom-msm8996.aarch64
"
diff --git a/device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64 b/device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64
index 4a8fe62bf07..ac039f12c86 100644
--- a/device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64
+++ b/device/community/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64
@@ -5383,14 +5383,12 @@ CONFIG_DMA_ENGINE_RAID=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_AUXDISPLAY is not set
diff --git a/device/community/linux-postmarketos-qcom-sc7180/APKBUILD b/device/community/linux-postmarketos-qcom-sc7180/APKBUILD
index d9543ac52af..f66b8f8896e 100644
--- a/device/community/linux-postmarketos-qcom-sc7180/APKBUILD
+++ b/device/community/linux-postmarketos-qcom-sc7180/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jenneron <jenneron@protonmail.com>
pkgname=linux-postmarketos-qcom-sc7180
pkgver=6.6.28
-pkgrel=5
+pkgrel=6
pkgdesc="Mainline kernel fork for Qualcomm Snapdragon 7c devices"
arch="aarch64"
_carch="arm64"
@@ -101,5 +101,5 @@ a4d8bbf39575e61d228b3b66fa692b207c1ee011e6030fdd097936a1ad28b1d5b01816d989adcb80
08c6cace24a207f4a64a85b17e97646f62a8590b502cd5b6945489d0aeded352e21f0e1b0ec541ae2e61ec7fd4f6bc1e5bf1d5d32f2c6616eb41d39d66f0bab5 0009-platform-arm64-Add-Acer-Aspire-1-embedded-controller.patch
69cfb699990ea7994089016b29cc248cb03483ad3f7620cbba63a779b2ed8928e6fde68484d29b6b8dfd1a8a6fa8d84c441f30180c7a257520ced442dab33876 0010-arm64-dts-qcom-acer-aspire1-Add-embedded-controller.patch
c5edcd74f898b08bc663766668632d351aea40426b3563d53a4b8c6856dd82627f4794d60450e41171c990ebb3649056b36ef432c14c8783168e8060a2e3b094 0011-HACK-clk-Delay-disabling-unused-clocks-by-10s.patch
-a6dc8fa517667c6a03d65f849a01aaa793dfd2bde5efc844d56ae46e5f0074ce7d81a89edfe6958d2792c70549fea150f1be9c2db7c06fd04f5e13afbda9d33c config-postmarketos-qcom-sc7180.aarch64
+74292bfb6865a0490ea727c18da1c6b5e23fcc06785ab1e523e6d8c2294f7e762ff0941f9130951f71ad0166bc2bdab63772b9be52762a09629851eb41416e9b config-postmarketos-qcom-sc7180.aarch64
"
diff --git a/device/community/linux-postmarketos-qcom-sc7180/config-postmarketos-qcom-sc7180.aarch64 b/device/community/linux-postmarketos-qcom-sc7180/config-postmarketos-qcom-sc7180.aarch64
index 96ea660289d..4939d340b8c 100644
--- a/device/community/linux-postmarketos-qcom-sc7180/config-postmarketos-qcom-sc7180.aarch64
+++ b/device/community/linux-postmarketos-qcom-sc7180/config-postmarketos-qcom-sc7180.aarch64
@@ -949,11 +949,7 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_USE_PERCPU_NUMA_NODE_ID=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-# CONFIG_CMA_SYSFS is not set
-CONFIG_CMA_AREAS=19
+# CONFIG_CMA is not set
CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_IDLE_PAGE_TRACKING is not set
@@ -6398,14 +6394,12 @@ CONFIG_DMA_ENGINE_RAID=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
@@ -8452,18 +8446,6 @@ CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_CMA=y
-# CONFIG_DMA_NUMA_CMA is not set
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
diff --git a/device/community/linux-postmarketos-qcom-sm6350/APKBUILD b/device/community/linux-postmarketos-qcom-sm6350/APKBUILD
index 2b8e403204c..a59b5a0aa28 100644
--- a/device/community/linux-postmarketos-qcom-sm6350/APKBUILD
+++ b/device/community/linux-postmarketos-qcom-sm6350/APKBUILD
@@ -3,7 +3,7 @@
_flavor="postmarketos-qcom-sm6350"
pkgname=linux-$_flavor
pkgver=6.10.5
-pkgrel=1
+pkgrel=2
pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
arch="aarch64"
_carch="arm64"
@@ -55,5 +55,5 @@ package() {
sha512sums="
5756a8fd466f5c34dcaa9818d274facbe0b0b541ce9d7997b95868b2e84f1491ce8bf7d2714206ad8378d560996b8a736bc3c8505ef8022371644866c841e2a1 linux-v6.10.5-sm6350.tar.gz
-ac994215d68ef24389fddb5b5fb158d4d2adf4e22b18e66865d37935ab1a438d4b45c3ea78b220800d272010b15480cef0a518888e384d402bde773281a5f0f6 config-postmarketos-qcom-sm6350.aarch64
+fc1e63b0748cab6dc124b8444c0db86c833d4e106a8ca2ed201b92a25974ddc1a30f3a774d08dcda587f54e142237fa0c76fb64620ef6515825bcf5e3ed04872 config-postmarketos-qcom-sm6350.aarch64
"
diff --git a/device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64 b/device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64
index 57598338c59..a919a829341 100644
--- a/device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64
+++ b/device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64
@@ -4193,14 +4193,12 @@ CONFIG_QCOM_GPI_DMA=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
@@ -5827,18 +5825,7 @@ CONFIG_DMA_NEED_SYNC=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_CMA=y
-# CONFIG_DMA_NUMA_CMA is not set
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_CMA is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
diff --git a/device/community/linux-postmarketos-rockchip/APKBUILD b/device/community/linux-postmarketos-rockchip/APKBUILD
index 22a88874083..a9a5a90a555 100644
--- a/device/community/linux-postmarketos-rockchip/APKBUILD
+++ b/device/community/linux-postmarketos-rockchip/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Quade Curry <qc8086@qc8086.com>
pkgname=linux-postmarketos-rockchip
pkgver=6.6.34
-pkgrel=3
+pkgrel=4
pkgdesc="Mainline kernel for rockchip devices"
arch="aarch64"
_carch="arm64"
@@ -72,5 +72,5 @@ package() {
sha512sums="
eaa792be65c4cdfd37b84d4dadd22086c8507c1f78d538255cff03595e1caee0f88b521c398b6bc9ab3632010133cff5c7b14200413d54cf0a38bea79c2fd29f linux-6.6.34.tar.xz
-584e5be960d0d4e51333eeb23204a9d43969baa1c56a89234e6b2011269b9e14d5fb0b369d2e9946802eeff7ab441f9d807ce33ecf8cf3e40156b0aafb7e3b9c config-postmarketos-rockchip.aarch64
+0de7639ad540da644ec24e0bffcc74ef2d0907e028990f70cf20c8c3927589cbf1085a90f9dcd667e9ea652e5359bdfff3eac58b9742b5fbb2725d5afff7f6eb config-postmarketos-rockchip.aarch64
"
diff --git a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64
index aa2d9305fee..000410ce82d 100644
--- a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64
+++ b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64
@@ -6187,14 +6187,12 @@ CONFIG_DMA_ENGINE_RAID=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
CONFIG_UIO=m
diff --git a/device/testing/linux-lenovo-q706f/APKBUILD b/device/testing/linux-lenovo-q706f/APKBUILD
index afca8892034..d76ab57b212 100644
--- a/device/testing/linux-lenovo-q706f/APKBUILD
+++ b/device/testing/linux-lenovo-q706f/APKBUILD
@@ -62,5 +62,5 @@ package() {
sha512sums="
9b1cbda916f50926eb2c848e43f1995c2d355f72b8bdfe46fbabefc4652c4f1609c9fa63a3c654ae06231b6192b86ad47bd1980ef5d9af804254bded4bf22300 linux-lenovo-q706f-sm8250-6.11.tar.gz
-b73fcb1a19658031fe4fffd57ed335e1c76f9990ea7d8aeaf4a1778c1699d283b0497a32f09e20c124142db7bbe9d793680a493d68b293a4e0db8f39fa327b3c config-lenovo-q706f.aarch64
+ca8a9e97f95ef5cec0d4291bf956d89b0041c36a98eb32f643ab3c4cafc421051c0cc4412298c0d68b7c270aa1d9cb4c7458fc389f6f0684c1d8ba4d7ac06d26 config-lenovo-q706f.aarch64
"
diff --git a/device/testing/linux-lenovo-q706f/config-lenovo-q706f.aarch64 b/device/testing/linux-lenovo-q706f/config-lenovo-q706f.aarch64
index dc282b1695a..5731c192bb2 100644
--- a/device/testing/linux-lenovo-q706f/config-lenovo-q706f.aarch64
+++ b/device/testing/linux-lenovo-q706f/config-lenovo-q706f.aarch64
@@ -5963,7 +5963,7 @@ CONFIG_DMA_ENGINE_RAID=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
diff --git a/device/testing/linux-postmarketos-mediatek-mt81xx/APKBUILD b/device/testing/linux-postmarketos-mediatek-mt81xx/APKBUILD
index 630bb321aca..1df5ffd4322 100644
--- a/device/testing/linux-postmarketos-mediatek-mt81xx/APKBUILD
+++ b/device/testing/linux-postmarketos-mediatek-mt81xx/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jenneron <jenneron@protonmail.com>
pkgname=linux-postmarketos-mediatek-mt81xx
pkgver=6.10.0_rc4_git20240624
-pkgrel=3
+pkgrel=4
pkgdesc="Mediatek MT8186/8192/8195 kernel package"
arch="aarch64"
url="https://kernel.org"
@@ -74,5 +74,5 @@ sha512sums="
bf39ed6646a869a7a99dc7f0ccc7bbaca0c50776e87848cb1a9e55bef317a73c08549a9acb8cce5c394ab3bf90667e4d1cf8a3671bb9de15d2a470d5e8be0261 0001-arm64-dts-mediatek-Add-dts-for-hayato-rev5-sku0.patch
f10464bf131ba44686a36a35aaf16492915413893d1b3faa43959d5f853b5ed66419f835565836a17480cd3458de0943cee72e700713e00125c8ecd184f3b677 remove-audio-routing.patch
614ebc613902c088afc32ced6e612f3bb04405a36431a53ace96516a41e7c776e0353db55356ae9fc125b376049064720d4ad17cd7f1da2b3d2503fb0fa812a1 update-ADSP-reserved-memory-region.patch
-3e85a333ab1f7cd0a2a947bfc4f7efab414dc6f7d0deaba95a5413d7d42028c2f4dd9d22c06dd0f7a5060ccb995b08d5080ddf64a776506747463d830c00d150 config-postmarketos-mediatek-mt81xx.aarch64
+ac9d3ebd9a927660ffab98ee1776e6a859f38f991fe3b66f2a5421433ff525d81d2fdcb6d3a73a183008c76d2ed6fddc77b5243c43913ece96d2e8464a82217b config-postmarketos-mediatek-mt81xx.aarch64
"
diff --git a/device/testing/linux-postmarketos-mediatek-mt81xx/config-postmarketos-mediatek-mt81xx.aarch64 b/device/testing/linux-postmarketos-mediatek-mt81xx/config-postmarketos-mediatek-mt81xx.aarch64
index 06f18b5e1d0..37c6a5d8aa7 100644
--- a/device/testing/linux-postmarketos-mediatek-mt81xx/config-postmarketos-mediatek-mt81xx.aarch64
+++ b/device/testing/linux-postmarketos-mediatek-mt81xx/config-postmarketos-mediatek-mt81xx.aarch64
@@ -6617,10 +6617,8 @@ CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
diff --git a/device/testing/linux-postmarketos-qcom-sc7280/APKBUILD b/device/testing/linux-postmarketos-qcom-sc7280/APKBUILD
index 4248bd706f8..df0849f821d 100644
--- a/device/testing/linux-postmarketos-qcom-sc7280/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-sc7280/APKBUILD
@@ -3,7 +3,7 @@
_flavor="postmarketos-qcom-sc7280"
pkgname=linux-$_flavor
pkgver=6.11.0
-pkgrel=0
+pkgrel=2
pkgdesc="Mainline Kernel fork for SC7280/SM7325/QCM6490 devices"
arch="aarch64"
_carch="arm64"
@@ -55,5 +55,5 @@ package() {
sha512sums="
1ec574e769d48e1b07b8bbba747f44aff5519cd657ed4dd3026e27b11b9278844550556385437567d882a06c477f48c6f208145571d7ea30bcbb966164b15306 linux-v6.11.0-sc7280.tar.gz
-f5dbb255baa79d75e87bb83bb4b5595f762d457c31bc7cd7c1a0849c6791a40adea474fba36b11f52225d565c2db50cb988adbee55d3f1f01f7dbbe564081327 config-postmarketos-qcom-sc7280.aarch64
+bbeb3654d3f0a1657feaf99fb2753c1e3a02588f3384860a334fea1d3bdf7945c95e2ffc7e67e50337bf826ed9c01d41b4609ef67a5b798c37c00779f9dc51dd config-postmarketos-qcom-sc7280.aarch64
"
diff --git a/device/testing/linux-postmarketos-qcom-sc7280/config-postmarketos-qcom-sc7280.aarch64 b/device/testing/linux-postmarketos-qcom-sc7280/config-postmarketos-qcom-sc7280.aarch64
index 875601df928..a04c9ff7ee2 100644
--- a/device/testing/linux-postmarketos-qcom-sc7280/config-postmarketos-qcom-sc7280.aarch64
+++ b/device/testing/linux-postmarketos-qcom-sc7280/config-postmarketos-qcom-sc7280.aarch64
@@ -5302,14 +5302,12 @@ CONFIG_QCOM_GPI_DMA=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
@@ -7093,18 +7091,7 @@ CONFIG_DMA_NEED_SYNC=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_CMA=y
-# CONFIG_DMA_NUMA_CMA is not set
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_CMA is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
diff --git a/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD b/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD
index e887c387c7c..c0650c5a01e 100644
--- a/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD
@@ -4,7 +4,7 @@
_flavor="postmarketos-qcom-sdm660"
pkgname=linux-$_flavor
pkgver=6.10.9
-pkgrel=0
+pkgrel=1
pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon 660 SoC"
arch="aarch64"
url="https://kernel.org/"
@@ -65,5 +65,5 @@ package() {
}
sha512sums="
340ed51059b4f0f29132d1520b4172913f7c4f144db72c2aac7d97f89da4dca00b2af5db4a111c7e55cbf5dea27a803df6bd71d18a5b165b61a84943a9a4b0ce linux-v6.10.9-sdm660.tar.gz
-944df0fd48062e223a6d317cacf0a98babbdeec41395d501acc045d7591489b67f1de3512edfd9e4ba7c79a60530c35b86cdb3d67779617deaa515dde941e0f8 config-postmarketos-qcom-sdm660.aarch64
+f24bf802b6833ac577163d0f6f21ecf57dcc49ac0ab3a6476adaa5a223ffc74e37ee552c6dde6720d808213200e802c1fdb6f739b7a2000430fca2c231517061 config-postmarketos-qcom-sdm660.aarch64
"
diff --git a/device/testing/linux-postmarketos-qcom-sdm660/config-postmarketos-qcom-sdm660.aarch64 b/device/testing/linux-postmarketos-qcom-sdm660/config-postmarketos-qcom-sdm660.aarch64
index 6550c487fc0..7d0d4ee27d1 100644
--- a/device/testing/linux-postmarketos-qcom-sdm660/config-postmarketos-qcom-sdm660.aarch64
+++ b/device/testing/linux-postmarketos-qcom-sdm660/config-postmarketos-qcom-sdm660.aarch64
@@ -4891,14 +4891,12 @@ CONFIG_QCOM_GPI_DMA=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
diff --git a/device/testing/linux-postmarketos-qcom-sm6115/APKBUILD b/device/testing/linux-postmarketos-qcom-sm6115/APKBUILD
index 2557c7a3464..541548d08ad 100644
--- a/device/testing/linux-postmarketos-qcom-sm6115/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-sm6115/APKBUILD
@@ -1,6 +1,6 @@
pkgname=linux-postmarketos-qcom-sm6115
pkgver=6.10
-pkgrel=4
+pkgrel=5
pkgdesc="Mainline Kernel fork for SM6115 devices"
arch="aarch64"
_carch="arm64"
@@ -61,5 +61,5 @@ package() {
sha512sums="
67cf8499a17a18bbeec08eb7729b7dcec05661433dfb37684320ed806bedf105499a3f38dd8662ec1e443ae979d4050094a266fe250b6e6869ddd0eda2b14053 linux-postmarketos-qcom-sm6115-42b61ea7cdb9f531dd53f9e2c844a056db8978c1.tar.gz
-9711d5b77b2c59797c35dcfb599b312f82c472842f1ef56d2ee6a3ed7478b09b4b3699e17511c7921e3b25318d8c592be321501e93315f64cfdc3027a4470a13 config-postmarketos-qcom-sm6115.aarch64
+6dac2ea35503f7dec9bf4e4ed6a42d0fb6cceeaba1e42382aac1e0153e90422b574d57ab5be7e642b858d763b004b65929851993a4521d43faded90be849974b config-postmarketos-qcom-sm6115.aarch64
"
diff --git a/device/testing/linux-postmarketos-qcom-sm6115/config-postmarketos-qcom-sm6115.aarch64 b/device/testing/linux-postmarketos-qcom-sm6115/config-postmarketos-qcom-sm6115.aarch64
index 2a6590cdfc4..37e8393602d 100644
--- a/device/testing/linux-postmarketos-qcom-sm6115/config-postmarketos-qcom-sm6115.aarch64
+++ b/device/testing/linux-postmarketos-qcom-sm6115/config-postmarketos-qcom-sm6115.aarch64
@@ -4796,14 +4796,12 @@ CONFIG_QCOM_GPI_DMA=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
diff --git a/device/testing/linux-postmarketos-qcom-sm8250/APKBUILD b/device/testing/linux-postmarketos-qcom-sm8250/APKBUILD
index 835cb4f453a..1cbfacc052c 100644
--- a/device/testing/linux-postmarketos-qcom-sm8250/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-sm8250/APKBUILD
@@ -5,7 +5,7 @@
_flavor="postmarketos-qcom-sm8250"
pkgname=linux-$_flavor
pkgver=6.10.0
-pkgrel=3
+pkgrel=4
pkgdesc="Mainline kernel fork for SM8250"
arch="aarch64"
_carch="arm64"
@@ -64,5 +64,5 @@ package() {
sha512sums="
2fdaa13c25c573a1b41dec1c6ad71bdbb4bb18f81c41aea1d114e631215371d7970e5a6a407d977366cacfcfe66229788668942c774fddb56037a493e87b2402 linux-postmarketos-qcom-sm8250-sm8250-6.10.0.tar.gz
-1e4d721a9be394fe31e834699a3330bb6b4be556f3d47c4f03f71752bdb24983be9a21e1e87e18eadc954a2168f92cae72e6c041738e997a091cc135dbc5d75a config-postmarketos-qcom-sm8250.aarch64
+e9dbf7f5fbc13be5bd8df50107a157565779ba90edb001e175af68b204364b28714120f698828e8b837ea1cad531187cec6631166e9b103cbf9e0ac4394b9fd3 config-postmarketos-qcom-sm8250.aarch64
"
diff --git a/device/testing/linux-postmarketos-qcom-sm8250/config-postmarketos-qcom-sm8250.aarch64 b/device/testing/linux-postmarketos-qcom-sm8250/config-postmarketos-qcom-sm8250.aarch64
index aca32986779..1c1ebd37810 100644
--- a/device/testing/linux-postmarketos-qcom-sm8250/config-postmarketos-qcom-sm8250.aarch64
+++ b/device/testing/linux-postmarketos-qcom-sm8250/config-postmarketos-qcom-sm8250.aarch64
@@ -5769,14 +5769,12 @@ CONFIG_DMA_ENGINE_RAID=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
diff --git a/device/testing/linux-postmarketos-rockchip-rk3588/APKBUILD b/device/testing/linux-postmarketos-rockchip-rk3588/APKBUILD
index ee07314f97c..fb1d7f30f80 100644
--- a/device/testing/linux-postmarketos-rockchip-rk3588/APKBUILD
+++ b/device/testing/linux-postmarketos-rockchip-rk3588/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
pkgname=linux-postmarketos-rockchip-rk3588
pkgver=6.10_rc1_git20240528
-pkgrel=2
+pkgrel=3
pkgdesc="Rockchip RK3588 kernel package"
arch="aarch64"
url="https://kernel.org"
@@ -70,5 +70,5 @@ package() {
sha512sums="
85fc0d5fb4761b8a806fcaba796c73ece20bca6eb5db0e75ec909e6ac6f320989c71548890490f93991b0d485908de80bf1d545dd352f55f5b6bc007c25687b6 linux-postmarketos-rockchip-rk3588-dc492a647595f2866fb2e20ccf576bcaff42a109.tar.gz
86b0a188df8bf90cb04e871319d92303df7c890dca0d4b411bc6ae5fd569ab4562be82703ddf772603632bd8f6a9bcb857239e3b5bc939048eb5a9faba427b88 orangepi5-plus-dt-fixups.patch
-2920da8f62293e52d32e5c0c05d51d37fe8c616a1684a8e590278d318abad2be12e1b42452d4e6cab132fb2ba7bd35dac92d4a41876230be0b3a1bbfad6bb84c config-postmarketos-rockchip-rk3588.aarch64
+5b192dd1a11a9498e63652bdf9bcde948074b1352449a40de8e831773809e5c866d03e17be61430c1b2485a7ed4a3005616e1f4a33f03efe3960df193962f4c2 config-postmarketos-rockchip-rk3588.aarch64
"
diff --git a/device/testing/linux-postmarketos-rockchip-rk3588/config-postmarketos-rockchip-rk3588.aarch64 b/device/testing/linux-postmarketos-rockchip-rk3588/config-postmarketos-rockchip-rk3588.aarch64
index af0b2769576..c6588164988 100644
--- a/device/testing/linux-postmarketos-rockchip-rk3588/config-postmarketos-rockchip-rk3588.aarch64
+++ b/device/testing/linux-postmarketos-rockchip-rk3588/config-postmarketos-rockchip-rk3588.aarch64
@@ -6576,14 +6576,12 @@ CONFIG_DMA_ENGINE_RAID=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
-CONFIG_DMABUF_HEAPS=y
+# CONFIG_DMABUF_HEAPS is not set
# CONFIG_DMABUF_SYSFS_STATS is not set
-# CONFIG_DMABUF_HEAPS_SYSTEM is not set
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
diff --git a/device/testing/linux-powkiddy-x55/APKBUILD b/device/testing/linux-powkiddy-x55/APKBUILD
index 5e9f1941bb7..1820a955893 100644
--- a/device/testing/linux-powkiddy-x55/APKBUILD
+++ b/device/testing/linux-powkiddy-x55/APKBUILD
@@ -2,7 +2,7 @@
pkgname=linux-powkiddy-x55
pkgdesc="The $pkgname kernel and modules"
pkgver=6.8.6
-pkgrel=4
+pkgrel=5
arch="aarch64"
url="https://kernel.org"
license="GPL-2.0-only"
@@ -68,5 +68,5 @@ package() {
sha512sums="
5da8000a640243d06c456eb4102592134fcc5051785d91c53845fd693d0b0aca9751a7179ab8c8bdc633fc039c7ce8cfbec8357fdca9d01509b2dfb251b2586c linux-6.8.6.tar.xz
b38ed4cfe0f20b440426c4ba55eb727cfa64f01370f22d7aca486df4f44aceec1c1d0790c29b8984b151bee0d3ef671253d220dc0c7bec9fef6a4ce1b6cf6169 rtw88_wifi_fix.patch
-e32358a13cd5c3d73c4f6d46f75f43438ecd25256d8cb124d57b5e3d7e77334339576c046180f2858fde421e6c392ee67777fbf1f387e31097946211e7d25e17 config-powkiddy-x55.aarch64
+2e3cb6d71b64aa0d4c099591540e0fbafdd68cf019332fa713e8ab03450228b05731dec922fa005cc558bdb848804310615f41df1db924e0cc82173d1ff2f701 config-powkiddy-x55.aarch64
"
diff --git a/device/testing/linux-powkiddy-x55/config-powkiddy-x55.aarch64 b/device/testing/linux-powkiddy-x55/config-powkiddy-x55.aarch64
index dc70301f15d..cc2173d1218 100644
--- a/device/testing/linux-powkiddy-x55/config-powkiddy-x55.aarch64
+++ b/device/testing/linux-powkiddy-x55/config-powkiddy-x55.aarch64
@@ -956,11 +956,7 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_MEMORY_FAILURE is not set
CONFIG_ARCH_WANTS_THP_SWAP=y
# CONFIG_TRANSPARENT_HUGEPAGE is not set
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-# CONFIG_CMA_SYSFS is not set
-CONFIG_CMA_AREAS=7
+# CONFIG_CMA is not set
CONFIG_GENERIC_EARLY_IOREMAP=y
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
# CONFIG_IDLE_PAGE_TRACKING is not set
@@ -5589,7 +5585,6 @@ CONFIG_UDMABUF=y
CONFIG_DMABUF_HEAPS=y
# CONFIG_DMABUF_SYSFS_STATS is not set
CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMABUF_HEAPS_CMA=y
# end of DMABUF options
# CONFIG_UIO is not set
@@ -7291,17 +7286,6 @@ CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
CONFIG_DMA_NONCOHERENT_MMAP=y
CONFIG_DMA_COHERENT_POOL=y
CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_DMA_MAP_BENCHMARK is not set
CONFIG_SGL_ALLOC=y
diff --git a/kconfigcheck.toml b/kconfigcheck.toml
index d2235ea4674..9fb6166ad97 100644
--- a/kconfigcheck.toml
+++ b/kconfigcheck.toml
@@ -325,10 +325,7 @@ EFI_PARAMS_FROM_FDT = true
EFI_ZBOOT = true
["category:libcamera".">=0.0.0"."aarch64"]
-DMABUF_HEAPS_CMA = true
-DMABUF_HEAPS = true
-DMA_CMA = true
-CMA = true
+UDMABUF = true
["category:input".">=0.0.0"."all"]
BT_HIDP = true # Bluetooth HID
--
GitLab