systemd/abuild: drop

we have abuild in both the systemd and edge repos due to #3452 it seems like just adding an explicit bootstrap step is enough to get things going properly. That probably isn't even needed since it seems like the bootstrap failure we saw was specific to that scenario and probably wouldn't show up again. but better safe than sorry. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
2025-01-13 17:15:13 +01:00
311 changed files with 7339 additions and 22256 deletions
@@ -71,7 +71,6 @@ update_linux_next() {

 	echo "Updating linux-next from $pkgver to $new_pkgver..."
 	sed -i -e "s/pkgver=$pkgver/pkgver=$new_pkgver/" device/testing/linux-next/APKBUILD
-	sed -i -e "s/^pkgrel=.*/pkgrel=0/" device/testing/linux-next/APKBUILD

 	# Update the checksums
 	pmbootstrap checksum linux-next
@@ -110,10 +110,6 @@ if __name__ == "__main__":
    # FIXME: this should probably be more generic, if other repos are added later?
    if systemd_pkgs:
        common.run_pmbootstrap(["config", "systemd", "always"])
-        # To fix the ERROR: Chroot 'native' is for the 'edge' channel, but you are on the
-        # 'systemd-edge' channel. Run 'pmbootstrap zap' to delete your chroots and try again.
-        # To do this automatically, run 'pmbootstrap config auto_zap_misconfigured_chroots yes'.
-        common.run_pmbootstrap(["config", "auto_zap_misconfigured_chroots", "yes"])

        verify_only = common.commit_message_has_string("[ci:skip-build]")
        if verify_only:
@@ -1,10 +1,14 @@
 {
    "subject_format": {
        "pass": [
-            "^(([a-z]+\\/\\)?\\([a-z\\-0-9*{}]+),?)+: [a-z][A-Za-z\\/\\-0-9*{}\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
-            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$",
-            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$",
-            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\.,_ ]+( \\(MR \\d+\\)|)$"
+            "^(([a-z]+\\/[a-z\\-0-9*{}]+),?)+: [A-Za-z\\/\\-0-9*{}\\(\\)\\.,_&:=' ]+( \\(MR \\d+\\)|)$",
+            "^CI: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^mrhlpr.json: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$",
+            "^pmaports.cfg: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
+        ],
+        "unknown": [
+            "^[a-z-0-9_.*{}\\/]+: [a-z-0-9*{}\\(\\)\\.,_ ][A-Za-z\\/\\-0-9*{}\\(\\)\\.,_ ]+( \\(MR \\d+\\)|)$"
        ]
    }
 }
+
@@ -1 +0,0 @@
-https://postmarketos.org/funding.json
@@ -1,162 +0,0 @@
-This page lists all of the various projects that postmarketOS maintains, along with the team members that maintain them. To become a maintainer, simply talk with the current maintainer(s) if there are any, or add yourself if you are interested and there are no maintainers.
-
-
-=== Main ===
-
-{| class="wikitable" style="margin:auto"
-|-
-! Project !! Description !! Maintainers !! Repository !! Issue tracker
-
-
-=== Tools ===
-
-{| class="wikitable" style="margin:auto"
-|-
-! Project !! Description !! Maintainers !! Repository !! Issue tracker
-
-
-=== Infra ===
-
-{| class="wikitable" style="margin:auto"
-|-
-! Project !! Description !! Maintainers !! Repository !! Issue tracker
-|-
-| [Package browser https://pkgs.postmarketos.org ]] || Python implementation of aports-turbo || || [https://gitlab.com/postmarketOS/apkbrowser apkbrowser] || [https://gitlab.com/postmarketOS/apkbrowser/-/issues/new Report issue]
-
-
-
-{| class="wikitable" style="margin:auto"
-|-
-! Project !! Description !! Maintainers
-|-
-| [https://gitlab.com/postmarketOS/aports-turbo aports-turbo] || ||
-|-
-| [https://gitlab.com/postmarketOS/artwork artwork] || ||
-|-
-| [https://gitlab.com/postmarketOS/asus-transformer-blobtools asus-transformer-blobtools] || ||
-|-
-| [https://gitlab.com/postmarketOS/boot-deploy boot-deploy] || || [[User:craftyguy|craftyguy]] ([[User:Caleb|Caleb]] trying to help)
-|-
-| [https://gitlab.com/postmarketOS/bootmac bootmac] || ||
-|-
-| [https://gitlab.com/postmarketOS/buffybox BuffyBox] || ||
-|-
-| [https://gitlab.com/postmarketOS/build.postmarketos.org build.postmarketos.org] || || [[User:ollieparanoid|ollieparanoid]]
-|-
-| [https://gitlab.com/postmarketOS/cast.postmarketos.org cast.postmarketos.org] || || [[User:ollieparanoid|ollieparanoid]]
-|-
-| [https://gitlab.com/postmarketOS/charging-sdl charging-sdl] || ||
-|-
-| [https://gitlab.com/postmarketOS/ci-common ci-common] || || [[User:ollieparanoid|ollieparanoid]]
-|-
-| [https://gitlab.com/postmarketOS/fbdebug fbdebug] || ||
-|-
-| [https://gitlab.com/postmarketOS/gnss-share gnss-share] || || [[User:craftyguy|craftyguy]]
-|-
-| [https://gitlab.com/postmarketOS/gpmbootstrap gpmbootstrap] || ||
-|-
-| [https://gitlab.com/postmarketOS/hkdm HKDM] || || [[User:Caleb|Caleb]]
-|-
-| [https://gitlab.com/postmarketOS/install-makedepends install-makedepends] || ||
-|-
-| [https://gitlab.com/postmarketOS/jonathan jonathan] || Matrix chat bot for managing/syncing cross-room power levels and access, and handling shortcuts ||
-|-
-| [https://gitlab.com/postmarketOS/libapk-qt libapk-qt (ApkQt)] || || [[User:Alexeymin|Alexey Min]]
-|-
-| [https://gitlab.com/postmarketOS/mobile-config-firefox mobile-config-firefox] || ||
-|-
-| [https://gitlab.com/postmarketOS/monitoring monitoring] || ||
-|-
-| [https://gitlab.com/postmarketOS/mrhlpr mrhlpr] || || [[User:ollieparanoid|ollieparanoid]] and [[User:Pabloyoyoista|pabloyoyoista]]
-|-
-| [https://gitlab.com/postmarketOS/msm-cros-efs-loader msm-cros-efs-loader] || || [[User:Jenneron|Jenneron]]
-|-
-| [https://gitlab.com/postmarketOS/msm-firmware-loader msm-firmware-loader] || || [[User:TravMurav|TravMurav]]
-|-
-| [https://gitlab.com/postmarketOS/obex-capabilities obex-capabilities] || ||
-|-
-| [https://gitlab.com/postmarketOS/ondev2 ondev2] || || [[User:ollieparanoid|ollieparanoid]]
-|-
-| [https://gitlab.com/postmarketOS/openrc-settingsd openrc-settingsd] || ||
-|-
-| [https://gitlab.com/postmarketOS/pbsplash pbsplash] || || [[User:Caleb|Caleb]]
-|-
-| [https://gitlab.com/postmarketOS/pmaports pmaports] || || Various, see [https://gitlab.com/postmarketOS/pmaports/-/blob/master/CODEOWNERS CODEOWNERS] and APKBUILDs in repo
-|-
-| [https://gitlab.com/postmarketOS/pmbootstrap pmbootstrap] || || [[User:ollieparanoid|ollieparanoid]]
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-android-recovery-installer postmarketos-android-recovery-installer] || ||
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-apparmor-profiles postmarketos-apparmor-profiles] || ||
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-backup postmarketos-backup] || ||
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-demos postmarketos-demos] || ||
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-mkinitfs postmarketos-mkinitfs] || || [[User:craftyguy|craftyguy]]
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-release-upgrade postmarketos-release-upgrade] || ||
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-testing-template-generator postmarketos-testing-template-generator] || || [[User:Jenneron|Jenneron]]
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-theme postmarketos-theme] || ||
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-tweaks postmarketos-tweaks] || ||
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-upgrade-gtk3 postmarketOS Upgrade GTK3] || ||
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-welcome postmarketOS Welcome] || ||
-|-
-| [https://gitlab.com/postmarketOS/postmarketos.org postmarketos.org] || || [[User:ollieparanoid|ollieparanoid]]
-|-
-| [https://gitlab.com/postmarketOS/q6voiced q6voiced] || ||
-|-
-| [https://gitlab.com/postmarketOS/reboot-mode reboot-mode] || ||
-|-
-| [https://gitlab.com/postmarketOS/status.postmarketos.org status.postmarketos.org] || ||
-|-
-| [https://gitlab.com/postmarketOS/swclock-offset swclock-offset] || ||
-|-
-| [https://gitlab.com/postmarketOS/tinydm tinydm] || || [[User:ollieparanoid|ollieparanoid]]
-|-
-| [https://gitlab.com/postmarketOS/ttq ttq] || || [[User:ollieparanoid|ollieparanoid]]
-|-
-| [https://gitlab.com/postmarketOS/ttyescape TTYEscape] || || [[User:Caleb|Caleb]]
-|-
-| [https://gitlab.com/postmarketOS/unudhcpd unudhcpd] || || [[User:craftyguy|craftyguy]]
-|-
-| [https://gitlab.com/postmarketOS/webflash webflash] || ||
-|-
-| [https://gitlab.com/postmarketOS/wiki wiki] || ||
-|-
-| [https://gitlab.com/postmarketOS/xfce4-phone xfce4-phone] || ||
-|}
-
-== Archived Projects ==
-
-{| class="wikitable" style="margin:auto"
-|-
-! Project !! Reason
-|-
-| [https://gitlab.com/postmarketOS/anbox-image-make anbox-image-make] || || Anbox is no longer maintained and has been replaced by Waydroid
-|-
-| [https://gitlab.com/postmarketOS/gps-nokia-n900 gps-nokia-n900] || || Now maintained under [https://github.com/maemo-leste/gps-nokia-n900 Maemo Leste]
-|-
-| [https://gitlab.com/postmarketOS/linux-postmarketos-archive linux-postmarketos-archive] || || The linux-postmarketos.git repository was removed due to space issues
-|-
-| [https://gitlab.com/postmarketOS/matrix-bot matrix-bot] || || Superseded by jonathan
-|-
-| [https://gitlab.com/postmarketOS/megapixels megapixels] || || Use https://gitlab.com/megapixels-org instead
-|-
-| [https://gitlab.com/postmarketOS/pmOS-repo-scripts pmOS-repo-scripts] || || Superseded by bpo
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-images postmarketos-images] || || Superseded by bpo
-|-
-| [https://gitlab.com/postmarketOS/osk-sdl osk-sdl] || || Superseded by unl0kr
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-ondev postmarketos-ondev] || || Superseded by ondev2
-|-
-| [https://gitlab.com/postmarketOS/postmarketos-splash postmarketos-splash] || || Superseded by pbsplash
-|-
-| [https://gitlab.com/postmarketOS/postprocessd postprocessd] || || Use https://gitlab.com/megapixels-org/postprocessd instead
-|}
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.37.0
-pkgrel=11
+pkgrel=10

 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-4b5bc587f42d06ec8dfb1b1b0dc9bcd5e7b35e6b0223c6e4d3db3ac3567a93eda4b595e7e46b9d4322607380909ebba7361a8ea3e8bfe3fcecb139261b22331d  busybox-static-1.37.0-r11-aarch64-edge.apk
+b71a091d7ae6ee459dd0c51409793214a2285ee83c2621e289e198187ed642222d6f842f08661a8c72f96c9a0dc7271d5a47ab6794e2551f185d68f515bde598  busybox-static-1.37.0-r10-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.37.0
-pkgrel=11
+pkgrel=10

 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-2acc65aa25b8d4a842e951ea357b7f5c9dbcb693c2d7bca7b5256e2a79211b90eb63c0b3b5e146501e679d6db89c9b499090b87e3039b5fce9ef68f039de0eb7  busybox-static-1.37.0-r11-armhf-edge.apk
+88abaead7eace4910199e0cc76bc16bce762d61b2e10e1bc2a631d38e56458f5cb95f98f09d09f346229f9c6c982d3b0b3f907315f54e0e92b83dcc3b839d8bf  busybox-static-1.37.0-r10-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.37.0
-pkgrel=11
+pkgrel=10

 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-016df6eaeda31a8c6236fde4a93a7bed005f61970d53f02d2ca7c91234a7e6587538c8a3fa3ac8cba6aa0cccbf7d0ad104c63c6967e2b6372fe1c5f56b0649ea  busybox-static-1.37.0-r11-armv7-edge.apk
+5bbeb8a0331f25569acc32d574290ec430f0a2a74190550b3913f3e7366082a76b9755c0d52bec57659a2bbd1af3f4fe5928ec988b283a2e731c902cd5e7aa85  busybox-static-1.37.0-r10-armv7-edge.apk
 "
@@ -5,7 +5,7 @@

 pkgname=ccache-cross-symlinks
 pkgver=3
-pkgrel=1
+pkgrel=0
 pkgdesc="Enable ccache for cross-compilers with symlinks"
 url="https://ccache.samba.org/"
 arch="noarch"
@@ -15,7 +15,7 @@ options="!check"

 package() {
 	# Keep in sync with pmb.config.build_device_architectures
-	local _archs="armhf armv7 aarch64 x86_64 x86 riscv64"
+	local _archs="armhf armv7 aarch64 x86_64 x86"

 	local _bins="c++ cc cpp g++ gcc clang clang++"
 	mkdir -p "$pkgdir/usr/lib/ccache/bin"
@@ -20,7 +20,7 @@

 pkgname=crossdirect
 pkgver=5.2.0
-pkgrel=1
+pkgrel=0
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
@@ -31,7 +31,7 @@ source="cargo.sh crossdirect.c rustc.sh rust-qemu-linker.sh"
 build() {
 	cd "$srcdir"
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64 riscv64"
+	_archs="x86_64 armhf armv7 aarch64"
 	for _arch in $_archs; do
 		[ "$_arch" == "$CARCH" ] && continue
 		_hostspec="$(arch_to_hostspec $_arch)"
@@ -48,7 +48,7 @@ build() {

 package() {
 	# Architectures and binaries
-	_archs="x86_64 armhf armv7 aarch64 riscv64"
+	_archs="x86_64 armhf armv7 aarch64"
 	_bins="c++ cc cpp g++ gcc clang clang++"

 	# Rust wrappers
@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=8
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,13 +11,14 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-gru
 	depthcharge-tools
+	eudev-hwids>=3.2.12-r0
 	linux-postmarketos-rockchip
 	postmarketos-base
 	postmarketos-cros-common
 	soc-rockchip-rk3399
 "
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-openrc"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo modules-initfs"

 # provides and replaces to switch old installations to this package
@@ -50,11 +51,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

-openrc() {
-	install_if="$pkgname=$pkgvar-r$pkgrel openrc"
-	depends="eudev-hwids>=3.2.12-r0"
-	mkdir "$subpkgdir"
-}

 sha512sums="
 d0d5e47e7bc6f63f92669a315611c36972e2f06a32c1339ac551f23db023331fb6e1cdbbe4dc2022596aaf8083967951c43585a3aa32c4fddc8d8987bc20c092  deviceinfo
@@ -3,7 +3,7 @@
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
 pkgver=4
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,6 +11,7 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf
 	depthcharge-tools
+	eudev-hwids
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
 	postmarketos-cros-common
@@ -41,11 +42,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

-openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	depends="eudev-hwids"
-	mkdir "$subpkgdir"
-}

 sha512sums="
 f94dcb175e49cbaadce524586ed1c3e3b0182e414c84c495a5585b49ed40ca6f7fa9c73544d19cbad236333f9fd997f150f836452b47a271f99b7b059972c4bc  deviceinfo
@@ -4,7 +4,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
-pkgver=12
+pkgver=11
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -81,5 +81,5 @@ sha512sums="
 38c53d91a60d0402d4cc5428d65e1e8c26360c481c70b34593b1812c87241c32e91904a3bd31fbfe507f7fdb8b50c909eaad8c4c3a37ca962760567329f7f6ee  00-amdgpu-firmware.files
 c17f5c505e0e280a9e51ac1b4264e7703b744fd3831d75ce95f41be4755ae4ccd24b7ca09ba1e236df499a5e748c64a0d2054c9d55d8c8c713fa8c5646ed9a3c  00-i915-firmware.files
 514ff5c946633dccaa569fed51743c669ea9942af4dd891ad001ba08bba07fca92503e29304f3eb71c16bc2f2436e1879ff0bf56d99666e4dcf9635c8605da2e  deviceinfo
-a6e5a9de9fe010966523606f2fcab1c44004228b4e050f777dcb1160fb3e32cda8096925543522216c2eb354f8ce2f8d4e206d98b077fbd6fb840de94e84c706  modules-initfs
+1b3bbfcdc6642488304653aef996dddf7a354e7279f2c735ac7aec404e598948423630fcaa2cac87e2c0aef033ecfc57a7a91154f9dac9a85411db7bad62e677  modules-initfs
 "
@@ -16,5 +16,3 @@ xhci_pci
 ehci_pci
 sdhci_pci
 mmc_block
-nvme
-nvme_core
@@ -3,13 +3,14 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=8
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf>=1.2.7
+	eudev-hwids
 	linux-postmarketos-rockchip>=5.14
 	nvme-cli
 	postmarketos-base>=25-r1
@@ -57,7 +58,6 @@ nonfree_firmware() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="eudev-hwids"

 	mkdir -p "$subpkgdir"
 }
@@ -3,7 +3,7 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
 pkgver=8
-pkgrel=1
+pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -26,6 +26,7 @@ depends="
 	alsa-ucm-conf>=1.2.6.2
 	atinout
 	eg25-manager
+	eg25-manager-openrc
 	iw
 	linux-postmarketos-allwinner>=5.14
 	megapixels
@@ -173,9 +174,8 @@ nonfree_firmware() {
 }

 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install_if="$pkgname=$pkgver-r$pkgrel eg25-manager-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="eg25-manager-openrc"
 	mkdir "$subpkgdir"
 }

@@ -1,12 +1,12 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=firmware-google-sargo
 pkgver=220505.008
-pkgrel=7
+pkgrel=6
 pkgdesc="Proprietary firmware blobs from the Google Pixel 3a factory image"
 url="https://github.com/TheMuppets/proprietary_vendor_google_sargo"
 arch="aarch64"
 license="proprietary"
-makedepends="pil-squasher sscregistrygen zstd"
+makedepends="pil-squasher sscregistrygen"
 _commit="c631f0f2aa24ea60cfb505d327cd4ae56ca27f16"
 _modemfw_commit="34bbe2c27f35537f13747c9eba67ece6ae141806"
 _device_android_commit="a1cd8bf2603569b8b3b450b9d7b5b595eb549df0"
@@ -17,7 +17,6 @@ source="
 "
 builddir="$srcdir/proprietary_vendor_google_sargo-$_commit"
 options="!check !archcheck !strip !tracedeps pmb:cross-native"
-_modemfw_dir="$srcdir/firmware-google-sargo-modem-$_modemfw_commit"

 build() {
 	pil-squasher a615_zap.mbn proprietary/vendor/firmware/a615_zap.mdt
@@ -26,42 +25,33 @@ build() {
 	# This is an OEM device. The SoC ID for SDM670 is 336.
 	mkdir sensors-registry
 	sscregistrygen -p OEM -s 336 proprietary/vendor/etc/sensors/config sensors-registry/
-
-	# Compress kernel-loaded firmware
-	zstd a615_zap.mbn
-	zstd ipa_fws.mbn
-
-	zstd proprietary/vendor/firmware/adsp.mbn
-	zstd proprietary/vendor/firmware/venus.mbn
-	zstd proprietary/vendor/firmware/wlanmdsp.mbn
-
-	zstd "$_modemfw_dir"/modemfw/mba.mbn
-	zstd "$_modemfw_dir"/modemfw/modem.mbn
 }

 package() {
-	install -Dm644 "$builddir"/a615_zap.mbn.zst \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/a615_zap.mbn.zst
-	install -Dm644 "$builddir"/ipa_fws.mbn.zst \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/ipa_fws.mbn.zst
+	_modemfw_dir="$srcdir"/firmware-google-sargo-modem-"$_modemfw_commit"

-	install -Dm644 "$builddir"/proprietary/vendor/firmware/adsp.mbn.zst \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/adsp.mbn.zst
+	install -Dm644 "$builddir"/a615_zap.mbn \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/a615_zap.mbn
+	install -Dm644 "$builddir"/ipa_fws.mbn \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/ipa_fws.mbn
+
+	install -Dm644 "$builddir"/proprietary/vendor/firmware/adsp.mbn \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/adsp.mbn
 	install -Dm644 "$builddir"/proprietary/vendor/firmware/adspr.jsn \
 		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/adspr.jsn
 	install -Dm644 "$builddir"/proprietary/vendor/firmware/adspua.jsn \
 		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/adspua.jsn
 	install -Dm644 "$builddir"/proprietary/vendor/firmware/modemuw.jsn \
 		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/modemuw.jsn
-	install -Dm644 "$builddir"/proprietary/vendor/firmware/venus.mbn.zst \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/venus.mbn.zst
-	install -Dm644 "$builddir"/proprietary/vendor/firmware/wlanmdsp.mbn.zst \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/wlanmdsp.mbn.zst
+	install -Dm644 "$builddir"/proprietary/vendor/firmware/venus.mbn \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/venus.mbn
+	install -Dm644 "$builddir"/proprietary/vendor/firmware/wlanmdsp.mbn \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/wlanmdsp.mbn

-	install -Dm644 "$_modemfw_dir"/modemfw/mba.mbn.zst \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/mba.mbn.zst
-	install -Dm644 "$_modemfw_dir"/modemfw/modem.mbn.zst \
-		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/modem.mbn.zst
+	install -Dm644 "$_modemfw_dir"/modemfw/mba.mbn \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/mba.mbn
+	install -Dm644 "$_modemfw_dir"/modemfw/modem.mbn \
+		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/modem.mbn
 	install -Dm644 "$_modemfw_dir"/modemfw/modemr.jsn \
 		       "$pkgdir"/lib/firmware/qcom/sdm670/sargo/modemr.jsn

@@ -1,6 +1,6 @@
-# Maintainer: Barnabas Czeman <barnabas.czeman@postmarketos.org>
+# Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=firmware-qcom-msm8953
-pkgver=2
+pkgver=1
 pkgrel=0
 pkgdesc="Firmware files for Qualcomm MSM8953 devices"
 url="https://postmarketos.org"
@@ -11,7 +11,6 @@ options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 _asus_ze520kl_commit="f1439210719b2a1597f6390f34ae93cb1470ddf4"
 _fairphone_fp3_commit="ee529820bb874ab1b52873f0b144c3786f01ee4c"
 _huawei_milan_commit="f417e07a32310ee4002ca67a3d57f9ba0a960297"
-_lenovo_cd18781y_commit="337032e864fd6abe29375997fc3683398a4d27c4"
 _lenovo_kuntao_commit="009a366625c413aee2cc827ae94ed8ca75a3cebb"
 _motorola_ali_commit="153ba76124497fb7ce22d87a90149a15bcf67942"
 _motorola_ocean_commit="787dcae00d0866079c6f55dc3ddf6592279b0661"
@@ -29,7 +28,6 @@ source="
 	firmware-asus-ze520kl-$_asus_ze520kl_commit.tar.gz::https://gitlab.com/Smankusors/firmware-asus-zenfone3/-/archive/$_asus_ze520kl_commit/firmware-asus-zenfone3-$_asus_ze520kl_commit.tar.gz
 	firmware-fairphone-fp3-$_fairphone_fp3_commit.tar.gz::https://github.com/FairBlobs/FP3-firmware/archive/$_fairphone_fp3_commit/FP3-firmware-$_fairphone_fp3_commit.tar.gz
 	firmware-huawei-milan-$_huawei_milan_commit.tar.gz::https://github.com/bzy-080408/postmarketos-vendor-huawei-milan/archive/$_huawei_milan_commit.tar.gz
-	firmware-lenovo-cd18781y-$_lenovo_cd18781y_commit.tar.gz::https://gitlab.com/kaechele/postmarketos-vendor-lenovo-cd-18781y/-/archive/$_lenovo_cd18781y_commit/firmware-lenovo-cd18781y-$_lenovo_cd18781y_commit.tar.gz
 	firmware-lenovo-kuntao-$_lenovo_kuntao_commit.tar.gz::https://gitlab.com/raihan2000/firmware-lenovo-kuntao/-/archive/$_lenovo_kuntao_commit/firmware-lenovo-kuntao-$_lenovo_kuntao_commit.tar.gz
 	firmware-motorola-ali-$_motorola_ali_commit.tar.gz::https://github.com/moto-g6-mainlining/firmware-blobs/archive/$_motorola_ali_commit.tar.gz
 	firmware-motorola-ocean-$_motorola_ocean_commit.tar.gz::https://gitlab.com/Ultra-azu/firmware-motorola-ocean/-/archive/$_motorola_ocean_commit/firmware-motorola-ocean-$_motorola_ocean_commit.tar.gz
@@ -44,8 +42,7 @@ source="
 	firmware-xiaomi-ysl-$_xiaomi_ysl_commit.tar.gz::https://gitlab.com/barni2000/firmware-xiaomi-ysl/-/archive/$_xiaomi_ysl_commit/firmware-xiaomi-ysl-$_xiaomi_ysl_commit.tar.gz
 "

-_basefwdir="/lib/firmware"
-_fwdir="$_basefwdir/qcom/msm8953"
+_fwdir="/lib/firmware/qcom/msm8953"

 package() {
 	asus_ze520kl_dir="$srcdir/firmware-asus-zenfone3-$_asus_ze520kl_commit"
@@ -62,15 +59,6 @@ package() {
 	install -Dm644 "$huawei_milan_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/huawei/milan"
 	install -Dm644 "$huawei_milan_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/huawei/milan"

-	lenovo_cd18781y_dir="$srcdir/postmarketos-vendor-lenovo-cd-18781y-$_lenovo_cd18781y_commit"
-	install -Dm644 "$lenovo_cd18781y_dir/bt/nvm_00150100.bin" -t "$pkgdir/$_basefwdir/qca"
-	install -Dm644 "$lenovo_cd18781y_dir/bt/rampatch_00150100.bin" -t "$pkgdir/$_basefwdir/qca"
-	install -Dm644 "$lenovo_cd18781y_dir/gpu/a506_zap.b02" -t "$pkgdir/$_fwdir/lenovo/cd-18781y"
-	install -Dm644 "$lenovo_cd18781y_dir/gpu/a506_zap.mdt" -t "$pkgdir/$_fwdir/lenovo/cd-18781y"
-	install -Dm644 "$lenovo_cd18781y_dir/sound/tas5728m_dsp_lenovo_cd-18781y.bin" -t "$pkgdir/$_basefwdir"
-	install -Dm644 "$lenovo_cd18781y_dir/wifi/board-2.bin" -t "$pkgdir/$_basefwdir/ath10k/QCA9379/hw1.0"
-	install -Dm644 "$lenovo_cd18781y_dir/wifi/firmware-sdio-6.bin" -t "$pkgdir/$_basefwdir/ath10k/QCA9379/hw1.0"
-
 	lenovo_kuntao_dir="$srcdir/firmware-lenovo-kuntao-$_lenovo_kuntao_commit"
 	install -Dm644 "$lenovo_kuntao_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/lenovo/kuntao"
 	install -Dm644 "$lenovo_kuntao_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/lenovo/kuntao"
@@ -78,17 +66,14 @@ package() {
 	motorola_ali_dir="$srcdir/firmware-blobs-$_motorola_ali_commit"
 	install -Dm644 "$motorola_ali_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/motorola/ali"
 	install -Dm644 "$motorola_ali_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/motorola/ali"
-	install -Dm644 "$motorola_ali_dir/wlan/prima/WCNSS_qcom_wlan_nv.bin" -t "$pkgdir/$_fwdir/motorola/ali"

 	motorola_potter_dir="$srcdir/firmware-motorola-potter-$_motorola_potter_commit/lib/firmware/postmarketos"
 	install -Dm644 "$motorola_potter_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/motorola/potter"
 	install -Dm644 "$motorola_potter_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/motorola/potter"
-	install -Dm644 "$motorola_potter_dir/wlan/prima/WCNSS_qcom_wlan_nv.bin" -t "$pkgdir/$_fwdir/motorola/potter"

 	motorola_ocean_dir="$srcdir/firmware-motorola-ocean-$_motorola_ocean_commit/lib/firmware/postmarketos"
 	install -Dm644 "$motorola_ocean_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/motorola/ocean"
 	install -Dm644 "$motorola_ocean_dir/a506_zap.mdt" -t "$pkgdir/$_fwdir/motorola/ocean"
-	install -Dm644 "$motorola_ocean_dir/wlan/prima/WCNSS_qcom_wlan_nv.bin" -t "$pkgdir/$_fwdir/motorola/ocean"

 	xiaomi_daisy_dir="$srcdir/firmware-xiaomi-daisy-$_xiaomi_daisy_commit/gpu"
 	install -Dm644 "$xiaomi_daisy_dir/a506_zap.b02" -t "$pkgdir/$_fwdir/xiaomi/daisy"
@@ -127,7 +112,6 @@ sha512sums="
 a9980ae2ab0868d7e8e2d054e72525c030fe75d66aec6eebd2e17619d5d24455de2a158ea7ed0eb0db2f7a2f4bc07701672de217f8c7274599cd92c00cb2d04e  firmware-asus-ze520kl-f1439210719b2a1597f6390f34ae93cb1470ddf4.tar.gz
 efa827787814ff4a59a0a61ca66410e46ce0add29b1451b4962b2d8af1d52b7035a0550b188fd442358702252964e4b64b16f836c5dcb1f748102cd0550aff7b  firmware-fairphone-fp3-ee529820bb874ab1b52873f0b144c3786f01ee4c.tar.gz
 f04a54bd81e389001e95357ffe301a10285c54782f70bb8ac9aed30173a6c9594b3568649d287234769b413cc3f93dbc982b3c596d287947d4630eaf98954451  firmware-huawei-milan-f417e07a32310ee4002ca67a3d57f9ba0a960297.tar.gz
-ed6ac4faa37312924de5498c4319338f842e69bd79f9ebfbf9c5dc9ce5d9cf7ca4d81e5ade31bc8ffc31f5489f7d752605d04a438e813966e0096d0d09c31e63  firmware-lenovo-cd18781y-337032e864fd6abe29375997fc3683398a4d27c4.tar.gz
 ebf5a43df59ec99ae63483cff1d0cfd25fa754e30910d8f9130bf43cc5c44278b5a23652585c44902fca943b022b858e3c6d55822aea45930a999dcce16285ee  firmware-lenovo-kuntao-009a366625c413aee2cc827ae94ed8ca75a3cebb.tar.gz
 269ac182806e9128557ac614142bfd6a2feab2cc3d2555268064df7ad1880de0d5e85b781a34ca57693d9c32ffe7d31da7fd34f9fd6364bc2b7cc2fdb90edc80  firmware-motorola-ali-153ba76124497fb7ce22d87a90149a15bcf67942.tar.gz
 fd0888bb6a0beeca961d9aabd0e60be64dfd841c3c89c7cdb8e7c1284347c4f56b2bad6a73aebc81e86625a4b548b5d2417ca31de6803ea5b3b58c7c1d97be51  firmware-motorola-ocean-787dcae00d0866079c6f55dc3ddf6592279b0661.tar.gz
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-google-veyron
 pkgver=6.1.39
-pkgrel=8
+pkgrel=6
 pkgdesc="Mainline kernel for Google Veyron devices"
 arch="armv7"
 _carch="arm"
@@ -68,7 +68,7 @@ package() {

 sha512sums="
 20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41  linux-6.1.39.tar.xz
-07c331bd25e68dec5e42e87845359ae9df7605ceb509599d5ea85f30aae473ced3b07913291343df87b153fc7891f5c6a530aa8eeff723bfd9c7a63c6399dcb6  config-google-veyron.armv7
+a31ab390d31e6de259d387228ff932fa47f794f89f672450133eb754b51c06fc3ba1d414d1d6f255064f57a8754a762336c03656236416d7801bf8e496cc15bb  config-google-veyron.armv7
 2912c675c1e07f7e91e2edcaa82738643907ed46614e4b871565930ff4ffece468d47db7905c2c081f936c020ea78db4a9d9f33b76c110125a0e68a1bd57f9fd  veyron.better_clock_selection_logic_and_dts_rate_list.patch
 b16da0e0b1da9f074a773300e954aa5e0da6c2113e20c0b594a7a4875e9addb10efcf5be694467fb00cd8d7c2e3cc83e6d7aac618047775dc0bb354245cf7c35  veyron.dts_allow_dedicating_npll_to_vop.patch
 b7bda162526abdb61c0223f1aac31893526d3d1d21d79ebd3e707be8d9b5dc464f6b4fa20b74444c44fda987352728433913f6f50b9b860c2621d11ae2306e1b  veyron.dts_do_dedicate_npll_to_vop.patch
@@ -2934,7 +2934,7 @@ CONFIG_SERIAL_MILBEAUT_USIO_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
 # CONFIG_RPMSG_TTY is not set
@@ -12,7 +12,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community
-	pmb:kconfigcheck-pinephonepro
 	"
 makedepends="
 	bash
@@ -4,7 +4,7 @@ _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
 pkgver=6.12.1_git20241127
-pkgrel=4
+pkgrel=1
 _tag="orange-pi-6.12-20241127-2323"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
@@ -80,8 +80,8 @@ package() {
 }
 sha512sums="
 a4317f9b9c1ebe7692d4fd51f88e00f5f3c1f043cd2c5f0375d10e44a5f10dc69b60a61baf79a47477be403c4493a49b98361817b0d969ac6225853387c17f2f  linux-postmarketos-allwinner-orange-pi-6.12-20241127-2323.tar.gz
-19809b1c7356ee63ace7cf01d91ae32cd6c1920eee63015c23fec96a62180c0269fbfe4aeaaaee1a77baf6e63d5c362c3208c49bd6f69ec2810359c1309db542  config-postmarketos-allwinner.aarch64
-cd9304191ec960471fd400cf2398a29108caf992050ed5b2d9b61e3dad6fdd3fda32fc9802fc608118098b9b39a3768aab2f72d6c49e0093d5fbf3a967b7fc2f  config-postmarketos-allwinner.armv7
+49d64d85686c8cd5340961aa81dad1e6c779dd69b56d72a8151c365de59cff7ab1b2b049a6233b15e681d89abf89819895853ba1bb7e99c7b08b473584870cee  config-postmarketos-allwinner.aarch64
+532ab8977e0b80b4559930ed2ff412744ac052c53f02c9b029141d65c1d1592f55fc680506ecf63fc1549585e4dfc3899f309bf28fb1a827d04bbfe0f70d2ad1  config-postmarketos-allwinner.armv7
 3390171525fb75506ba54b4115df9b63b427799a80be55c9ddb457da4cbf389ef7ca581c2d92a820be7c198a4460b40c417e2585fc4eb8e58080cf81a6301ef9  0001-dts-add-dontbeevil-pinephone-devkit.patch
 4c8f53eca5d9569b594528c2d15d397b937049bace60457c6686762a5a6ed223945d8d37afa298ae158a62aeda373a79224ff93c951631c3c6ce999b3951577e  0002-dts-add-pinetab-dev-old-display-panel.patch
 a72ed92e86e736963a119c7509c2b8228e54ae6e4618e12b12a49a80484364d7613b17702654efcf42563947cb35d9ccb507a6a6bac8e33916899709a5d465b8  0003-dts-pinetab-add-missing-ohci1.patch
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.8 Kernel Configuration
+# Linux/arm64 6.12.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -405,7 +405,6 @@ CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CAVIUM_TX2_ERRATUM_219=y
 CONFIG_FUJITSU_ERRATUM_010001=y
 CONFIG_HISILICON_ERRATUM_161600802=y
-CONFIG_HISILICON_ERRATUM_162100801=y
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
@@ -932,7 +931,6 @@ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
-CONFIG_VMAP_PFN=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
 CONFIG_ARCH_USES_PG_ARCH_2=y
@@ -1674,7 +1672,6 @@ CONFIG_SUNXI_RSB=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 # CONFIG_ARM_FFA_TRANSPORT is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
-# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set

@@ -2484,7 +2481,7 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
@@ -3924,7 +3921,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYSMEM_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
-CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y
 CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
@@ -5211,7 +5207,6 @@ CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
 # CONFIG_HISILICON_ERRATUM_161010101 is not set
 # CONFIG_ARM64_ERRATUM_858921 is not set
 CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
-# CONFIG_ARM_TIMER_SP804 is not set
 # end of Clock Source drivers

 CONFIG_MAILBOX=y
@@ -6825,6 +6820,8 @@ CONFIG_SCHED_INFO=y
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging

+# CONFIG_DEBUG_TIMEKEEPING is not set
+
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.12.8 Kernel Configuration
+# Linux/arm 6.12.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1495,7 +1495,6 @@ CONFIG_SUNXI_RSB=y
 # CONFIG_FW_CFG_SYSFS is not set
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
-# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y

 #
@@ -2499,7 +2498,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_VIRTIO_CONSOLE is not set
@@ -3779,7 +3778,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYSMEM_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
-CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y
 CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
@@ -5001,7 +4999,6 @@ CONFIG_SUN4I_TIMER=y
 CONFIG_SUN5I_HSTIMER=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-# CONFIG_ARM_TIMER_SP804 is not set
 # CONFIG_MICROCHIP_PIT64B is not set
 # end of Clock Source drivers

@@ -6602,6 +6599,8 @@ CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging

+# CONFIG_DEBUG_TIMEKEEPING is not set
+
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
@@ -5,7 +5,7 @@

 pkgname=linux-postmarketos-exynos4
 pkgver=6.10.0
-pkgrel=7
+pkgrel=5
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@@ -70,5 +70,5 @@ package() {

 sha512sums="
 a320d0be4532f469be015e2a6706e507e89daaa55ad50d57a56451dca04b6bbea56f62d15877ef000027ce887ecd04257f9c71d7c9d80aab55607494205fa5c7  linux-postmarketos-exynos4-v6.10.0-exynos4.tar.bz2
-1bfa1ce7c0af3a689efdc27cd9683cb8c38384e877951e0b1369422b2ac6e6995f0a5037fd0dc04b3ba515e0f48deceac020848ee81ea5a4a81affb47ac5993e  config-postmarketos-exynos4.armv7
+f145dc30e7a55258c0fd0c19a440aa95ec6a1000ab06c24a4137a59cacea55e6d356dd89245f9b62bd8fcbdc2acdc3fa40c1dd6de43e2b7540de7766aae3ef32  config-postmarketos-exynos4.armv7
 "
@@ -2384,7 +2384,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
@@ -5,7 +5,7 @@

 pkgname=linux-postmarketos-exynos5
 pkgver=6.6.59
-pkgrel=2
+pkgrel=0
 pkgdesc="Mainline kernel fork for Samsung Exynos5 devices"
 arch="armv7"
 _carch="arm"
@@ -70,5 +70,5 @@ package() {

 sha512sums="
 db6976d67236b2612c7dcbb201c1f0cad403358418cf359ec9a5e02eeeaa01aebb812eaa575ff7f986e3123e9a971bfe8587dc4ce1be750a88490644dcfe9545  linux-postmarketos-exynos5-v6.6.59-exynos5-lts.tar.bz2
-b0abd55b2b96cba6f51f0dea4ef42766269f30794e5f1af1c846447898f6b1709466c1029a39178bb98c5cbb65c5fb90825b44f6e336e2f88fdfebd6c20c2611  config-postmarketos-exynos5.armv7
+5cfee4cfbe30afeacf467a8db4dc98321e12a58bf9a2d55b8fd81a943b3c7bab4bbb88e115000636f83ae8d848fbb964dc20683f02b20c5e14b79f829d0cfda1  config-postmarketos-exynos5.armv7
 "
@@ -2762,7 +2762,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-grate
 pkgver=6.6.22
-pkgrel=8
+pkgrel=6
 pkgdesc="Linux kernel with experimental patches for Tegra"
 arch="armv7"
 url="https://gitlab.com/grate-driver/linux"
@@ -49,5 +49,5 @@ package() {

 sha512sums="
 db25898c5c4103e12ace113de7f7eba91b41f94a4dae270c9424341e8f796a98dee8676d1d02b229b0c4b11cc79b31454a13f9f2b7b1277b5ca9bb7328d54a39  linux-postmarketos-grate-v6.6.22-lts.tar.bz2
-5fd5fa43fd4c13a1670e63ee2294f8c43d760c03d8abb2319792cd9936cb5de3496bbc157beb5cb089ce2d20413d1c8b94d3f23642b1c7d142ea415285ed6fc7  config-postmarketos-grate.armv7
+6ec4270231dd32d9a18f5d9f3878bf40411d50ae84a15c2316cb93122fa6ea89fd2d92e26725ae775376ee3665fd3567fdd9b8d6b70a98d11474bd14207c3891  config-postmarketos-grate.armv7
 "
@@ -2467,7 +2467,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
@@ -1,8 +1,8 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.12.6
-pkgrel=3
+pkgver=6.12.9
+pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -66,7 +66,7 @@ package() {
 }

 sha512sums="
-35fcfc5044b1bf892b6432a330df26c5601f78f78f416400359f5e08c448255bcf424de611e67ff7ac72d014884d5f3c6c2bddb20d08dd47469df5c0424832f9  linux-6.12.6.tar.xz
-ba25e07a8bc70a695e7c65176f3f105d35f4f8b40d1d65d7ed9e1f12ccb416bb7d6ee24687d914bf39f9a486064ea97dac897620ee4dac3ab5bfef8b60317561  config-postmarketos-mediatek-mt8173.aarch64
+3538c19b22f1810849e01ad7005f39b0c4e1e2de99f3168bb6a35ad9d51d7ec7b22a8203890e7b073bff83951f930245d5857a86cef80454800136a53047ff37  linux-6.12.9.tar.xz
+d442faaff1a9352c36c81ccd01f6d5322a28a6df8f4e735b866611cd127576320e75a6aa3bb731a273f6d48933ad47e305602510b731158abc17dc98b89ac437  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 "
@@ -3360,7 +3360,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
@@ -2,7 +2,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8183
 pkgver=6.6.61
-pkgrel=3
+pkgrel=1
 pkgdesc="Mainline kernel for mediatek mt8183"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -99,5 +99,5 @@ a95ce4a71d249ef401ca04cf8faf85b9022114d35fef5a0ce18929f734a0ac80ed0332648cc97686
 e9a128a8ddd98c6c8957ba45186afa2ea8ebeac83d4f2db3ff9ee8a5dd8027af90868c334a7b456bfe7dce793517f27ad63efa220bc933e3407f6362da6d7b2a  mt8183-kukui-jacuzzi-hack-dpms-resume.patch
 d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2  mt8183-fix-bluetooth.patch
 9b8707de42635734031495da055c5860addeb656051540f1a14404b10aa8b501168d8b0e274b37bce989db3bc050e9beef722189556f6d782b92cc907731488d  mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch
-8c0cf354975f76cfbe0384b587fac5da5a3a2b5b5afdb7203b4bbaec28a88dfbfb0dbb63c6d0bd40f3b2965067c79831b1f4fe5a48f89c77ca536a846e3c8e43  config-postmarketos-mediatek-mt8183.aarch64
+e2846d9251b3fd610fb4f4889601e49ea848d28dbd1f4d8a24c049ac8dd1e3a3ecd7374948501f7a8cc0b15e9e095f94e2ceaaac68f3f1610fb192096a53b506  config-postmarketos-mediatek-mt8183.aarch64
 "
@@ -3277,7 +3277,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-omap
 pkgver=6.12.1
-pkgrel=5
+pkgrel=3
 pkgdesc="Mainline kernel fork for OMAP devices"
 arch="armv7"
 url="https://kernel.org/"
@@ -72,7 +72,7 @@ package() {

 sha512sums="
 c7523dc5b012367301ab43a685b766dce025c4993041acd3dacd085b052b3fccc7f50c892357acf481e24ccad512770ef46a13d2da16c2a178c44a27f7022932  linux-6.12.1.tar.xz
-eb3c16812500eb800f0c9c363a08e62eb2bd03fc4dec9457d7d885b504f27270be1bcdcb7f1950fb3f48a22e80b4d8e3c7b2a7f4dc595cafabb72000cbf89bc0  config-postmarketos-omap.armv7
+01288d18407f195a1e04f7d234b499bfbc5112ead7d239f966a3cfb6646022bec92aa028d203e782fe44cd8e2dbd7daab8ab81fba10143f041ea6994acbdce74  config-postmarketos-omap.armv7
 9a187d93885f07467ec67094621b2d762607d58622e67172bdfcd8ba5f3d6aab900ca5d233efd3d447540f9b906ba950083a35997c84b315801604e1cd5cddc3  0001-Add-TWL6032-dtsi.patch
 f7d1a87088c65278a114125e732d5bebebb560a6245afb34e003083d808ef3f8c5f49ff23131953508a6daae111ab6adfffdbcf56b79260a6d4115f859c7bb3a  0002-arm-dts-Add-common-dtsi-for-espresso.patch
 089ca0547997c7cd5d1b65924c134eb6b7703a7439729923d3639d125763412fa7e826d1cb839ac0b6cd22e614f69a3b52605a75b571e271c33f9a27ff6ac9c2  0003-arm-dts-Add-espresso7-support.patch
@@ -2574,7 +2574,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
@@ -1,26 +0,0 @@
-From 04bb92f26f477cdc0cc26b91c504020c1426ed42 Mon Sep 17 00:00:00 2001
-From: Clayton Craft <clayton@craftyguy.net>
-Date: Wed, 8 Jan 2025 14:04:56 -0800
-Subject: [PATCH] partially revert arm64: dts: qcom: sc8280xp: enable GICv3 ITS
- for PCIe
-
---
- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-index 82fbdf395adc..ae5043df9de7 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-@@ -1776,8 +1776,6 @@ pcie4: pcie@1c00000 {
- 			linux,pci-domain = <6>;
- 			num-lanes = <1>;
- 
-			msi-map = <0x0 &its 0xe0000 0x10000>;
-
- 			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
- 				     <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
- 				     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,
-- 
-2.47.1
-
@@ -1,10 +1,10 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
 pkgname=linux-postmarketos-qcom-laptop
-pkgver=6.13
-pkgrel=0
+pkgver=6.12
+pkgrel=1
 # Commit from branch @ https://github.com/jhovold/linux/tree/wip/x1e80100-$pkgver
-_commit="0df45c8ef99147234f541062be775907b28ad768"
+_commit="93bd777d19aa0e8b58dee1eb837a16acf56035b0"
 pkgdesc="Generic kernel for Qualcomm laptops"
 arch="aarch64"
 _carch="arm64"
@@ -16,8 +16,8 @@ options="!strip
 	!tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community
+	pmb:kconfigcheck-containers
 	pmb:kconfigcheck-uefi
-	pmb:kconfigcheck-virt
 "
 makedepends="
 	bash
@@ -40,7 +40,6 @@ source="
 	$pkgname-$_commit.tar.gz::https://github.com/jhovold/$_repository/archive/$_commit.tar.gz
 	misc.config
 	pmos.config
-	0001-partially-revert-arm64-dts-qcom-sc8280xp-enable-GICv.patch
 "
 builddir="$srcdir/linux-$_commit"
 _outdir="out"
@@ -82,8 +81,7 @@ package() {
 }

 sha512sums="
-b49abf68751eb34eb83a716f03695b118eb42beaac44dc2116349475a5783d759879fedc052fe0b9d845bc4549211b302b68598c86526a75867abf35e2437fe3  linux-postmarketos-qcom-laptop-0df45c8ef99147234f541062be775907b28ad768.tar.gz
-980eefd8aaee78897cd41d039eecc11e23b8d7cc87b41c869f1e2b83cd9b5dac9813d7bd1a0e7c466303c795f234871080686921b9672983604551903004cb68  misc.config
-c761143bbdb621a1698068b2369473786638dc4b1c34c9c92466b053a7d4a5ed4e69dbdf731b57b40a1eb99b0f92a6ceaed1cc7302ab6584ef9a779cb225538e  pmos.config
-8bd939e56b3bd6e9b268fe48f3cbaf9ea48eb41cf96edc5b6facb9e0c30553c336baba57efd2f549d7d6a56e8687a4fce211b59d2bc1cf16fd92780f38406d65  0001-partially-revert-arm64-dts-qcom-sc8280xp-enable-GICv.patch
+af20b0d7e46e31de152a01e6c811c691f3866add856d4b8cc3e665fde2f10d0fa4ccb401cf3583e4975c0ccb281369fc019825ad274c4edad49f0e8069c154fc  linux-postmarketos-qcom-laptop-93bd777d19aa0e8b58dee1eb837a16acf56035b0.tar.gz
+c343baeb03f91a16994fd53e7cf1be0590be591c3a02e583d897f6b84ee9b33662cac513f84e1756fed58ab283c16471492bf227a1adb00f5bdd660ea4631ef1  misc.config
+98c3d46a83f496ed3cdb0ae97f9a891ff2acb504205d91646bed23b2efc999d77f486ec905ceebdac08a9d25f51b82caec8857311434a4d9de214f064541df96  pmos.config
 "
@@ -1,6 +1,5 @@
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_CONNECTOR=y
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_PROC_EVENTS=y
 CONFIG_USB_SERIAL_PL2303=m
@@ -206,135 +206,11 @@ CONFIG_DM_INTEGRITY=m

 # Input
 CONFIG_HIDRAW=y
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACCUTOUCH=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_APPLEIR=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_BIGBEN_FF=m
-CONFIG_HID_BPF=y
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CMEDIA=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_COUGAR=m
-CONFIG_HID_CP2112=m
-CONFIG_HID_CREATIVE_SB0540=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_ELAN=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_EVISION=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_FT260=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GLORIOUS=m
-CONFIG_HID_GOODIX_SPI=m
-CONFIG_HID_GOOGLE_STADIA_FF=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_ITE=m
-CONFIG_HID_JABRA=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LETSKETCH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_MACALLY=m
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MALTRON=m
-CONFIG_HID_MAYFLASH=m
-CONFIG_HID_MCP2221=m
-CONFIG_HID_MEGAWORLD_FF=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_NINTENDO=m
-CONFIG_HID_NTI=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_NVIDIA_SHIELD=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PID=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PLAYSTATION=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_PXRC=m
-CONFIG_HID_RAZER=m
-CONFIG_HID_RETRODE=m
-CONFIG_HID_RMI=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SEMITEK=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_HUMIDITY=m
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_HID_SENSOR_TEMP=m
-CONFIG_HID_SIGMAMICRO=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPRE=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_U2FZERO=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_UDRAW_PS3=m
-CONFIG_HID_VIEWSONIC=m
-CONFIG_HID_VIVALDI=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WINWING=m
-CONFIG_HID_XIAOMI=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_HID_ZYDACRON=m
-CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_JOYSTICK=y
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_UHID=m
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_HIDDEV=y
@@ -8,7 +8,7 @@ pkgver=6.12.1
 # 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=4
+pkgrel=1
 pkgdesc="Mainline kernel fork for Qualcomm MSM8909/MSM8916/MSM8939 devices"
 arch="aarch64 armv7"
 url="https://github.com/msm8916-mainline/linux"
@@ -94,6 +94,6 @@ package() {

 sha512sums="
 e46fecfdab77f26c5127ddfd057d31bdf441da7fbf233cd574b396e762ea8992af65f577c595bab6761d1d339016733eb3ab652bf3a221e8b1f6bad4aa6adef5  linux-postmarketos-qcom-msm8916-v6.12.1-msm8916.tar.gz
-ee8b10e9b341503a6ae95bf5eedfb9228fc1ce44b1f705a0783fdf7bd61503a8e743a00cd1839e370ac87da6270d404d070ec08c58fda7a27f17697b99de07b7  config-postmarketos-qcom-msm8916.aarch64
-2d6ee3badb7cd4a2cf6f7fb0fb1e01905500a5cad77d984ab072e6fad304a0f37f29dec82b883980a3a6b83dca3934341d79c99793a9caacfc62bfde57092c8e  config-postmarketos-qcom-msm8916.armv7
+26d4cfce43415c0f2219f4c639dcf5bdb8c7f6576bfb496380db55d5a3174f22ddaffd175efdb172fdd49372a77ef22899029759cd08fd503eccd6546bc782e9  config-postmarketos-qcom-msm8916.aarch64
+da885845fcba4b113eef7909b9b7248468f9381f24c03494a0cdd6b01f382cd98b3d14d81a24ff77de923b9e874fca613b465acf16fb0df4d84fa58d0eed166d  config-postmarketos-qcom-msm8916.armv7
 "
@@ -2478,7 +2478,7 @@ CONFIG_SERIAL_MSM_CONSOLE=y

 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_RPMSG_TTY is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -2368,7 +2368,7 @@ CONFIG_SERIAL_MSM_CONSOLE=y

 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_RPMSG_TTY is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -6,7 +6,7 @@
 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
 pkgver=6.12.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
 _carch="arm64"
@@ -27,7 +27,7 @@ makedepends="
 	python3
 "

-_tag="$pkgver-r2"
+_tag="$pkgver-r0"

 source="
 	$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -62,5 +62,5 @@ package() {
 }
 sha512sums="
 542189a25e3cd1bb3f994e0cf5d35db133f9fd4ede5edcd2f350d9d551c2dd9e21b1ee16c6839bcd1cf377c12bae39c06e8e47cf54e61f8603f93a9479d47a15  linux-postmarketos-qcom-msm8953-v6.12.0-r0.tar.gz
-b234947f7eae547b60b767df9f34fda3a019cbc3350942eea528de7b21fe032d8aafa937127dbb1a0d90b5451c167e9a7dbe0666142359eb00c68ebe3685ba79  config-postmarketos-qcom-msm8953.aarch64
+bd7235497b820c76207cb4878dd46e6180783c48b82767c0c181852e776ab8f09e429e1cc24814a7009ccb376dbd3c4471551cc5b5c1e46170dd5c4aee4f8918  config-postmarketos-qcom-msm8953.aarch64
 "
@@ -2201,7 +2201,6 @@ CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_RTL8153_ECM=m
 CONFIG_WLAN=y
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
-CONFIG_ATH_COMMON=m
 CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
 # CONFIG_ATH9K is not set
@@ -2209,15 +2208,7 @@ CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_CARL9170 is not set
 # CONFIG_ATH6KL is not set
 # CONFIG_AR5523 is not set
-CONFIG_ATH10K=m
-CONFIG_ATH10K_CE=y
-CONFIG_ATH10K_SDIO=m
-# CONFIG_ATH10K_USB is not set
-# CONFIG_ATH10K_SNOC is not set
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-CONFIG_ATH10K_LEDS=y
-# CONFIG_ATH10K_TRACING is not set
+# CONFIG_ATH10K is not set
 CONFIG_WCN36XX=m
 CONFIG_WCN36XX_DEBUGFS=y
 # CONFIG_ATH11K is not set
@@ -2480,12 +2471,11 @@ CONFIG_RMI4_CORE=m
 CONFIG_RMI4_I2C=m
 # CONFIG_RMI4_SPI is not set
 # CONFIG_RMI4_SMB is not set
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
+# CONFIG_RMI4_F03 is not set
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F30 is not set
 # CONFIG_RMI4_F34 is not set
 # CONFIG_RMI4_F3A is not set
 # CONFIG_RMI4_F54 is not set
@@ -2580,7 +2570,7 @@ CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
@@ -2593,13 +2583,7 @@ CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_SSIF_IPMI_BMC is not set
 # CONFIG_IPMB_DEVICE_INTERFACE is not set
-CONFIG_HW_RANDOM=m
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_BA431 is not set
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_HW_RANDOM_CCTRNG is not set
-# CONFIG_HW_RANDOM_XIPHERA is not set
-CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
+# CONFIG_HW_RANDOM is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
 # CONFIG_TCG_TPM is not set
@@ -3936,19 +3920,7 @@ CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 #
 # Backlight & LCD device support
 #
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_PLATFORM is not set
-# CONFIG_LCD_AMS369FG06 is not set
-# CONFIG_LCD_LMS501KF03 is not set
-# CONFIG_LCD_HX8357 is not set
-# CONFIG_LCD_OTM3225A is not set
+# CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_KTD2801 is not set
@@ -4344,151 +4316,130 @@ CONFIG_HID_GENERIC=y
 # Special HID drivers
 #
 CONFIG_HID_A4TECH=y
-CONFIG_HID_ACCUTOUCH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
+# CONFIG_HID_ACCUTOUCH is not set
+# CONFIG_HID_ACRUX is not set
 CONFIG_HID_APPLE=y
-CONFIG_HID_APPLEIR=m
+# CONFIG_HID_APPLEIR is not set
 # CONFIG_HID_ASUS is not set
-CONFIG_HID_AUREAL=m
+# CONFIG_HID_AUREAL is not set
 CONFIG_HID_BELKIN=y
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_BIGBEN_FF=m
+# CONFIG_HID_BETOP_FF is not set
+# CONFIG_HID_BIGBEN_FF is not set
 CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=y
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_COUGAR=m
-CONFIG_HID_MACALLY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
-CONFIG_HID_CP2112=m
-CONFIG_HID_CREATIVE_SB0540=m
+# CONFIG_HID_CORSAIR is not set
+# CONFIG_HID_COUGAR is not set
+# CONFIG_HID_MACALLY is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CMEDIA is not set
+# CONFIG_HID_CP2112 is not set
+# CONFIG_HID_CREATIVE_SB0540 is not set
 CONFIG_HID_CYPRESS=y
-CONFIG_HID_DRAGONRISE=m
-# CONFIG_DRAGONRISE_FF is not set
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELAN=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EVISION=m
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_ELAN is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
+# CONFIG_HID_EVISION is not set
 CONFIG_HID_EZKEY=y
-CONFIG_HID_FT260=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GLORIOUS=m
-CONFIG_HID_HOLTEK=m
-# CONFIG_HOLTEK_FF is not set
-CONFIG_HID_VIVALDI_COMMON=m
-CONFIG_HID_GOODIX_SPI=m
-CONFIG_HID_GOOGLE_STADIA_FF=m
-CONFIG_HID_VIVALDI=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_VIEWSONIC=m
-CONFIG_HID_VRC2=m
-CONFIG_HID_XIAOMI=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
+# CONFIG_HID_FT260 is not set
+# CONFIG_HID_GEMBIRD is not set
+# CONFIG_HID_GFRM is not set
+# CONFIG_HID_GLORIOUS is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GOODIX_SPI is not set
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
+# CONFIG_HID_VIVALDI is not set
+# CONFIG_HID_GT683R is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_VIEWSONIC is not set
+# CONFIG_HID_VRC2 is not set
+# CONFIG_HID_XIAOMI is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_ICADE is not set
 CONFIG_HID_ITE=y
-CONFIG_HID_JABRA=m
-CONFIG_HID_TWINHAN=m
+# CONFIG_HID_JABRA is not set
+# CONFIG_HID_TWINHAN is not set
 CONFIG_HID_KENSINGTON=y
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LETSKETCH=m
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LED is not set
+# CONFIG_HID_LENOVO is not set
+# CONFIG_HID_LETSKETCH is not set
 CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
+# CONFIG_HID_LOGITECH_DJ is not set
+# CONFIG_HID_LOGITECH_HIDPP is not set
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIWHEELS_FF is not set
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MALTRON=m
-CONFIG_HID_MAYFLASH=m
-CONFIG_HID_MEGAWORLD_FF=m
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MALTRON is not set
+# CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_MEGAWORLD_FF is not set
 CONFIG_HID_REDRAGON=y
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
 CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NINTENDO=m
-# CONFIG_NINTENDO_FF is not set
-CONFIG_HID_NTI=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_NVIDIA_SHIELD=m
-# CONFIG_NVIDIA_SHIELD_FF is not set
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-# CONFIG_PANTHERLORD_FF is not set
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PLAYSTATION=m
-CONFIG_PLAYSTATION_FF=y
-CONFIG_HID_PXRC=m
-CONFIG_HID_RAZER=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_RETRODE=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SEMITEK=m
-CONFIG_HID_SIGMAMICRO=m
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-# CONFIG_STEAM_FF is not set
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-# CONFIG_GREENASIA_FF is not set
-CONFIG_HID_SMARTJOYPLUS=m
-# CONFIG_SMARTJOYPLUS_FF is not set
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TOPRE=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_HID_UDRAW_PS3=m
-CONFIG_HID_U2FZERO=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WINWING=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-# CONFIG_ZEROPLUS_FF is not set
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
-CONFIG_HID_ALPS=m
-CONFIG_HID_MCP2200=m
-CONFIG_HID_MCP2221=m
+# CONFIG_HID_NINTENDO is not set
+# CONFIG_HID_NTI is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_NVIDIA_SHIELD is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PENMOUNT is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_PLAYSTATION is not set
+# CONFIG_HID_PXRC is not set
+# CONFIG_HID_RAZER is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_RETRODE is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SEMITEK is not set
+# CONFIG_HID_SIGMAMICRO is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEAM is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_RMI is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TOPRE is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_UDRAW_PS3 is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_WINWING is not set
+# CONFIG_HID_XINMO is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_ALPS is not set
+# CONFIG_HID_MCP2200 is not set
+# CONFIG_HID_MCP2221 is not set
 # end of Special HID drivers

 #
 # HID-BPF support
 #
-CONFIG_HID_BPF=y
+# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
 # USB HID support
 #
 CONFIG_USB_HID=y
-CONFIG_HID_PID=y
+# CONFIG_HID_PID is not set
 CONFIG_USB_HIDDEV=y
 # end of USB HID support

@@ -4688,7 +4639,6 @@ CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_HSIC_USB3503 is not set
 # CONFIG_USB_HSIC_USB4604 is not set
 # CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
 # CONFIG_USB_ONBOARD_DEV is not set

 #
@@ -5072,7 +5022,6 @@ CONFIG_RTC_DRV_PM8XXX=m
 #
 # HID Sensor RTC drivers
 #
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_GOLDFISH is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
@@ -5590,9 +5539,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_BMA180 is not set
 # CONFIG_BMA220 is not set
 # CONFIG_BMA400 is not set
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_BMC150_ACCEL_SPI=m
+# CONFIG_BMC150_ACCEL is not set
 # CONFIG_BMI088_ACCEL is not set
 # CONFIG_DA280 is not set
 # CONFIG_DA311 is not set
@@ -5601,7 +5548,6 @@ CONFIG_BMC150_ACCEL_SPI=m
 # CONFIG_DMARD10 is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
-CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_KX022A_I2C is not set
@@ -5765,8 +5711,6 @@ CONFIG_QCOM_SPMI_ADC5=m
 #
 # Hid Sensor IIO Common
 #
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # end of Hid Sensor IIO Common

 #
@@ -5874,7 +5818,6 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
 # CONFIG_FXAS21002C is not set
-CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
@@ -5903,7 +5846,6 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
 # CONFIG_HDC3020 is not set
-CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -5962,8 +5904,6 @@ CONFIG_CM3323=m
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_ISL29125 is not set
 # CONFIG_ISL76682 is not set
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
 # CONFIG_JSA1212 is not set
 # CONFIG_ROHM_BU27008 is not set
 # CONFIG_ROHM_BU27034 is not set
@@ -6010,7 +5950,6 @@ CONFIG_AK09911=m
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC35240 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
@@ -6030,8 +5969,6 @@ CONFIG_YAMAHA_YAS530=m
 #
 # Inclinometer sensors
 #
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # end of Inclinometer sensors

 #
@@ -6044,7 +5981,6 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 #
 # Linear and angular position sensors
 #
-CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
 # end of Linear and angular position sensors

 #
@@ -6078,7 +6014,6 @@ CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
 # CONFIG_BMP280 is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
-CONFIG_HID_SENSOR_PRESS=m
 # CONFIG_HP03 is not set
 # CONFIG_HSC030PA is not set
 # CONFIG_ICP10100 is not set
@@ -6135,7 +6070,6 @@ CONFIG_HID_SENSOR_PRESS=m
 #
 # CONFIG_LTC2983 is not set
 # CONFIG_MAXIM_THERMOCOUPLE is not set
-CONFIG_HID_SENSOR_TEMP=m
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLX90635 is not set
@@ -6891,7 +6825,6 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
 # CONFIG_CRYPTO_DEV_CCP is not set
 # CONFIG_CRYPTO_DEV_QCE is not set
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_CCREE=m
@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8996"
 pkgname=linux-$_flavor
 pkgver=6.3.1
-pkgrel=10
+pkgrel=8
 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
-512b88b5875128c7ab761c43b080dc4ff228e82464bd6d596e9de9f6f3174820adc909827059f853d8bd050025d07112a5b0e4a058238b845df0154c820acec3  config-postmarketos-qcom-msm8996.aarch64
+6c58d53d0cf3dfee8500591fcfb886277131448db912ad84844d69f76eada174a045f9edb85a8bad88b6d649834b81ae6bdd6a7dbbc77dee823d5978eb92d076  config-postmarketos-qcom-msm8996.aarch64
 "
@@ -2711,7 +2711,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-qcom-sc7180
 pkgver=6.6.28
-pkgrel=9
+pkgrel=7
 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
-7d2076b631beee82adad61ac49489be26ebe6d47668a5c855cec2ec705aef7ce39dcb7f7fd8d6dbc74d9ee76dd846d05ea1f22725c8e9944e11ad22d3b4bcc15  config-postmarketos-qcom-sc7180.aarch64
+c0c8dca1518b5d6e6230a4482871b3d19723a945db2ae985359e7fc4f2cad2594366b6d19d1f793f0065de99bd35950b67a392141d4ed6757dd8e21fb2c5ac2d  config-postmarketos-qcom-sc7180.aarch64
 "
@@ -3351,7 +3351,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
@@ -0,0 +1,46 @@
+From 7e1ea84748d49b328213db529b524216600a9419 Mon Sep 17 00:00:00 2001
+From: Frank Oltmanns <frank@oltmanns.dev>
+Date: Mon, 30 Dec 2024 19:12:53 +0100
+Subject: [PATCH] HACK: remoteproc: qcom: disable in-kernel PD mapper
+
+Somehow enabling in-kernel PD mapper (introduced in 5b9f51b200dcb
+"remoteproc: qcom: enable in-kernel PD mapper"), breaks the bottom mic
+on xiaomi-beryllium (Poco F1) and distorts audio on OP6 (and possibly
+OP6T). Temporarily disable it and log the rprocs in use until we better
+understand what causes the issue.
+
+Link: pmaports#3353
+Link: pmaports#3320
+Link: pmaports#3245
+Link: pmaports#3253
+
+Signed-off-by: Frank Oltmanns <frank@oltmanns.dev>
+---
+ drivers/remoteproc/qcom_common.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
+index 8c8688f99f0ab..0b4e8eb7622d9 100644
+--- a/drivers/remoteproc/qcom_common.c
+++ b/drivers/remoteproc/qcom_common.c
+@@ -583,6 +583,8 @@ static void pdm_notify_unprepare(struct rproc_subdev *subdev)
+  */
+ void qcom_add_pdm_subdev(struct rproc *rproc, struct qcom_rproc_pdm *pdm)
+ {
+	printk(KERN_INFO "aborting qcom_add_pdm_subdev, name %s\n", rproc->name);
+	return;
+ 	pdm->dev = &rproc->dev;
+ 	pdm->index = rproc->index;
+ 
+@@ -602,6 +604,8 @@ EXPORT_SYMBOL_GPL(qcom_add_pdm_subdev);
+  */
+ void qcom_remove_pdm_subdev(struct rproc *rproc, struct qcom_rproc_pdm *pdm)
+ {
+	printk(KERN_INFO "aborting qcom_remove_pdm_subdev, name %s\n", rproc->name);
+	return;
+ 	rproc_remove_subdev(rproc, &pdm->subdev);
+ }
+ EXPORT_SYMBOL_GPL(qcom_remove_pdm_subdev);
+-- 
+2.47.1
+
@@ -6,7 +6,7 @@
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
 pkgver=6.13.0_rc2
-pkgrel=4
+pkgrel=2
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -24,6 +24,7 @@ _tag="sdm845-6.13-rc2-r2"
 source="
 	linux-$_tag.tar.gz::https://gitlab.com/sdm845-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
 	$_config
+	0001-HACK-remoteproc-qcom-disable-in-kernel-PD-mapper.patch
 "
 builddir="$srcdir/linux-$_tag"

@@ -72,6 +73,6 @@ package() {

 sha512sums="
 af8b5e960248adf5da95571e964e664c8e329bf610a567b43fa22fc8a853b6e321192cb39667492ac86d8ac48e75b1e47eb546017937c9d0aeb11485e70797d3  linux-sdm845-6.13-rc2-r2.tar.gz
-b825f2da385e87a27a53ffe3a887e9ea83b2f4d81d5580942b668901307ea728b932fdb849821ffe284d5cd3108695c916513bc3055b63c2da4b7712a6fc66cf  config-postmarketos-qcom-sdm845.aarch64
+4c663896c0bc76858a91cbe6d64461ebebe5beb42a14320479e2291761dd9bfb01fd68047b2813df24f697f1f7465f63c3ca5777f5bca9d26552366e851400d6  config-postmarketos-qcom-sdm845.aarch64
 a107cada98c5902aaf193bbc80d19276cf286c5094c7e8587a6d5756929d91f46b555efbf48f4b7b85c1feb8c71b989fbb49b26b2c7a8f7ec2ee1385c20b9d03  0001-HACK-remoteproc-qcom-disable-in-kernel-PD-mapper.patch
 "
@@ -3189,7 +3189,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
@@ -4998,19 +4998,7 @@ CONFIG_FB_MODE_HELPERS=y
 #
 # Backlight & LCD device support
 #
-CONFIG_LCD_CLASS_DEVICE=y
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI922X is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_PLATFORM is not set
-# CONFIG_LCD_AMS369FG06 is not set
-# CONFIG_LCD_LMS501KF03 is not set
-# CONFIG_LCD_HX8357 is not set
-# CONFIG_LCD_OTM3225A is not set
+# CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_KTD253 is not set
 # CONFIG_BACKLIGHT_KTD2801 is not set
@@ -5527,154 +5515,136 @@ CONFIG_HID_GENERIC=m
 #
 # Special HID drivers
 #
-CONFIG_HID_A4TECH=m
-CONFIG_HID_ACCUTOUCH=m
-CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=y
-CONFIG_HID_APPLE=m
-CONFIG_HID_APPLEIR=m
+CONFIG_HID_A4TECH=y
+# CONFIG_HID_ACCUTOUCH is not set
+# CONFIG_HID_ACRUX is not set
+CONFIG_HID_APPLE=y
+# CONFIG_HID_APPLEIR is not set
 # CONFIG_HID_ASUS is not set
-CONFIG_HID_AUREAL=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BETOP_FF=m
-CONFIG_HID_BIGBEN_FF=m
-CONFIG_HID_CHERRY=m
+# CONFIG_HID_AUREAL is not set
+CONFIG_HID_BELKIN=y
+# CONFIG_HID_BETOP_FF is not set
+# CONFIG_HID_BIGBEN_FF is not set
+CONFIG_HID_CHERRY=y
 CONFIG_HID_CHICONY=m
-CONFIG_HID_CORSAIR=m
-CONFIG_HID_COUGAR=m
-CONFIG_HID_MACALLY=m
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
-CONFIG_HID_CP2112=m
-CONFIG_HID_CREATIVE_SB0540=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-# CONFIG_DRAGONRISE_FF is not set
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_ELAN=m
-CONFIG_HID_ELECOM=m
-CONFIG_HID_ELO=m
-CONFIG_HID_EVISION=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_FT260=m
-CONFIG_HID_GEMBIRD=m
-CONFIG_HID_GFRM=m
-CONFIG_HID_GLORIOUS=m
-CONFIG_HID_HOLTEK=m
-# CONFIG_HOLTEK_FF is not set
-CONFIG_HID_VIVALDI_COMMON=m
-CONFIG_HID_GOODIX_SPI=m
+# CONFIG_HID_CORSAIR is not set
+# CONFIG_HID_COUGAR is not set
+# CONFIG_HID_MACALLY is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CMEDIA is not set
+# CONFIG_HID_CP2112 is not set
+# CONFIG_HID_CREATIVE_SB0540 is not set
+CONFIG_HID_CYPRESS=y
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
+# CONFIG_HID_ELAN is not set
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
+# CONFIG_HID_EVISION is not set
+CONFIG_HID_EZKEY=y
+# CONFIG_HID_FT260 is not set
+# CONFIG_HID_GEMBIRD is not set
+# CONFIG_HID_GFRM is not set
+# CONFIG_HID_GLORIOUS is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GOODIX_SPI is not set
 # CONFIG_HID_GOOGLE_HAMMER is not set
-CONFIG_HID_GOOGLE_STADIA_FF=m
-CONFIG_HID_VIVALDI=m
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_KYE=m
+# CONFIG_HID_GOOGLE_STADIA_FF is not set
+# CONFIG_HID_VIVALDI is not set
+# CONFIG_HID_GT683R is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
 # CONFIG_HID_KYSONA is not set
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_VIEWSONIC=m
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_VIEWSONIC is not set
 # CONFIG_HID_VRC2 is not set
-CONFIG_HID_XIAOMI=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_ICADE=m
-CONFIG_HID_ITE=m
-CONFIG_HID_JABRA=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LETSKETCH=m
+# CONFIG_HID_XIAOMI is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_ICADE is not set
+CONFIG_HID_ITE=y
+# CONFIG_HID_JABRA is not set
+# CONFIG_HID_TWINHAN is not set
+CONFIG_HID_KENSINGTON=y
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LED is not set
+# CONFIG_HID_LENOVO is not set
+# CONFIG_HID_LETSKETCH is not set
 CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
+# CONFIG_HID_LOGITECH_DJ is not set
+# CONFIG_HID_LOGITECH_HIDPP is not set
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIWHEELS_FF is not set
-CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MALTRON=m
-CONFIG_HID_MAYFLASH=m
-CONFIG_HID_MEGAWORLD_FF=m
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MALTRON is not set
+# CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_MEGAWORLD_FF is not set
 CONFIG_HID_REDRAGON=y
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NINTENDO=m
 # CONFIG_NINTENDO_FF is not set
-CONFIG_HID_NTI=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_NVIDIA_SHIELD=m
-# CONFIG_NVIDIA_SHIELD_FF is not set
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-# CONFIG_PANTHERLORD_FF is not set
-CONFIG_HID_PENMOUNT=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PLAYSTATION=m
-# CONFIG_PLAYSTATION_FF is not set
-CONFIG_HID_PXRC=m
-CONFIG_HID_RAZER=m
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_RETRODE=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAITEK=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SEMITEK=m
-CONFIG_HID_SIGMAMICRO=m
+# CONFIG_HID_NTI is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_NVIDIA_SHIELD is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PENMOUNT is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_PLAYSTATION is not set
+# CONFIG_HID_PXRC is not set
+# CONFIG_HID_RAZER is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_RETRODE is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SEMITEK is not set
+# CONFIG_HID_SIGMAMICRO is not set
 CONFIG_HID_SONY=m
 CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-# CONFIG_STEAM_FF is not set
-CONFIG_HID_STEELSERIES=m
-CONFIG_HID_SUNPLUS=m
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEAM is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
 CONFIG_HID_RMI=m
-CONFIG_HID_GREENASIA=m
-# CONFIG_GREENASIA_FF is not set
-CONFIG_HID_SMARTJOYPLUS=m
-# CONFIG_SMARTJOYPLUS_FF is not set
-CONFIG_HID_TIVO=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TOPRE=m
-CONFIG_HID_THINGM=m
-CONFIG_HID_THRUSTMASTER=m
-# CONFIG_THRUSTMASTER_FF is not set
-CONFIG_HID_UDRAW_PS3=m
-CONFIG_HID_U2FZERO=m
-CONFIG_HID_WACOM=m
-CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WINWING=m
-CONFIG_HID_XINMO=m
-CONFIG_HID_ZEROPLUS=m
-# CONFIG_ZEROPLUS_FF is not set
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
-CONFIG_HID_ALPS=m
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TOPRE is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_UDRAW_PS3 is not set
+# CONFIG_HID_U2FZERO is not set
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_WINWING is not set
+# CONFIG_HID_XINMO is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_ALPS is not set
 # CONFIG_HID_MCP2200 is not set
-CONFIG_HID_MCP2221=m
+# CONFIG_HID_MCP2221 is not set
 # end of Special HID drivers

 #
 # HID-BPF support
 #
-CONFIG_HID_BPF=y
+# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
 # USB HID support
 #
 CONFIG_USB_HID=m
-CONFIG_HID_PID=y
+# CONFIG_HID_PID is not set
 CONFIG_USB_HIDDEV=y
 # end of USB HID support

@@ -6335,7 +6305,6 @@ CONFIG_RTC_DRV_RTD119X=y
 #
 # HID Sensor RTC drivers
 #
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_GOLDFISH is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
@@ -6884,7 +6853,7 @@ CONFIG_QCOM_LLCC=y
 CONFIG_QCOM_KRYO_L2_ACCESSORS=y
 CONFIG_QCOM_MDT_LOADER=y
 CONFIG_QCOM_OCMEM=y
-# CONFIG_QCOM_PD_MAPPER is not set
+CONFIG_QCOM_PD_MAPPER=m
 CONFIG_QCOM_PDR_HELPERS=y
 CONFIG_QCOM_PDR_MSG=y
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
@@ -7029,7 +6998,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_DMARD10 is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
-CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_KX022A_SPI is not set
@@ -7203,8 +7171,6 @@ CONFIG_IIO_CROS_EC_SENSORS=m
 #
 # Hid Sensor IIO Common
 #
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # end of Hid Sensor IIO Common

 #
@@ -7320,7 +7286,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
 # CONFIG_FXAS21002C is not set
-CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
 # CONFIG_ITG3200 is not set
@@ -7349,7 +7314,6 @@ CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
 # CONFIG_HDC3020 is not set
-CONFIG_HID_SENSOR_HUMIDITY=m
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -7412,8 +7376,6 @@ CONFIG_IIO_CROS_EC_LIGHT_PROX=m
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_ISL29125 is not set
 # CONFIG_ISL76682 is not set
-CONFIG_HID_SENSOR_ALS=m
-# CONFIG_HID_SENSOR_PROX is not set
 # CONFIG_JSA1212 is not set
 # CONFIG_ROHM_BU27008 is not set
 # CONFIG_ROHM_BU27034 is not set
@@ -7462,7 +7424,6 @@ CONFIG_VCNL4000=m
 # CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_BMC150_MAGN_SPI is not set
 # CONFIG_MAG3110 is not set
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC35240 is not set
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
@@ -7484,8 +7445,6 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 #
 # Inclinometer sensors
 #
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # end of Inclinometer sensors

 #
@@ -7498,7 +7457,6 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 #
 # Linear and angular position sensors
 #
-CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
 # end of Linear and angular position sensors

 #
@@ -7533,7 +7491,6 @@ CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
 CONFIG_IIO_CROS_EC_BARO=m
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
-# CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_HP03 is not set
 # CONFIG_HSC030PA is not set
 # CONFIG_ICP10100 is not set
@@ -7591,7 +7548,6 @@ CONFIG_IIO_CROS_EC_BARO=m
 #
 # CONFIG_LTC2983 is not set
 # CONFIG_MAXIM_THERMOCOUPLE is not set
-CONFIG_HID_SENSOR_TEMP=m
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
 # CONFIG_MLX90635 is not set
@@ -3,7 +3,7 @@
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
 pkgver=6.12.4
-pkgrel=3
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -55,5 +55,5 @@ package() {

 sha512sums="
 18be2a74a9f934c5e3e01bbdc7d620de878b577b95d36e1232589e0b61f01429b0ae3e5a6667aff1d5796d7ac72068783b36c74aac3136bec932f83ce25d5535  linux-v6.12.4-sm6350.tar.gz
-753c0eae2ec47542c2793e51635f19732cca85a3d0a04e777859bdbe224e4760831e6e70717937d879b25a38ca6ec3e7bb29275d70a35427da81cc85f27b51f0  config-postmarketos-qcom-sm6350.aarch64
+3007b77fb0bd2d3dd73720a046a8e23e943c8f162c69d57430c39be98b1f677b9c8ff7baf6d4263f638c983f81528ac768f9848a295a8108f40d393defac1745  config-postmarketos-qcom-sm6350.aarch64
 "
@@ -2500,7 +2500,7 @@ CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
 CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_RPMSG_TTY is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -5,11 +5,11 @@
 _flavor="postmarketos-qcom-sm8250"
 pkgname=linux-$_flavor
 pkgver=6.12.0
-pkgrel=3
+pkgrel=1
 pkgdesc="Mainline kernel fork for SM8250"
 arch="aarch64"
 _carch="arm64"
-url="https://gitlab.postmarketos.org/jianhua/sm8250-mainline"
+url="https://gitlab.com/sm8250-mainline/linux"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps
 	pmb:cross-native
@@ -31,10 +31,10 @@ makedepends="
 _tag="sm8250-$pkgver"
 _config="config-$_flavor.$arch"
 source="
-	$pkgname-$_tag.tar.gz::https://gitlab.postmarketos.org/jianhua/sm8250-mainline/-/archive/$_tag/sm8250-mainline-$_tag.tar.gz
+	$pkgname-$_tag.tar.gz::https://gitlab.com/sm8250-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
 	$_config
 "
-builddir="$srcdir/sm8250-mainline-$_tag"
+builddir="$srcdir/linux-$_tag"

 prepare() {
 	default_prepare
@@ -64,5 +64,5 @@ package() {

 sha512sums="
 6de31ce37ce6870c2ee12a72fdd4b4efc52b2dc1b031ffc0d2d049e882bbc9cb1e86507ddee37cb4d910e43ade217c017dfdd57b2e95363c2ccf6f7f29a68fb1  linux-postmarketos-qcom-sm8250-sm8250-6.12.0.tar.gz
-9db17a8d1bbe538efaaf2ce27c9de830592a1dc2755d70dd6c19d2d0114cffd565f570d0263b6571571c05579dc7b52a6085f5df58f253ddf2cf35c80d755bba  config-postmarketos-qcom-sm8250.aarch64
+78745823967530af2132cdadb770c0f97b147b71f8332de174a759f21bd8a7416202d0466cc23fb54f0aa11df44a35e4e17f96f41d688153cd245843d1f69479  config-postmarketos-qcom-sm8250.aarch64
 "
@@ -1,7 +1,7 @@
 # Maintainer: Quade Curry <qc8086@qc8086.com>
 pkgname=linux-postmarketos-rockchip
 pkgver=6.6.34
-pkgrel=7
+pkgrel=5
 pkgdesc="Mainline kernel for rockchip devices"
 arch="aarch64"
 _carch="arm64"
@@ -72,5 +72,5 @@ package() {

 sha512sums="
 eaa792be65c4cdfd37b84d4dadd22086c8507c1f78d538255cff03595e1caee0f88b521c398b6bc9ab3632010133cff5c7b14200413d54cf0a38bea79c2fd29f  linux-6.6.34.tar.xz
-ca062e6ee45ecf14cb30714fbab2fa92a33fa15cc828dd8ac959c7a0aab00821291cd5f1f28c4c95750836119361eaa5c26a550ab7cae28b3d4ebdaf859f9556  config-postmarketos-rockchip.aarch64
+1b1ab1466b1ce2e78641e7436e42e1ac1406c3b787afb877fa3f257eabf8ea7c65d9bc09889fc84de736f7982e38006eb621cf796b55907dd20ad436558d438a  config-postmarketos-rockchip.aarch64
 "
@@ -3364,7 +3364,7 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 # CONFIG_NOZOMI is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -4,7 +4,7 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=linux-purism-librem5
 pkgver=6.6.63
-pkgrel=2
+pkgrel=0
 # NOTE: Don't forget to rebase the config! See prepare() for instructions.
 _purismrel=1
 _pureosrel=cri1
@@ -92,5 +92,5 @@ package() {

 sha512sums="
 86c63d7bb8a40b7134d7b683d9dd94284c6594c4e1905c3063499cadc5ab5e71234ce810948916a1038b7ac124f6ebb37dbc882a9d7ab4444d93493442bc8435  linux-purism-librem5-6.6.63pureos1_cri1.tar.gz
-1c1d3c61cf0c809f99fc720d2f8ee9de5a72a6f29b0b5712ee73e14138164939d75781d7035157935add133e73a72b54602843a030faf415631e5d057bc11cd6  config-purism-librem5.aarch64
+c30bea97f445a9166d959db5398c08c1009e3de91d5a6a2df105e4a12ea1e678919459551655058ba83460db85cd0cbce897f6260f3db9885f9ec55290c09721  config-purism-librem5.aarch64
 "
@@ -2925,7 +2925,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NULL_TTY=y
+# CONFIG_NULL_TTY is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_RPMSG_TTY is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -1,8 +1,8 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
-pkgver=12
-pkgrel=0
+pkgver=11
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -21,7 +21,6 @@ source="
 	90-feedbackd-pm8xxx-vib.rules
 	q6voiced.conf
 	adreno-a506-quirks.sh
-	moto-modem-rfs-setup.openrc
 "

 package() {
@@ -44,7 +43,6 @@ modem() {
 		q6voiced
 		qrtr
 		rmtfs
-		tqftpserv
 	"

 	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
@@ -56,9 +54,9 @@ modem_openrc() {
 	depends="
 		q6voiced-openrc
 		rmtfs-openrc
-		tqftpserv-openrc
 	"
-	install -Dm755 $srcdir/moto-modem-rfs-setup.openrc "$subpkgdir"/etc/init.d/moto-modem-rfs-setup
+
+	mkdir -p "$subpkgdir"
 }

 gpu() {
@@ -74,5 +72,4 @@ sha512sums="
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8xxx-vib.rules
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 d546c99ca8d406b4e2e3901a417e4e461314a38f2f01c48525e44ca524ad57af7bfc280f416bda90573b0bfb1cca27d45cb0a0ed44e999ef8d406a380d1fdbb2  adreno-a506-quirks.sh
-d4fd0f3406c9f004e9cae7bc500c5713aab75f102f8e3ea1af820865f01eb03def01cd9ed3e8a184c7dfc22ab419628fad17957a3782885d96eb36e94461e842  moto-modem-rfs-setup.openrc
 "
@@ -1,3 +1,2 @@
 #!/bin/sh
 rc-update add -q q6voiced default
-rc-update add -q moto-modem-rfs-setup boot
@@ -2,13 +2,13 @@
 # Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-amediatech-x96-mini
 pkgver=3
-pkgrel=1
+pkgrel=0
 pkgdesc="Amediatech X96 mini"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-amlogic-amediatech-x96-mini soc-amlogic-s905 linux-postmarketos-amlogic"
+depends="postmarketos-base u-boot-amediatech-x96-mini soc-amlogic-s905 linux-postmarketos-amlogic"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="asound.state deviceinfo modules-initfs"
@@ -3,12 +3,12 @@
 pkgname=device-bananapi-bpi-cm4-cm4io
 pkgdesc="BananaPi BPI-CM4IO Baseboard with BPI-CM4"
 pkgver=1
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-amlogic-bananapi-bpi-cm4-cm4io soc-amlogic-s905 linux-postmarketos-amlogic"
+depends="postmarketos-base u-boot-bananapi-bpi-cm4 soc-amlogic-s905 linux-postmarketos-amlogic"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo modules-initfs"
@@ -1,33 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-bananapi-bpi-m2-zero
-pkgdesc="Banana Pi BPI-M2 Zero"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	linux-bananapi-bpi-m2-zero
-	postmarketos-base
-	u-boot-bananapi-bpi-m2-zero
-"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-"
-_pmb_recommends="
-	firmware-bananapi-bpi-m2-zero
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-a5dcb9c56ea9225bf8cb3a0734d72b62540a8d710219eb14868c3f0f0b5a6f2c765ad01d0d2139d5a9d0469e16d444963ca7d1ce6dac582ced4e9f4160503b9e  deviceinfo
-"
@@ -1,26 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Banana Pi BPI-M2 Zero"
-deviceinfo_manufacturer="Banana Pi"
-deviceinfo_codename="bananapi-bpi-m2-zero"
-deviceinfo_year="2017"
-deviceinfo_dtb="sun8i-h2-plus-bananapi-m2-zero"
-deviceinfo_arch="armv7"
-deviceinfo_generate_extlinux_config="true"
-
-# Device related
-deviceinfo_chassis="embedded"
-deviceinfo_external_storage="true"
-deviceinfo_keyboard="true"
-
-# Bootloader related
-
-# U-Boot conflicts with GPT. (Partition table gets overwritten.)
-deviceinfo_partition_type="msdos"
-deviceinfo_flash_method="none"
-deviceinfo_sd_embed_firmware_step_size="1024"
-deviceinfo_sd_embed_firmware="u-boot/bananapi-m2-zero/u-boot.sunxi:8"
-deviceinfo_boot_filesystem="fat32"
@@ -2,13 +2,13 @@
 # Maintainer:
 pkgname=device-beelink-gt1
 pkgver=2
-pkgrel=1
+pkgrel=0
 pkgdesc="Beelink gt1 (Ultimate)"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-amlogic-beelink-gt1 soc-amlogic-s905"
+depends="postmarketos-base u-boot-beelink-gt1 soc-amlogic-s905"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-alpine:kernel_alpine
@@ -3,7 +3,7 @@
 pkgname=device-librecomputer-lepotato
 pkgdesc="Libre Computer AML-S905X-CC-V1.0"
 pkgver=3
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ depends="
 	linux-postmarketos-amlogic
 	postmarketos-base
 	soc-amlogic-s905
-	u-boot-amlogic-librecomputer-lepotato
+	u-boot-librecomputer-lepotato
 "
 makedepends="devicepkg-dev"
 source="
@@ -0,0 +1,33 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-motorola-ali
+pkgdesc="Motorola Moto G6"
+pkgver=3
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	firmware-motorola-ali
+	firmware-qcom-adreno-a530
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="deviceinfo modules-initfs"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+705416801d6633e09aa79438175065aff5c50277c9359cdd1d9399ad80eb9b46f3c98e78d60098c4788212188be2b22072cfd5e703da988d6686d8c96f51eb78  deviceinfo
+097ac4b7c82a984d3e71309b015ba161ab5d851cc3a7bac11afced39d762112d1ad1df64a26c9128a4d3f8338ecbd75820170f873ac28a4684c2d6b83562a8a7  modules-initfs
+"
@@ -0,0 +1,34 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Motorola Moto G6"
+deviceinfo_manufacturer="Motorola"
+deviceinfo_codename="motorola-ali"
+deviceinfo_year="2018"
+deviceinfo_arch="aarch64"
+deviceinfo_dtb="qcom/sdm450-motorola-ali"
+deviceinfo_append_dtb="true"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2160"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x80000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
@@ -0,0 +1,4 @@
+edt_ft5x06
+msm
+panel-motorola-ali-boe
+panel-motorola-ali-tianma
@@ -0,0 +1,35 @@
+# Maintainer: Ultracoolguy <ultracoolguy@disroot.org>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-motorola-ocean
+pkgdesc="Motorola Moto G7 Power"
+pkgver=2
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	firmware-motorola-ocean
+	firmware-qcom-adreno-a530
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+	soc-qcom-msm8916
+"
+makedepends="devicepkg-dev"
+source="deviceinfo modules-initfs"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+9dfe084b5394dc7bf1617f0396c5d853965a3bddaba438644d29e5fbbe95d6b704b98b89a0d7f233f6b677bb3e68b016eb55732ed9e22e56f93a32586f306663  deviceinfo
+f627d473ccfc01f39ed7b1345c2795af0cd358b4738d202e53fbae07c605d239f9139b034c5a29411bafe368b92a44c756e2bd029246b385d6397f519af8ff7c  modules-initfs
+"
@@ -0,0 +1,36 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Motorola Moto G7 Power"
+deviceinfo_manufacturer="Motorola"
+deviceinfo_codename="motorola-ocean"
+deviceinfo_year="2019"
+deviceinfo_arch="aarch64"
+deviceinfo_dtb="qcom/sdm632-motorola-ocean"
+deviceinfo_append_dtb="true"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="720"
+deviceinfo_screen_height="1520"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
+deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x80000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
@@ -0,0 +1 @@
+msm
@@ -0,0 +1,44 @@
+# Maintainer: Sireesh Kodali <scarface@disroot.org>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-motorola-potter
+pkgdesc="Motorola Moto G5 Plus"
+pkgver=3
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	firmware-qcom-adreno-a530
+	firmware-motorola-potter
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+	soc-qcom-msm8953
+	soc-qcom-msm8953-modem
+	tqftpserv
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-openrc"
+source="deviceinfo modules-initfs"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+openrc() {
+	depends="tqftpserv-openrc"
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+c8c4c5ec686dfab80cc077632ed8e125c31fffe23a34536991acba40f1ce1083da451ea9c988309f63b0f488e0b4745e6815cb7b14ea4d2f0fbd61decc4e4f39  deviceinfo
+93c77bfcde005c021ac9b671f9671923339f855e45d4fce8b2caea4748eccc08c8ec65bdfc85fef4900c974860613e8d62e6fe0ea95741ec1ab08c814148472b  modules-initfs
+"
@@ -0,0 +1,36 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Motorola Moto G5 Plus"
+deviceinfo_manufacturer="Motorola"
+deviceinfo_codename="motorola-potter"
+deviceinfo_year="2017"
+deviceinfo_dtb="qcom/msm8953-motorola-potter"
+deviceinfo_append_dtb="true"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="1920"
+deviceinfo_getty="ttyMSM0;115200"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+deviceinfo_generate_bootimg="true"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_flash_offset_base="0x80000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_sparse="true"
+
+# lk2nd does not support GPT for subpartitions/SD cards yet
+deviceinfo_partition_type="msdos"
@@ -0,0 +1,5 @@
+msm
+panel_boe_bs052fhm_a00_6c01
+panel_tianma_tl052vdxp02
+rmi_core
+rmi_i2c
@@ -3,12 +3,12 @@
 pkgname=device-odroid-c4
 pkgdesc="ODROID C4"
 pkgver=1
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-amlogic-odroid-c4 soc-amlogic-s905 linux-postmarketos-amlogic"
+depends="postmarketos-base u-boot-odroid-c4 soc-amlogic-s905 linux-postmarketos-amlogic"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo modules-initfs"
@@ -3,12 +3,12 @@
 pkgname=device-odroid-n2plus
 pkgdesc="ODROID N2+"
 pkgver=1
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-amlogic-odroid-n2plus soc-amlogic-s905 linux-postmarketos-amlogic"
+depends="postmarketos-base u-boot-odroid-n2plus soc-amlogic-s905 linux-postmarketos-amlogic"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo modules-initfs"
@@ -1,2 +1,2 @@
-SUBSYSTEM=="module", KERNEL=="rockchip_ebc", RUN+="/bin/chgrp video /sys/module/%k/parameters/dclk_select /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/split_area_limit /sys/module/%k/parameters/default_waveform", RUN+="/bin/chmod g+w /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/default_waveform  /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/split_area_limit"
+SUBSYSTEM=="module", KERNEL=="rockchip_ebc", RUN+="/bin/chgrp video /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/split_area_limit /sys/module/%k/parameters/default_waveform", RUN+="/bin/chmod g+w /sys/module/%k/parameters/bw_threshold /sys/module/%k/parameters/bw_mode /sys/module/%k/parameters/default_waveform  /sys/module/%k/parameters/diff_mode /sys/module/%k/parameters/direct_mode /sys/module/%k/parameters/limit_fb_blits /sys/module/%k/parameters/panel_reflection /sys/module/%k/parameters/refresh_threshold /sys/module/%k/parameters/refresh_waveform /sys/module/%k/parameters/skip_reset /sys/module/%k/parameters/auto_refresh /sys/module/%k/parameters/bw_dither_invert /sys/module/%k/parameters/split_area_limit"
 DRIVER=="rockchip-ebc", RUN+="/bin/chgrp video /sys/%p/power/control", RUN+="/bin/chmod g+w /sys/%p/power/control"
@@ -1,29 +1,26 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+# Maintainer: Petr Hodina <phodina@protonmail.com>
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
-pkgver=3
-pkgrel=0
+pkgver=2
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-pine64-pinenote
-	pinenote-dbus-service<20221207
-	postmarketos-base
 	u-boot-pine64-pinenote
+	linux-pine64-pinenote
+	postmarketos-base
 "
 makedepends="devicepkg-dev"
 source="
+	deviceinfo
+	modules-initfs
+	phoc.ini
+	local-overrides.quirks
 	50-touchscreen.conf
 	81-libinput-pinenote.rules
 	82-ebc-rockchip.rules
-	deviceinfo
-	local-overrides.quirks
-	modules-initfs
-	panfrost.conf
-	phoc.ini
-	rockchip_ebc.conf
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -45,10 +42,6 @@ package() {
 		-t "$pkgdir"/usr/lib/udev/rules.d
 	install -Dm644 "$srcdir"/82-ebc-rockchip.rules \
 		"$pkgdir"/usr/lib/udev/rules.d
-	install -Dm644 "$srcdir"/panfrost.conf \
-		-t "$pkgdir"/etc/modprobe.d
-	install -Dm644 "$srcdir"/rockchip_ebc.conf \
-		-t "$pkgdir"/etc/modprobe.d
 }

 phosh() {
@@ -72,7 +65,5 @@ sha512sums="
 1123720962c9c8fec3c50302ca6a3dd56e2907dc9eea361a7b8eb4201b042476633d41a0ee4f6ab61d9c60eeccc894f83491ba9fa309a9bce2f1db0b0341d79d  local-overrides.quirks
 ac433eebbc35a48561837495997aee4e55510b979bc0d8e3bafb761bc1be5b4bdeed2f456369dcbc582688aefd07c63966b0d72b6ffa99e84cfd868e677f02c8  50-touchscreen.conf
 2bc51f200baefc37abfaaad368a911244999e906bdca4b728ac233f49a8fb3ae7206ee3c95cdb20d7dceae2a31d25a57f4e1da4fd67057fd64724b8232e42aed  81-libinput-pinenote.rules
-19e922eec89dba419798c4e1dc9b39c040db33986d0969a39a8220c642fa081763f15ff2418115d5a748af4054a1be0784927d1712ea79942c2b237ebab47728  82-ebc-rockchip.rules
-6ba6638754e00908243de2f73ed6898dac03638a200dcf7b7cd9684757355ee1eb0ac874af0f971ad2e054c1a8c471867bdaea4d9aaf7eea6d3cf81ac7dd73a2  panfrost.conf
-b52d2e7f0c62d7c313b6db9aeb706cdb2596b6aa637aeddb862abf1e256103377fb6267e38cd4285e25d32112acf8d03bbf32ecff7be3dfbb9176209ea7ae283  rockchip_ebc.conf
+7c418cebf336df96cd484d7f0243cf27e859b11a7f2e7fb54dd2b4afedc4f570588bee08a5de8075db7c7d6d56b7971d19dc09909ebe68247505a3e37427e312  82-ebc-rockchip.rules
 "
@@ -1,2 +0,0 @@
-softdep panfrost pre: rockchip_ebc
-# blacklist rockchip_ebc
@@ -1,5 +0,0 @@
-# rockchip-rga will crash the kernel on unload at the moment
-blacklist rockchip-rga
-blacklist ws8100_pen
-
-options rockchip_ebc direct_mode=0 auto_refresh=1 refresh_threshold=60 split_area_limit=0 panel_reflection=1 prepare_prev_before_a2=0 dclk_select=0
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-postmarketos-trailblazer
 pkgdesc="postmarketOS Trailblazer generic ARM64"
-pkgver=12
+pkgver=11
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,7 +26,6 @@ depends="
 	firmware-siliconlabs-rs9116
 	firmware-brcm43752
 	dtbloader
-	woa-firmware-yoinker
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -81,5 +80,5 @@ kernel_postmarketos_amlogic() {

 sha512sums="
 12e7c1af63b24a37198a73e77d45cc5cbcb3ce34bbdb32d913cb3e427896ddcf2266269f8fe0c73c15c751a34ad738bd7fc958629ad066cd3c0a9faaaae7d67f  deviceinfo
-7642e07eb1d0d24c8b1d754371394ff5a5b532fb699be5cac75431b58755adb6f550bf4cf8cddde27ef4e7f20ea90a5368298b0e44f9d145f1f6d7a4026a550e  modules-initfs
+d3a8fc6a343289e5d232cacdf539eba34c0f52e7110ca7b6c4708d6b9c2d1bc6f5f40afe75722b84023493aa1dbda9ccab1187fce14c21a85647837088058d2c  modules-initfs
 "
@@ -1,22 +1,16 @@
 atmel_mxt_ts
 aux-hpd-bridge
-backlight
 bq25890_charger
 clk-smd-rpm
 display_connector
-dispcc-x1e80100
 dwc3
 dwc3-qcom
 edt-ft5x06
 gcc-sm6115
 goodix
 gpi
-gpio_sbu_mux
 gpio_vibra
-gpucc-x1e80100
-i2c-hid
 i2c-hid-of
-i2c-hid-of-elan
 i2c-qcom-geni
 icc-bwmon
 icc-osm-l3
@@ -30,13 +24,10 @@ msm
 nvme
 nvmem_qfprom
 onboard-usb-dev
-panel_edp
-panel_samsung_atna33xc20
 panel-samsung-s6d7aa0
 panel-samsung-sofef00
 panel_sitronix_st7703
 panel-visionox-rm69299
-phy_qcom_edp
 phy-qcom-eusb2-repeater
 phy-qcom-qmp-combo
 phy-qcom-qmp-pcie
@@ -47,8 +38,6 @@ phy-qcom-qusb2
 phy-qcom-snps-eusb2
 phy_sun6i_mipi_dphy
 pinctrl-sm6115
-pmic-glink
-pmic-glink-altmode
 pwm_bl
 pwm_sun4i
 qcom-apcs-ipc-mailbox
@@ -64,8 +53,8 @@ qnoc-qcm2290
 qnoc-sm6115
 rmi_core
 rmi_i2c
-rpmpd
 rpm-proc
+rpmpd
 rpmsg_core
 smd-rpm
 smem
@@ -77,7 +66,6 @@ sun6i_mipi_dsi
 sun8i_mixer
 sun8i_tcon_top
 tcpm
-tcsrcc-x1e80100
 typec
 udc-core
 ufs-qcom
@@ -2,13 +2,13 @@
 # Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=device-radxa-zero
 pkgver=2
-pkgrel=1
+pkgrel=0
 pkgdesc="Radxa Zero"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-edge u-boot-amlogic-radxa-zero"
+depends="postmarketos-base linux-edge u-boot-radxa-zero"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo modules-initfs"
@@ -1 +0,0 @@
-SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"
@@ -1,68 +0,0 @@
-# Maintainer: winbo-yml-exe <winbo.yml@proton.me>
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-raspberry-pi5
-pkgver=1
-pkgrel=0
-pkgdesc="Raspberry Pi 5"
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="postmarketos-base raspberrypi-bootloader linux-rpi"
-makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-openrc
-	$pkgname-plasma-bigscreen:plasma_bigscreen
-	"
-source="
-	deviceinfo
-	modules-initfs
-	usercfg.txt
-	cmdline.txt
-	95-vchiq-permissions.rules
-	enforce-platform.sh
-	"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/usercfg.txt "$pkgdir"/boot/usercfg.txt
-	install -Dm644 "$srcdir"/cmdline.txt "$pkgdir"/boot/cmdline.txt
-	install -Dm644 "$srcdir"/95-vchiq-permissions.rules \
-		"$pkgdir"/etc/udev/rules.d/95-vchiq-permissions.rules
-	install -Dm755 "$srcdir"/enforce-platform.sh -t "$pkgdir"/etc/profile.d/
-}
-
-nonfree_firmware() {
-	pkgdesc="WiFi/Bluetooth firmware"
-	depends="linux-firmware-brcm"
-	mkdir "$subpkgdir"
-}
-
-openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-
-	mkdir -p "$subpkgdir"
-}
-
-plasma_bigscreen() {
-	pkgdesc="$pkgdesc (Plasma Bigscreen)"
-	install_if="$pkgname plasma-bigscreen"
-
-	amove etc/profile.d
-}
-
-
-sha512sums="
-52a562c316e540a5f746f566f51cf6cc6455932c747606543c8a40b067b6add50348b9342b35d96ff0b0d0955bcabbe9b1d07c30a81ec82f118c39c1a5d08034  deviceinfo
-e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319  modules-initfs
-4e832421e47dd0faf443a7a949aae83cc6d4a80fd816df5c6d9d72ac4ae23f803863b9b63903a14b18ae585e6abc5c8703376a003967b74dc30040dc544aa2e9  usercfg.txt
-ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2  cmdline.txt
-7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d  95-vchiq-permissions.rules
-5ebdd05414792b82073a6453517c19458863809cdfb25e7d8857030c1feb69cbebc02c5309e6a14373125d83e5e673a20f2006520a34148af17219fb1863dd95  enforce-platform.sh
-"
@@ -1 +0,0 @@
-modules=loop,squashfs,sd-mod,usb-storage quiet dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update add swclock boot
@@ -1 +0,0 @@
-./device-raspberry-pi5-openrc.post-install
@@ -1,22 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Raspberry Pi 5"
-deviceinfo_manufacturer="Raspberry Pi"
-deviceinfo_codename="raspberry-pi5"
-deviceinfo_year="2023"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="embedded"
-deviceinfo_keyboard="true"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="1920"
-deviceinfo_screen_height="1080"
-deviceinfo_mesa_driver="vc4"
-
-# Bootloader related
-deviceinfo_flash_method="none"
-deviceinfo_boot_filesystem="fat16"
@@ -1 +0,0 @@
-export BIGSCREEN_HARDWARE_PLATFORM=RPI5
@@ -1 +0,0 @@
-vc4
@@ -1,51 +0,0 @@
-boot_delay=0
-
-arm_control=0x200
-
-kernel=vmlinuz-rpi
-initramfs initramfs
-
-gpu_mem=256
-
-# uncomment line to enable serial on ttyS0
-# NOTE: This fixes the core_freq to 250Mh
-#enable_uart=1
-
-# to take advantage of your high speed sd card
-dtparam=sd_overclock=100
-
-# use drm backend ( for weston and wayland )
-dtoverlay=vc4-kms-v3d
-
-# have a properly sized image
-disable_overscan=1
-
-# for sound over HDMI
-hdmi_drive=2
-
-# rotate the HDMI display
-# 0 => no rotation
-# 1 => 90 degrees clockwise
-# 2 => 180 degrees clockwise
-# 3 => 270 degrees clockwise
-#display_hdmi_rotate=0
-
-# Uncomment some or all of these to enable the optional hardware interfaces
-#dtparam=i2c_arm=on
-#dtparam=i2s=on
-#dtparam=spi=on
-
-# Enable audio (loads snd_bcm2835)
-dtparam=audio=on
-
-# custom CVT mode for HDMI
-# see https://www.raspberrypi.org/documentation/configuration/config-txt/video.md
-#hdmi_group=2
-#hdmi_mode=87
-#hdmi_cvt 800 480 60 6 0 0 0
-
-# Automatically enable Bluetooth without having to use btattach
-# Note that the Pi's Bluetooth interface is connected via hardware UART;
-# if you intend to use it for other purposes (for example, serial debugging)
-# comment out the line below.
-dtparam=krnbt=on
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-baffinlite
 pkgdesc="Samsung Galaxy Grand Neo"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,6 +29,6 @@ nonfree_firmware() {
 }

 sha512sums="
-1370f768b23d17691ec66f235e7081735bd816d1f0ea390d5ffaf687ff01fcbc4368c46e715c0322f32acc8b11d79262281c5b9efa9f4117867855ccb41ba951  deviceinfo
+86ad4ae54269a33a5d1c717e29c5de4d4757778d430cbcd4ad9f26e47466a808a5333cb71a62c1ae989a5ba21c2bce6282fa3863112b1d8532a86286f56a5973  deviceinfo
 af036fe35011db078379dbb2e8c16c86546f0a4fcb3d1bcee3502bb1ea5b38f3ec5a9fa8cd1ca8ed8b89592a7f572d6072781289845303e0bf85fc2de4ead9fb  modules-load.conf
 "
@@ -14,7 +14,6 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
-deviceinfo_create_initfs_extra="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -1,30 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-i9105p
-pkgdesc="Samsung Galaxy S2 Plus"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	linux-samsung-i9105p
-	mkbootimg
-	postmarketos-base
-"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-61dcaf1daeb2ee96d8476e4fecbeb076bde2235fd58b9659e84d94509b8ff76ae5f2420bef521a07ad64ce53e6ee520caf207c1532c61207cb90191d19576bb1  deviceinfo
-"
@@ -1,34 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy S2 Plus"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-i9105p"
-deviceinfo_year="2013"
-deviceinfo_arch="armv7"
-
-# Device related
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-
-# Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="console=ttyS0,115200n8 mem=832M@0xA2000000 androidboot.console=ttyS0 vc-cma-mem=0/176M@0xCB000000 buildvariant=userdebug"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="4096"
-deviceinfo_header_version="0"
-deviceinfo_flash_offset_base="0xa2000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_heimdall_partition_kernel="KERNEL"
-deviceinfo_flash_heimdall_partition_rootfs="system"
-deviceinfo_flash_sparse="true"
-deviceinfo_create_initfs_extra="true"
-deviceinfo_partition_table="msdos"
				`@@ -1 +0,0 @@`
				`SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"`
				`@@ -1 +0,0 @@`
				`modules=loop,squashfs,sd-mod,usb-storage quiet dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1`