main/postmarketos-ui-retroarch: support for systemd, simplify startup, enable wifi

- tinydm is used to start retroarch for systemd and openrc - ui pkg now depends on pmos-base-ui stuff, fixing serial getty login and making sure other required UI things are included by default - retroarch wifi driver is enabled, which unfortunately means vendoring the retroarch.cfg from aports Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
linux-samsung-coreprimevelte: Fix touchscreen
2025-12-15 13:50:28 -08:00 · 2025-12-15 20:29:45 +00:00 · 2025-12-15 19:39:31 +00:00 · 2025-12-15 19:33:41 +01:00 · 2025-12-15 18:22:55 +00:00 · 2025-12-15 16:00:51 +00:00
203 changed files with 23999 additions and 6490 deletions
@@ -14,7 +14,7 @@ def test_aports_ui():
    """
    pmaports_cfg = pmb.config.pmaports.read_config()
    for arch in pmaports_cfg["supported_arches"].split(","):
-        for path in common.get_changed_files():
+        for path in common.get_changed_files(removed=False):
            path = Path(path)

            if path.name != "APKBUILD":
@@ -27,6 +27,7 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
+* [ ] `v25.12` (unreleased)
 * [ ] `v25.06`

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
@@ -11,7 +11,7 @@ mirrordir_alpine=edge
 [v25.12]
 description=Upcoming stable release (DO NOT USE)
 branch_pmaports=v25.12
-branch_aports=master
+branch_aports=3.23-stable
 mirrordir_alpine=v3.23

 [v25.06]
@@ -2,7 +2,7 @@

 pkgname=systemd-boot-x86
 _pkgname=systemd-boot  # for monitoring
-pkgver=258.2
+pkgver=258.3
 pkgrel=0
 pkgdesc="systemd's EFI boot manager for x86 EFI on x86_64."
 url="https://systemd.io/"
@@ -119,7 +119,7 @@ efistub() {
 }

 sha512sums="
-1dc016a5a037aec2682e08d2add0dcf8d03db15b45ce8c6b677898f734aefd4694ce18e588d579e42514071fc4c167b2bf53808478b2bd3856b257c9fbcde45d  systemd-258.2.tar.gz
+9f4261e1703efd1f38c90e4166e6d85fa9379c99ac7f3c66caa62955c3cbe8a43ab259c261ab20bce0dd84dd682258192ace66b4dee0390bf3740c32f4569fed  systemd-258.3.tar.gz
 9ff8da74fa51b0ededaf6cf7b80b03f433c8617db39eb5cde01477031fa00724b8b7bdf68c945c277510f81e7fbbf3b2732f2c781b0f6ce67569b2737581595b  0001-patch-wchar_t-for-musl.patch
 5cffc18f3eaaab1b6cc8f7191afed628036b9e794ca7f9fe0a7eb4653862f8cd2b43f18483916b52cdca4ddb17b8baae5baa212aa152b1ae8f2b31d57d6e1f45  0002-meson-minimal-configure-for-building-systemd-boot.patch
 ad54e2c7e7a21bfa9b5f9e8db1b6af6a6d78a3e5dfe2dafcec77488f6224865ab4d4c8a8c8ee1c54c99d1741361e9fb3a51e5d36bcbc7a1c3fdcc4d0c1672132  cross-x86.meson
@@ -1,5 +1,5 @@
 # Maintainer: Casey Connolly <kcxt@postmarketos.org>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Joel Selvaraj <foss@joelselvaraj.com>
 pkgname=alsa-ucm-conf-sdm845
 pkgver=1
 pkgrel=1
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -39,7 +39,6 @@ subpackages="$pkgname-openrc"
 source="
 	81-libssc-fairphone-fp4.rules
 	deviceinfo
-	hexagonrpcd.confd
 	modules-initfs
 	"

@@ -52,8 +51,6 @@ package() {

 	install -Dm644 "$srcdir"/81-libssc-fairphone-fp4.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-fairphone-fp4.rules
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 }

 openrc() {
@@ -72,6 +69,5 @@ openrc() {
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp4.rules
 06cdf6ba36f29553484dcde46431500550608dfb757836c180886e3dbc2a1ce5e90927690c63aea468e90ce0b1371d15efe62912eb43749c0e0bee27ce5215b3  deviceinfo
-6a3d620f2cc60308a62ff651ffb00a5ee1f092131cca9d33b6afd61c8a372a3fd7d46540162213593107e0943b33f3f0119d003d43dcd06dbde757390a6c1729  hexagonrpcd.confd
 52bb7ed829caa4dcff9728bd6e3cdf118b3c7ee7dfe90df0d4e6422dd67bf3258ae2a4d2dc7599da4182fbd8eb47a0e1d20c58198dc17f2bf178b8f01a8887f7  modules-initfs
 "
@@ -1,2 +0,0 @@
-# Fairphone 4 specific hexagonrpcd firmware directory
-hexagonrpcd_fw_dir="/usr/share/qcom/sm7225/Fairphone/fairphone4"
@@ -3,7 +3,7 @@
 pkgname=device-google-bonito
 pkgdesc="Google Pixel 3a XL"
 pkgver=7
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -81,7 +81,7 @@ openrc() {

 	# The FastRPC service is only enabled when non-free firmware is installed.
 	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
-		"$subpkgdir"/etc/elogind/system-sleep/no-hexagonrpcd-on-suspend.sh
+		-t "$subpkgdir"/usr/libexec/elogind/system-sleep
 }

 sha512sums="
@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=14
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -72,7 +72,7 @@ openrc() {

 	# The FastRPC service is only enabled when non-free firmware is installed.
 	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
-		"$subpkgdir"/etc/elogind/system-sleep/no-hexagonrpcd-on-suspend.sh
+		-t "$subpkgdir"/usr/libexec/elogind/system-sleep

 	install -Dm755 "$srcdir"/modem-gnss.initd \
 		"$subpkgdir"/etc/init.d/modem-gnss
@@ -5,7 +5,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=15
+pkgver=17
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,7 +25,6 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="
-	01_$pkgname.override
 	deviceinfo
 	firmware.files
 	modules-initfs
@@ -33,7 +32,6 @@ source="
 	usbguard.conf
 "
 subpackages="
-	$pkgname-gnome
 	$pkgname-pipewire
 	$pkgname-usbguard
 	$pkgname-vulkan
@@ -50,18 +48,10 @@ package() {
 		-t "$pkgdir"/usr/share/mkinitfs/files
 	install -Dm644 "$srcdir"/pipewire.conf \
 		-t "$pkgdir"/usr/share/pipewire.conf.d
-	install -Dm644 "$srcdir"/01_"$pkgname".override \
-		-t "$pkgdir"/usr/share/glib-2.0/schemas
 	install -Dm600 "$srcdir"/usbguard.conf \
 		"$pkgdir"/etc/usbguard/rules.d/"$pkgname".conf
 }

-gnome() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-base-ui-gnome"
-
-	amove usr/share/glib-2.0/schemas/01_"$pkgname".override
-}
-
 pipewire() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-base-ui-audio-pipewire"

@@ -81,10 +71,9 @@ usbguard() {
 }

 sha512sums="
-0254e1277ad0971c50e6e69b377983e8b25f8f45773fdef98fe3a9df7cb06e1c5b9553109e8bd20472099562f82a08b2c9329c72d0ef97210840b5c00a048caa  01_device-lenovo-21bx.override
 95260beda1a476801f699b10aee77ce1b0342ae67b3120c0d6a59a09f04489c67d579d2c90d1899a90e6b4220ab8726da2eb295e28ed22a800ee78b7b408932b  deviceinfo
 5f4e6a80455c8a2ed879bfd457a89f81790824657ed4101e03b7ec288a274e63340f48e2ad5028cf83744263a4529584b1e94c36d10b98912e5b31804fa98ff0  firmware.files
-27705e998db262602b50004083fe160dbcde88e9fdcaeb43e3d1d79be0b7af371f84855bb93ba16ada3cf5fa8ff8da6ca159cda4b1de08fb54ac451c57169c57  modules-initfs
+45d56b8d6157dd7d679d0d4af4866973e6e0365c276fa56c008cbc8373f64626c881b6097ad1b9fa9c0d5b769e61b5a81466d6a773e2848c9ee89f06c0302249  modules-initfs
 52bbb9564ec713db5d46937701b121afe0c6c644fffe189a05766f491b4997b1bbc4c1f90229efb5764d795df8d40a57d4c840ee4b32d426e7a84520364b8bf5  pipewire.conf
 0d0412eb1f01af39000c39391f622640461305d83dae1a53aa7eef640cc17fd265cabca4e4e57dea053c47a4e50f9feb90f12ee5310d5b6425783e83efc5f9d8  usbguard.conf
 "
@@ -1,39 +1,58 @@
-# PCIe + NVMe
-nvme
-phy_qcom_qmp_pcie
-pcie_qcom
-
-# Keyboard, mouse, some on-board devices
-i2c_hid_of
-i2c_qcom_geni
-
-# PWM, backlight
-leds_qcom_lpg
-pwm_bl
-
-# Battery management, TCPM, remote DSPs
-qrtr
-pmic_glink_altmode
-
-# USB-C
-gpio_sbu_mux
-phy_qcom_qmp_combo
-
-# Display
-gpucc_sc8280xp
+apr
 dispcc_sc8280xp
-panel_edp
-phy_qcom_edp
-msm
-
-# USB boot
-phy_qcom_qmp_usb
-phy_qcom_snps_femto_v2
 dwc3
 dwc3_qcom
 extcon_core
-## Need to load remoteproc modules in the initramfs, if they are loaded later
-## then it can cause a power cycle that breaks USB
+gpio_sbu_mux
+gpucc_sc8280xp
+hci_uart
+hid_generic
+hid_multitouch
+i2c_hid_of
+i2c_hid_of_elan
+i2c_qcom_cci
+i2c_qcom_geni
+icc_bwmon
+icc_osm_l3
+leds_gpio
+leds_qcom_lpg
+llcc_qcom
+lpasscc_sc8280xp
+msm
+nvme
+panel_edp
+pci_pwrctrl_pwrseq
+pcie_qcom
+phy_qcom_edp
+phy_qcom_qmp_combo
+phy_qcom_qmp_pcie
+phy_qcom_qmp_usb
+phy_qcom_snps_femto_v2
+pinctrl_sc8280xp_lpass_lpi
+pmic_glink
+pmic_glink_altmode
+pwm_bl
+pwrseq-core
+pwrseq_qcom_wcn
+q6apm_dai
+q6apm_lpass_dais
+q6prm
+q6prm_clocks
+qcom-pm8008-regulator
+qcom_battmgr
+qcom_camss
 qcom_common
+qcom_pm8008
+qcom_pon
 qcom_q6v5_pas
+qcom_rng
+qcom_spmi_adc5
+qcom_spmi_adc_tm5
+qcom_spmi_temp_alarm
+qcom_stats
+qcom_wdt
+qrtr
 qrtr-smd
+rtc_pm8xxx
+typec
+videocc_sm8350
@@ -4,7 +4,7 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgver=10
-pkgrel=0
+pkgrel=1
 _confver=69
 _purismrel=2
 # <librem5-base ver>.<purism release>
@@ -30,6 +30,7 @@ depends="
 	postprocessd
 	u-boot-librem5
 	u-boot-tools
+	wys
 "
 makedepends="devicepkg-dev u-boot-tools"
 builddir=$srcdir/librem5-base-pureos-$_confver
@@ -80,10 +81,6 @@ build() {

 gnome() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-base-ui-gnome"
-	depends="
-
-		wys
-	"
 	install -D -m644 "$builddir"/default/org.freedesktop.ModemManager1.pkla \
 		"$subpkgdir"/var/lib/polkit-1/localauthority/10-vendor.d/org.freedesktop.ModemManager1.pkla
 }
@@ -5,7 +5,7 @@
 pkgname=device-qcom-msm8953
 pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
 pkgver=9
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -23,7 +23,10 @@ depends="
 	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
-subpackages="device-xiaomi-daisy-fake-goodix:xiaomi_daisy_fake_goodix"
+subpackages="
+	$pkgname-udev
+	device-xiaomi-daisy-fake-goodix:xiaomi_daisy_fake_goodix
+"
 source="
 	deviceinfo
 	modules-initfs
@@ -37,12 +40,25 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 61-gmobile-wakeup-lenovo-cd18781y.hwdb -t "$pkgdir/usr/lib/udev/hwdb.d/"
+	install -Dm644 61-gmobile-wakeup-lenovo-cd18781y.hwdb \
+		-t "$pkgdir/usr/lib/udev/hwdb.d/"
+	install -Dm644 "$srcdir"/90-device-xiaomi-daisy.rules \
+		-t "$pkgdir/usr/lib/udev/rules.d/"
+}
+
+udev() {
+	pkgdesc="$pkgdesc (udev rules)"
+	install_if="$pkgname=$pkgver-r$pkgrel udev"
+
+	# default_udev isn't used here to allow also installing a udev rule in the
+	# xiaomi_daisy_fake_goodix function
+	amove usr/lib/udev/hwdb.d/61-gmobile-wakeup-lenovo-cd18781y.hwdb
 }

 xiaomi_daisy_fake_goodix() {
 	pkgdesc="Calibration data for replacement goodix touch controllers"
-	install -Dm644 "$srcdir"/90-device-xiaomi-daisy.rules -t "$subpkgdir/etc/udev/rules.d/"
+
+	amove usr/lib/udev/rules.d/90-device-xiaomi-daisy.rules
 }

 sha512sums="
@@ -6,7 +6,7 @@

 pkgname=device-qcom-sm7150
 pkgdesc="Generic device package for Qualcomm SM7150 devices"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -61,5 +61,5 @@ openrc() {

 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-180-degrees.rules
-a506a2afea2a5c9b796d8aff3ec4436aa55d7af7342cf3aa6e70f4b566b56924a77809121176a8a9bf285ca1818dc250c53326cfae26a7da2b3b63fd5a26e579  deviceinfo
+b771b3939f285981c200faa001e9aea785ee48de4523a5b398e926ccd5eb6a55ead1363e7869d8844c6ed92d9220b590ae80cfc7a4dc6bec13876f7447c96576  deviceinfo
 "
@@ -16,8 +16,7 @@ deviceinfo_external_storage="true"

 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet loglevel=2"
-deviceinfo_getty="ttyMSM0;115200"
+deviceinfo_kernel_cmdline="quiet loglevel=2 console=tty0 pmos.nosplash"
 deviceinfo_generate_systemd_boot="true"
 deviceinfo_boot_filesystem="fat32"
 # Required for devices using UFS as storage (instead of e.g. eMMC)
@@ -1,10 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Jenneron <jenneron@protonmail.com>
-# Co-Maintainer: Alexandre Marquet <tb@a-marquet.fr>
+# Maintainer: Alexandre Marquet <tb@a-marquet.fr>
+# Co-Maintainer: Lukas Timmermann <lukas@timmermann.space>
 pkgname=device-samsung-manta
 pkgdesc="Google Nexus 10"
 pkgver=11
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -1,9 +1,9 @@
-# Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Maintainer: Joel Selvaraj <foss@joelselvaraj.com>
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=14
-pkgrel=0
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,6 +19,7 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-nonfree-firmware-udev:nonfree_firmware_udev
 	$pkgname-kernel-tianma:kernel_tianma
 	$pkgname-kernel-ebbg:kernel_ebbg
 "
@@ -38,6 +39,13 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/81-libssc-xiaomi-beryllium.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-xiaomi-beryllium.rules
+	install -Dm644 "$srcdir"/q6voiced.conf \
+		"$pkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }

 nonfree_firmware() {
@@ -49,12 +57,8 @@ nonfree_firmware() {
 		hexagonrpcd
 	"

-	install -Dm644 "$srcdir"/81-libssc-xiaomi-beryllium.rules \
-		"$subpkgdir"/etc/udev/rules.d/81-libssc-xiaomi-beryllium.rules
-	install -Dm644 "$srcdir"/q6voiced.conf \
-		"$subpkgdir"/etc/conf.d/q6voiced
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
+	amove etc/conf.d/q6voiced
+	amove usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }

 nonfree_firmware_openrc() {
@@ -65,6 +69,12 @@ nonfree_firmware_openrc() {
 	mkdir -p "$subpkgdir"
 }

+nonfree_firmware_udev() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel udev"
+
+	default_udev
+}
+
 kernel_tianma() {
 	pkgdesc="Tianma Panel. To know which panel your device use and the status of the port, Visit the Poco F1 wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_Poco_F1_(xiaomi-beryllium)"
 	depends="linux-postmarketos-qcom-sdm845"
@@ -1,8 +1,8 @@
-# Maintainer: Jenneron <jenneron@protonmail.com>
-# Co-Maintainer: Alexandre Marquet <tb@a-marquet.fr>
+# Maintainer: Alexandre Marquet <tb@a-marquet.fr>
+# Co-Maintainer: Lukas Timmermann <lukas@timmermann.space>
 pkgname=firmware-samsung-manta
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Samsung Manta (Nexus 10)"
 url="https://developers.google.com/android/drivers#mantalmy49j"
 arch="armv7"
@@ -1,8 +1,8 @@
-# Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Maintainer: Joel Selvaraj <foss@joelselvaraj.com>

 pkgname=firmware-xiaomi-beryllium
 pkgver=8
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Xiaomi Poco F1"
 url="https://gitlab.com/sdm845-mainline/firmware-xiaomi-beryllium"
 arch="aarch64"
@@ -1,14 +1,14 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: Casey Connolly <kcxt@postmarketos.org>
 pkgname=linux-postmarketos-qcom-laptop
-pkgver=6.16
-pkgrel=3
-# Commit from branch @ https://github.com/jhovold/linux/tree/wip/x1e80100-$pkgver
-_commit="a9cd6cda46ab81b1ec1d687d40ff0933dc6e6915"
+pkgver=6.17
+pkgrel=0
+# Commit from branch @ https://gitlab.com/Linaro/arm64-laptops/linux/-/tree/qcom-laptops-v$pkgver
+_commit="152dfac4946688462cb23a3084f873761af22603"
 pkgdesc="Generic kernel for Qualcomm laptops"
 arch="aarch64"
 _carch="arm64"
-_flavor="postmarketos-qcom-laptop"
+_flavor="${pkgname#linux-}"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip
@@ -16,6 +16,7 @@ options="!strip
 	!tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community
+	pmb:kconfigcheck-immutable
 	pmb:kconfigcheck-uefi
 	pmb:kconfigcheck-virt
 "
@@ -43,24 +44,17 @@ replaces="linux-lenovo-21bx"
 # Source
 _repository="linux"
 source="
-	$pkgname-$_commit.tar.gz::https://github.com/jhovold/$_repository/archive/$_commit.tar.gz
+	$pkgname-$_commit.tar.gz::https://gitlab.com/Linaro/arm64-laptops/$_repository/-/archive/$_commit/linux-$_commit.tar.gz
+	config-postmarketos-qcom-laptop.aarch64
 	misc.config
 	pmos.config
 "
 builddir="$srcdir/linux-$_commit"
-_outdir="out"
-_defconfig="johan_defconfig"
+_defconfig="defconfig"

 prepare() {
 	default_prepare
-	cp "$srcdir/pmos.config" "$builddir"/arch/"$_carch"/configs/
-	cp "$srcdir/misc.config" "$builddir"/arch/"$_carch"/configs/
-
-	# Generate .config
-	unset LDFLAGS
-	make ARCH="$_carch" LLVM=1 \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor" \
-		"$_defconfig" pmos.config misc.config
+	cp "$srcdir/config-$_flavor.$CARCH" .config
 }

 build() {
@@ -88,7 +82,8 @@ package() {
 }

 sha512sums="
-147ff8e664ef809ad45de839947ead5ac006c67f5d63bb3199d0064102aab97671f477a1a6a0ef4df7512a1c560e40e31b2b8735990d5310c107e3ce880a35c4  linux-postmarketos-qcom-laptop-a9cd6cda46ab81b1ec1d687d40ff0933dc6e6915.tar.gz
-e7a651b3780b1cfa68ca65b9e62f77db4273cf5b9162514318c347790d961b4668d0c6eb51604aaaf15a15c9f370fe03b4b977163293af379fda9a08d5f7e73d  misc.config
-b26371a4208c79f301b7c398445e5d3503b8477be8d23d513bd5fd5746d1245980a914986203d205f986e4b58587c9a1243d8bfb1c27bc65685f1d3af186eb44  pmos.config
+59fa7fac3e8451b26f0987e56e16a88a455a16c51af30f637468bf2aabb6ea89bdb19a1d95803ee4bf6121d40c6ce49b8965731d6847683497fc66d3106cc5e1  linux-postmarketos-qcom-laptop-152dfac4946688462cb23a3084f873761af22603.tar.gz
+238534e36d89713e3f8f6e38b679a44ac02620e502bd612eaca626ebc4fb6b22e4619be56309c69601bde08fa7deba2d1dcb757f00b7e0626c847b8fa0b98743  config-postmarketos-qcom-laptop.aarch64
+ad188e782f56555eaa0dd13034be57fdbffb20b8854b5771435d922a62a36137aa365288eaaed96df6bcd0eddcdf24a453490e7259a49b2e494d3f87b33316a1  misc.config
+4b82a0e9ed8cd83fcef897c665dd1b386ae1d6d0cbce09d059f39197d899e694e004890712b57a93598e077b59d5b7e460f9190c651666879336e7e3f2035638  pmos.config
 "
@@ -6,11 +6,10 @@ CONFIG_PROC_EVENTS=y
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_CH341=m
 CONFIG_BOOT_PRINTK_DELAY=y
+
 # systemd
 CONFIG_BPF_LSM=y
 CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_BTF=y
-CONFIG_DEBUG_INFO_BTF_MODULES=y
 CONFIG_DEBUG_INFO_DWARF5=y
 CONFIG_KPROBES=y
 CONFIG_KPROBE_EVENTS=y
@@ -26,3 +25,101 @@ CONFIG_VHOST_TASK=y
 CONFIG_VHOST=m
 CONFIG_VHOST_MENU=y
 CONFIG_VHOST_VSOCK=m
+
+# Bluetooth
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+
+CONFIG_DRM_UDL=m
+CONFIG_SND_USB_AUDIO=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_STORAGE=y
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=m
+
+# USB Gadget
+CONFIG_U_SERIAL_CONSOLE=y
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+
+# USB net
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_ACM=m
+CONFIG_USB_WDM=m
+
+# Disable other archs to speed up builds and reduce size of kernel
+# CONFIG_ARCH_ACTIONS is not set
+# CONFIG_ARCH_AIROHA is not set
+# CONFIG_ARCH_SUNXI is not set
+# CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_APPLE is not set
+# CONFIG_ARCH_AXIADO is not set
+# CONFIG_ARCH_BCM is not set
+# CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_BLAIZE is not set
+# CONFIG_ARCH_CIX is not set
+# CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_SPARX5 is not set
+# CONFIG_ARCH_K3 is not set
+# CONFIG_ARCH_LG1K is not set
+# CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_KEEMBAY is not set
+# CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_NXP is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_S32 is not set
+# CONFIG_ARCH_MA35 is not set
+# CONFIG_ARCH_NPCM is not set
+# CONFIG_ARCH_REALTEK is not set
+# CONFIG_ARCH_RENESAS is not set
+# CONFIG_ARCH_ROCKCHIP is not set
+# CONFIG_ARCH_SEATTLE is not set
+# CONFIG_ARCH_INTEL_SOCFPGA is not set
+# CONFIG_ARCH_SOPHGO is not set
+# CONFIG_ARCH_STM32 is not set
+# CONFIG_ARCH_SYNQUACER is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_TESLA_FSD is not set
+# CONFIG_ARCH_SPRD is not set
+# CONFIG_ARCH_THUNDER is not set
+# CONFIG_ARCH_THUNDER2 is not set
+# CONFIG_ARCH_UNIPHIER is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_VISCONTI is not set
+# CONFIG_ARCH_XGENE is not set
+# CONFIG_ARCH_ZYNQMP is not set
+
+# Disable bigger drivers for non-existing hardware (e.g. other SoCs)
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_ETNAVIV is not set
+# CONFIG_DRM_HISI_HIBMC is not set
+# CONFIG_DRM_HISI_KIRIN is not set
+# CONFIG_DRM_LIMA is not set
+# CONFIG_DRM_PANFROST is not set
+# CONFIG_DRM_PANTHOR is not set
+# CONFIG_DRM_TIDSS is not set
+# CONFIG_DRM_POWERVR is not set
@@ -1,225 +1,153 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-
-CONFIG_BLK_DEV_DM=y
+# default
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CGROUPS=y
 CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_XTS=y
 CONFIG_DEVTMPFS=y
-CONFIG_DM_CRYPT=m
-CONFIG_EXT4_FS=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_MD=y
+CONFIG_DM_CRYPT=y
+CONFIG_INPUT_EVDEV=m
+# CONFIG_KINETO_GAN is not set
+# CONFIG_PFT is not set
+# CONFIG_SEC_RESTRICT_ROOTING is not set
+CONFIG_SYN_COOKIES=y
 CONFIG_SYSVIPC=y
 CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_USE_VFB is not set
+CONFIG_VT=y
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_SCRIPT=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_USER_NS=y
-CONFIG_VT=y
+CONFIG_NULL_TTY=m
 CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_FW_LOADER_COMPRESS_ZSTD=y
-CONFIG_NULL_TTY=y
-
-# Anbox / Waydroid
-CONFIG_ANDROID_BINDER_IPC=y
-# CONFIG_ANDROID_BINDERFS is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_CGROUP_BPF=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_FUSE_FS=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XTABLES=m
 CONFIG_PSI=y
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_VLAN_8021Q=m
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+CONFIG_UDMABUF=y

-# iwd
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CMAC=y
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_KEYS=y
-CONFIG_KEY_DH_OPERATIONS=y
-CONFIG_PKCS7_MESSAGE_PARSER=y
-CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
-CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_RFKILL=y
+# community_various
+CONFIG_BINFMT_MISC=m
+CONFIG_CIFS=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+CONFIG_DM_INTEGRITY=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_UCLAMP_TASK=y
+CONFIG_UCLAMP_TASK_GROUP=y

-# nftables
-CONFIG_NETFILTER=y
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CT=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_COMPAT=m
-
-# /usr/share/docker/contrib/check-config.sh (from Gentoo)
-# Missing dependency?
-CONFIG_NET_SCHED=y
-
-# Generally Necessary:
-CONFIG_NAMESPACES=y
-CONFIG_NET_NS=y
-CONFIG_PID_NS=y
-CONFIG_IPC_NS=y
-CONFIG_UTS_NS=y
-CONFIG_CGROUPS=y
+# containers
+CONFIG_BLK_CGROUP=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_NETFILTER=m
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CPUSETS=y
-CONFIG_KEYS=y
-CONFIG_VETH=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_NETFILTER=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_IP_NF_NAT=m
-CONFIG_NF_NAT=m
-CONFIG_POSIX_MQUEUE=y
-
-# Optional Features:
-CONFIG_USER_NS=y
-CONFIG_SECCOMP=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_BLK_CGROUP=y
-CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_CGROUP_PERF=y
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CFS_BANDWIDTH=y
+CONFIG_DUMMY=m
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
 CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_IPC_NS=y
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_VS=m
 CONFIG_IP_VS_NFCT=y
 CONFIG_IP_VS_PROTO_TCP=y
 CONFIG_IP_VS_PROTO_UDP=y
 CONFIG_IP_VS_RR=m
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
+CONFIG_KEYS=y
+CONFIG_MD=y
+CONFIG_NAMESPACES=y
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_NS=y
+CONFIG_NET_SCHED=y
+CONFIG_NF_NAT=m
+CONFIG_PID_NS=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_UTS_NS=y
+CONFIG_VETH=m
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_MEMCG=y
+CONFIG_SWAP=y
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_VXLAN=m
 CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_IPVLAN=m
 CONFIG_MACVLAN=m
-CONFIG_DUMMY=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_NFT_COMPAT=m
+CONFIG_CGROUP_NET_PRIO=y
 CONFIG_OVERLAY_FS=m
+CONFIG_IPVLAN=m
+CONFIG_SECCOMP=y
+CONFIG_CGROUP_PIDS=y

-# lxc
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
+# debug
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y

-# ZRAM
-CONFIG_CRYPTO_LZ4=y
-CONFIG_CRYPTO_ZSTD=y
-CONFIG_SWAP=y
-CONFIG_ZRAM=m
-CONFIG_ZRAM_BACKEND_LZ4=y
-CONFIG_ZRAM_BACKEND_ZSTD=y
-CONFIG_ZRAM_DEF_COMP_ZSTD=y
-
-# netboot
-CONFIG_BLK_DEV_NBD=m
-
-# WireGuard
-CONFIG_WIREGUARD=m
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_CT=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_CONNTRACK_MARK=y
-
-# File systems
-CONFIG_BTRFS_FS=m
+# filesystems
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_EXFAT_FS=m
 CONFIG_EXT4_FS=y
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_FS=y
 CONFIG_UDF_FS=m
 CONFIG_XFS_FS=m

-# Community
-CONFIG_BINFMT_MISC=m
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_CIFS=m
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_UCLAMP_TASK=y
-CONFIG_UCLAMP_TASK_GROUP=y
-CONFIG_DM_INTEGRITY=m
+# hardening
+CONFIG_CFI_CLANG=y
+# CONFIG_CFI_PERMISSIVE is not set
+CONFIG_LTO_CLANG_THIN=y
+CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y
+CONFIG_SHADOW_CALL_STACK=y

-# Input
+# immutable
+CONFIG_EFIVAR_FS=m
+CONFIG_DM_VERITY=m
+CONFIG_EROFS_FS=y
+CONFIG_EROFS_FS_ZIP=y
+
+# input
+CONFIG_BT=m
+CONFIG_BT_HIDP=m
+CONFIG_GPIOLIB=y
 CONFIG_HIDRAW=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
-CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_ALPS=m
-CONFIG_HID_APPLEIR=m
 CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=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
@@ -233,14 +161,12 @@ 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_GENERIC=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
@@ -253,12 +179,10 @@ CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_LCPOWER=m
 CONFIG_HID_LED=m
-CONFIG_ACPI=y  # needed for HID_LENOVO
-CONFIG_HID_LENOVO=m
 CONFIG_HID_LETSKETCH=m
+CONFIG_HID_LOGITECH=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
@@ -267,19 +191,18 @@ CONFIG_HID_MCP2221=m
 CONFIG_HID_MEGAWORLD_FF=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=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=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
@@ -326,111 +249,155 @@ 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_IIO=y
 CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
 CONFIG_UHID=m
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_PRINTER=m
+CONFIG_HID_EVISION=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID_NVIDIA_SHIELD=m
+CONFIG_HID_GOOGLE_STADIA_FF=m
+CONFIG_HID_WINWING=m
+CONFIG_HID_GOODIX_SPI=m
+CONFIG_SPI=y

-# USB
-CONFIG_DRM_UDL=m
-CONFIG_SND_USB_AUDIO=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_STORAGE=y
-CONFIG_USB_RTL8152=m
-CONFIG_USB_USBNET=m
+# iwd
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_KEYS=y
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_RFKILL=m
+CONFIG_X509_CERTIFICATE_PARSER=y

-# USB Gadget
-CONFIG_U_SERIAL_CONSOLE=y
+# netboot
+CONFIG_BLK_DEV_NBD=m
+
+# nftables
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_NETFILTER=y
+CONFIG_NFT_CT=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_REJECT=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_IP6_NF_IPTABLES_LEGACY=m
+CONFIG_IP_NF_IPTABLES_LEGACY=m
+CONFIG_NETFILTER_XTABLES_LEGACY=y
+
+# usb_gadgets
 CONFIG_USB_CONFIGFS=m
-CONFIG_USB_CONFIGFS_SERIAL=y
 CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_OBEX=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_ECM=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_CONFIGFS_F_UAC1=y
-CONFIG_USB_CONFIGFS_F_UAC2=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_F_HID=y
-CONFIG_USB_CONFIGFS_F_UVC=y
-CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_FUNCTIONFS is not set
+CONFIG_USB_GADGET=y
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MASS_STORAGE is not set

-# USB net
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_ACM=m
-CONFIG_USB_WDM=m
+# waydroid
+# CONFIG_ANDROID_BINDERFS is not set
+CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
+CONFIG_ANDROID_BINDER_IPC=y
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_CGROUP_BPF=y
+CONFIG_FUSE_FS=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VLAN_8021Q=m
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_IP_NF_IPTABLES_LEGACY=m
+CONFIG_NETFILTER_XTABLES_LEGACY=y

-# LED triggers
-CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_NETDEV=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_PATTERN=m
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_TTY=m
+# wireguard
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_NFT_CT=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_WIREGUARD=m

-# Bluetooth devices
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
+# zram
+CONFIG_SWAP=y
+CONFIG_ZRAM=y
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM_BACKEND_ZSTD=y

-# EFI
+# uefi
+CONFIG_DMI=y
 CONFIG_EFI=y
-CONFIG_EFI_ZBOOT=y
-CONFIG_FB_EFI=y
-CONFIG_VFAT_FS=y
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_VARS_PSTORE=y
 CONFIG_NLS_ASCII=y
 CONFIG_PSTORE=y
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_VFAT_FS=y
+CONFIG_EFI_GENERIC_STUB=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_ZBOOT=y
+CONFIG_NTFS3_FS=m

-# libcamera
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_CMA=y
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_UDMABUF=y
-
-# enable uvcvideo for basic USB webcam/HDMI-dongle support
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-
-# Debug
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_DYNAMIC_FTRACE=y
-
-# Virtualization
+# virt
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_KVM=y
 CONFIG_VIRTUALIZATION=y
-
-# Immutable
-CONFIG_DM_VERITY=m
-CONFIG_EFIVAR_FS=m
-CONFIG_EROFS_FS=m
-CONFIG_EROFS_FS_ZIP=y
-CONFIG_EROFS_FS_ZIP_LZMA=y
@@ -1,5 +1,5 @@
 # Maintainer: Casey Connolly <kcxt@postmarketos.org>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Joel Selvaraj <foss@joelselvaraj.com>
 # Stable Linux kernel with patches for SDM845 devices
 # Kernel config based on: arch/arm64/configs/defconfig and sdm845.config

@@ -3,7 +3,7 @@
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
 pkgver=6.17.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -67,5 +67,5 @@ package() {

 sha512sums="
 8b6418ef520cb789b7f8c4aa3d1cedeab087e104198bb5569541348b173ad1509db561e126ff86e650624b1693e618389ab8abf40e0a1af79e89b5b4b026c9f1  linux-v6.17.6-sm6350.tar.gz
-1694404b966968b1e6a727935632bc75f8967ed748f01773678acfa4f481e98c9da3b3fa6a6623ae89e03856b9ded37a0c7bad413ff5dee096f0ec8c3bc9afc6  config-postmarketos-qcom-sm6350.aarch64
+84b7c27a09d7194fc2d26d4fe72351ed2a91bed6a7c54f88394d1f014d61379d3cc0b26174cf20642f29c17d323006f956923357b675e0f2b9aa11c8b4cccc85  config-postmarketos-qcom-sm6350.aarch64
 "
@@ -286,7 +286,6 @@ CONFIG_CRASH_DUMP=y
 # end of General setup

 CONFIG_ARM64=y
-CONFIG_RUSTC_SUPPORTS_ARM64=y
 CONFIG_CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
@@ -551,6 +550,7 @@ CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
 CONFIG_STACKPROTECTOR_PER_TASK=y
+# CONFIG_UNWIND_PATCH_PAC_INTO_SCS is not set
 CONFIG_ARM64_CONTPTE=y
 # end of Kernel Features

@@ -684,7 +684,6 @@ CONFIG_ARCH_WANTS_NO_INSTR=y
 CONFIG_HAVE_ASM_MODVERSIONS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_RUST=y
 CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
@@ -710,16 +709,20 @@ CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y
-# CONFIG_SHADOW_CALL_STACK is not set
+CONFIG_SHADOW_CALL_STACK=y
+CONFIG_LTO=y
+CONFIG_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_HAS_LTO_CLANG=y
-CONFIG_LTO_NONE=y
+# CONFIG_LTO_NONE is not set
 # CONFIG_LTO_CLANG_FULL is not set
-# CONFIG_LTO_CLANG_THIN is not set
+CONFIG_LTO_CLANG_THIN=y
 CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
-# CONFIG_CFI_CLANG is not set
+CONFIG_CFI_CLANG=y
+CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y
 CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS_CLANG=y
+# CONFIG_CFI_PERMISSIVE is not set
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -788,8 +791,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y

 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_FUNCTION_ALIGNMENT_4B=y
-CONFIG_FUNCTION_ALIGNMENT_8B=y
-CONFIG_FUNCTION_ALIGNMENT=8
+CONFIG_FUNCTION_ALIGNMENT=4
 CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options

@@ -933,7 +935,7 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
-CONFIG_ZSMALLOC=m
+CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8

@@ -1780,7 +1782,7 @@ CONFIG_OF_NUMA=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_ZRAM=m
+CONFIG_ZRAM=y
 # CONFIG_ZRAM_BACKEND_LZ4 is not set
 # CONFIG_ZRAM_BACKEND_LZ4HC is not set
 CONFIG_ZRAM_BACKEND_ZSTD=y
@@ -1918,7 +1920,7 @@ CONFIG_DM_BUFIO=m
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
 # CONFIG_DM_UNSTRIPED is not set
-CONFIG_DM_CRYPT=m
+CONFIG_DM_CRYPT=y
 # CONFIG_DM_SNAPSHOT is not set
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_CACHE is not set
@@ -1935,7 +1937,9 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_INIT is not set
 # CONFIG_DM_UEVENT is not set
 # CONFIG_DM_FLAKEY is not set
-# CONFIG_DM_VERITY is not set
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+# CONFIG_DM_VERITY_FEC is not set
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
 CONFIG_DM_INTEGRITY=m
@@ -1964,7 +1968,7 @@ CONFIG_VXLAN=m
 # CONFIG_AMT is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
-CONFIG_TUN=y
+CONFIG_TUN=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 # CONFIG_VIRTIO_NET is not set
@@ -2274,7 +2278,7 @@ CONFIG_INPUT_VIVALDIFMAP=y
 #
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVDEV=m

 #
 # Input Device Drivers
@@ -2462,7 +2466,7 @@ CONFIG_INPUT_PM8941_PWRKEY=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_DA7280_HAPTICS is not set
@@ -2580,7 +2584,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=m
 # CONFIG_HVC_DCC is not set
 # CONFIG_RPMSG_TTY is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -4604,7 +4608,7 @@ CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
-CONFIG_HID_GENERIC=y
+CONFIG_HID_GENERIC=m

 #
 # Special HID drivers
@@ -4748,7 +4752,6 @@ CONFIG_HID_MCP2221=m
 #
 # HID-BPF support
 #
-CONFIG_HID_BPF=y
 # end of HID-BPF support

 CONFIG_I2C_HID=y
@@ -4933,15 +4936,15 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_DUMMY_HCD is not set
 # end of USB Peripheral Controller

-CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_ACM=y
-CONFIG_USB_U_SERIAL=y
-CONFIG_USB_U_ETHER=y
-CONFIG_USB_F_NCM=y
-CONFIG_USB_F_RNDIS=y
-CONFIG_USB_F_MASS_STORAGE=y
-CONFIG_USB_F_FS=y
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_CONFIGFS=m
 # CONFIG_USB_CONFIGFS_SERIAL is not set
 CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_USB_CONFIGFS_OBEX is not set
@@ -5065,7 +5068,7 @@ CONFIG_SCSI_UFS_QCOM=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=y
-CONFIG_LEDS_CLASS_MULTICOLOR=y
+CONFIG_LEDS_CLASS_MULTICOLOR=m
 # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set

 #
@@ -5140,7 +5143,7 @@ CONFIG_LEDS_QCOM_FLASH=y
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_TIMER=m
 # CONFIG_LEDS_TRIGGER_ONESHOT is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
@@ -5156,7 +5159,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_CAMERA is not set
 # CONFIG_LEDS_TRIGGER_PANIC is not set
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
-CONFIG_LEDS_TRIGGER_PATTERN=y
+CONFIG_LEDS_TRIGGER_PATTERN=m
 # CONFIG_LEDS_TRIGGER_TTY is not set
 # CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set

@@ -6600,7 +6603,7 @@ CONFIG_XFS_SUPPORT_ASCII_CI=y
 # CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
-CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
@@ -6608,7 +6611,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_EXPERIMENTAL is not set
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
-CONFIG_F2FS_FS=m
+CONFIG_F2FS_FS=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
@@ -6704,7 +6707,7 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=y
+CONFIG_EFIVAR_FS=m
 # end of Pseudo filesystems

 CONFIG_MISC_FILESYSTEMS=y
@@ -6745,7 +6748,19 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set
 # CONFIG_UFS_FS is not set
-# CONFIG_EROFS_FS is not set
+CONFIG_EROFS_FS=y
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+CONFIG_EROFS_FS_BACKED_BY_FILE=y
+CONFIG_EROFS_FS_ZIP=y
+# CONFIG_EROFS_FS_ZIP_LZMA is not set
+# CONFIG_EROFS_FS_ZIP_DEFLATE is not set
+# CONFIG_EROFS_FS_ZIP_ZSTD is not set
+# CONFIG_EROFS_FS_ZIP_ACCEL is not set
+# CONFIG_EROFS_FS_ONDEMAND is not set
+# CONFIG_EROFS_FS_PCPU_KTHREAD is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NFS_FS is not set
 # CONFIG_NFSD is not set
@@ -6883,7 +6898,7 @@ CONFIG_RANDSTRUCT_NONE=y
 # end of Kernel hardening options
 # end of Security options

-CONFIG_XOR_BLOCKS=m
+CONFIG_XOR_BLOCKS=y
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_XOR=m
 CONFIG_CRYPTO=y
@@ -6986,12 +7001,12 @@ CONFIG_CRYPTO_ESSIV=y
 #
 # Hashes, digests, and MACs
 #
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_RMD160 is not set
 CONFIG_CRYPTO_SHA1=y
@@ -7002,7 +7017,7 @@ CONFIG_CRYPTO_SHA3=y
 # CONFIG_CRYPTO_STREEBOG is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 # end of Hashes, digests, and MACs

 #
@@ -7118,7 +7133,7 @@ CONFIG_BINARY_PRINTF=y
 #
 # Library routines
 #
-CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ=y
 CONFIG_RAID6_PQ_BENCHMARK=y
 CONFIG_LINEAR_RANGES=y
 CONFIG_PACKING=y
@@ -7179,12 +7194,12 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMMON=y
-CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_COMPRESS=y
 CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
@@ -7468,8 +7483,6 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FREGS=y
 CONFIG_HAVE_FTRACE_GRAPH_FUNC=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_HAVE_EXTRA_IPI_TRACEPOINTS=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
@@ -7491,8 +7504,6 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 # CONFIG_FUNCTION_GRAPH_RETVAL is not set
 # CONFIG_FUNCTION_GRAPH_RETADDR is not set
 CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
-CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
 CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y
 # CONFIG_FPROBE is not set
 # CONFIG_FUNCTION_PROFILER is not set
@@ -3,7 +3,7 @@
 _flavor=samsung-coreprimevelte
 pkgname=linux-$_flavor
 pkgver=6.15.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Samsung Galaxy Core Prime VE LTE mainline kernel"
 arch="aarch64"
 _carch="arm64"
@@ -51,6 +51,7 @@ source="
 	0014-arm64-dts-samsung-coreprimevelte-add-vibrator.patch
 	0015-DONOTMERGE-mmc-host-Disable-Tuning-failed-message.patch
 	0016-mmc-sdhci-pxav3-add-pinctrl-setting.patch
+	touchscreen.patch

 	clang21.patch

@@ -100,6 +101,7 @@ c92dc23c0db6ad1b8bbb02a49467f9a03acf77885374b519842a238b8cefb4156a90cc654fb45dca
 ae16b59770cd76ab1777ef56a4888a073822a97ab6dbb5f18b3da7e3889c3b982c4b01930652cb68fae2082b566e1b5aacd1b81e536db71d58e7603e9cf04886  0014-arm64-dts-samsung-coreprimevelte-add-vibrator.patch
 5b3e3ba9b7ce6501bcd3b94c1e804e05ed5dbaa328c89b40f8cf466002efff704dd7c6d451cc336edf4cdac30489c416d08b13792344c3635c055a6a8b2ddcc6  0015-DONOTMERGE-mmc-host-Disable-Tuning-failed-message.patch
 782644892ae1237141431169ad3dcb5c1afad3461f8984909792fc5db9f0059403aba3a77b84867fbbffed541cccea4005169f1fe7cf38a5d81d6dab782f810b  0016-mmc-sdhci-pxav3-add-pinctrl-setting.patch
+ea754a553d5cd53d0056c72474b91ddc863960a8e3481609462e64b1bba202dd52f20310ce411973ce4965e6f07f955f0e4256c6511088ab79bdd63539750ad6  touchscreen.patch
 7db49d195e8034aca257d8d0673cfef2b9c2ce833332c9bae46274ef5d345da5af6fee46a3f3466a75e1771c4815794a87c8190aaccecdcd7c35195362234178  clang21.patch
 f3a1645e02edd45cd3465db395c3cd659549fd961317a3e75f46e8c863151a76781ac013bf809e2b8008bb39d27fcbf50e26eb42c27de79a5994e839d1ed95a8  config-samsung-coreprimevelte.aarch64
 "
@@ -0,0 +1,35 @@
+From 17d3495e47c0dcb33c47ad54379421b62d34fb84 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= <duje@dujemihanovic.xyz>
+Date: Sun, 14 Dec 2025 13:13:11 +0100
+Subject: [PATCH 09/13] arm64: dts: marvell: samsung-coreprimevelte: Increase
+ touchscreen voltage
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The old 1.9V setting was found to be insufficient in certain
+environments (in my case cold ones), causing the touchscreen to register
+ghost touches and mostly ignore actual touches. Increase the voltage to
+2.5V to correct the issue.
+
+Signed-off-by: Duje Mihanović <duje@dujemihanovic.xyz>
+---
+ .../boot/dts/marvell/mmp/pxa1908-samsung-coreprimevelte.dts     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/marvell/mmp/pxa1908-samsung-coreprimevelte.dts b/arch/arm64/boot/dts/marvell/mmp/pxa1908-samsung-coreprimevelte.dts
+index faeea5001364..fd16760f1072 100644
+--- a/arch/arm64/boot/dts/marvell/mmp/pxa1908-samsung-coreprimevelte.dts
+++ b/arch/arm64/boot/dts/marvell/mmp/pxa1908-samsung-coreprimevelte.dts
+@@ -461,7 +461,7 @@ pmic@30 {
+ 
+ 		regulators {
+ 			ldo2: ldo2 {
+-				regulator-min-microvolt = <1900000>;
+				regulator-min-microvolt = <2500000>;
+ 				regulator-max-microvolt = <3100000>;
+ 			};
+ 
+-- 
+2.52.0
+
@@ -3,7 +3,7 @@
 pkgname=device-sqfmi-beepy
 pkgdesc="SQFMI Beepy"
 pkgver=2
-pkgrel=0
+pkgrel=1

 _kbdmodname=beepy-kbd
 _kbdmodver=2.11
@@ -55,6 +55,7 @@ prepare() {

 	default_prepare

+	# setting KERNELRELEASE in akmbuild to ensure newest kernel is always used for building the module
 	# add an akmbuild to display driver
 	cat >$_dispdir/AKMBUILD <<-EOF
 	modname=$_dispmodname
@@ -62,8 +63,7 @@ prepare() {
 	built_modules=$_dispmodname.ko

 	build() {
-		KERNELRELEASE=\$(find /lib/modules -type d -iname '*-rpi' -mindepth 1 -maxdepth 1 -exec basename {} \;)
-		make
+		KERNELRELEASE=\$(find /lib/modules -type d -iname '*-rpi' -mindepth 1 -maxdepth 1 -exec basename {} \; -quit) make
 	}
 	EOF

@@ -74,8 +74,7 @@ prepare() {
 	built_modules=$_kbdmodname.ko

 	build() {
-		KERNELRELEASE=\$(find /lib/modules -type d -iname '*-rpi' -mindepth 1 -maxdepth 1 -exec basename {} \;)
-		make
+		KERNELRELEASE=\$(find /lib/modules -type d -iname '*-rpi' -mindepth 1 -maxdepth 1 -exec basename {} \; -quit) make
 	}
 	EOF
 }
@@ -3,7 +3,7 @@
 # Kernel config based on: arch/arm/configs/checkers_defconfig
 pkgname=linux-amazon-checkers
 pkgver=4.9.77
-pkgrel=1
+pkgrel=2
 pkgdesc="Amazon Echo Show 5 1st Generation kernel fork"
 arch="armv7"
 _carch="arm"
@@ -15,9 +15,13 @@ makedepends="
 	bash
 	bc
 	bison
+	clang
 	devicepkg-dev
+	dtc
 	findutils
 	flex
+	lld
+	llvm
 	openssl-dev
 	perl
 "
@@ -41,10 +45,24 @@ source="
 	fix-check-lxdialog.patch
 	fix-check-lxdialog-makefile.patch
 	remove-dummy-audio-mmap.patch
+	remove-mno-thumb-interwork.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"

+export CC=clang
+export LD=ld.lld
+export AR=llvm-ar
+export NM=llvm-nm
+export STRIP=llvm-strip
+export OBJCOPY=llvm-objcopy
+export OBJDUMP=llvm-objdump
+export READELF=llvm-readelf
+export HOSTCC=clang
+export HOSTCXX=clang++
+export HOSTAR=llvm-ar
+export HOSTLD=ld.lld
+
 prepare() {
 	default_prepare

@@ -54,12 +72,16 @@ prepare() {
 	ln -sf "$builddir/drivers/net/wireless/wifimtk/config/checkers.config" \
 		"$builddir/drivers/net/wireless/wifimtk/.config"

+	# Replace x86_64 dtc_overlay binary
+	rm "$builddir"/scripts/dtc/dtc_overlay
+	ln -s /usr/bin/dtc "$builddir"/scripts/dtc/dtc_overlay
+
 	. downstreamkernel_prepare
 }

 build() {
 	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
+	make O="$_outdir" ARCH="$_carch" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 }

@@ -68,7 +90,7 @@ package() {
 		"$_flavor" "$_outdir"

 	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
+	make O="$_outdir" ARCH="$_carch" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
 		INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 \
 		modules_install
@@ -77,7 +99,7 @@ package() {
 sha512sums="
 68dd148b050277f66ec243e6a129257f1b23b841009258e2be50e0a46208765595f6b4db2b726b243f203c20bddb5e52461e97d2252010b0cb82f07b402fa8ed  linux-amazon-checkers-846c2e61fec7d94feed35e58812bb8b97eb59aab.tar.gz
 f5c87f01a171f69fd8fe1ad93fb896ad9e54be09d18b798ad3692a13409c97e6e0e903ce1a7db78ae7b95ab8f9c3b263f48a53b1b6828972afeac7569f3801e8  linux-amazon-checkers-wifi-ba66f7a1535bda706f67d5becd8d3148523e5eec.tar.gz
-92409ede013b6cc3b0effa45e07128539675917f796f063bd236ceba88d8674e67e5eb9f5bd8278dc17d0d6d14f7c62027409df15aa10a6291d834930606b5a3  config-amazon-checkers.armv7
+50f138cf442006ac522e02caf536fad4a69e612bceb507cf03378e950e8287079702d870286b2c915779eee8f70dcb7200dbcb1101ac25f7564a3e25ce67e26f  config-amazon-checkers.armv7
 3fa90b7883d66e85e2f7a2d8011643f1a378169269fd8b172185e1179b6862789caadc500fc930f7b32498770d1f0145cf25dfe10022f99db60918bca01ef7e8  0001-Remove-redundant-YYLOC-global-declaration.patch
 491879bc492820e608b3604daca24f26187f6e552ec47d358d205118179f89594f9cbb1480ad0d5c7a94126dfe523fd6e1bbb594821431967ee59f6908ebeeea  0002-Fix-solaris-style-flag.patch
 0f7c76b206144d78a0f8fb18979f363c008bebbac96e075824c69651d52a2c06c8e5db5060b61033517e4c78d54cb9c446dfa03e1ddfac9e5fb44a6bfdf42265  0003-Add-missing-kconfig-files.patch
@@ -86,4 +108,5 @@ ad4fce05db2247c9353afe63f54cfaac54bd96266ffc6572e0e0dfeefe090b90e08ee44e0825e59e
 182be3c596b9cc267ac108d7cf03fc8c328ccc6b36770800e4dcedea8d1bb65e3f5eacf590c2948f58b1418cc60a1670ba77dde8c259e428d158c31b6e1dbaf5  fix-check-lxdialog.patch
 c33fad9de627e72f12e61e728fa1ec53ef15259c7790392a997cc7269e60e45da9534d58851c3b348a1729aaa134d1df305e33546e8a1f3654462f2c3c1d9563  fix-check-lxdialog-makefile.patch
 e6f11b7a87c68ad0d9bb85361fe0d99f957e2bcba6c86d314b9ef558b526a7dfd8efcbe7698b686c396ef31f98ae33bd097736ea20f65612755838acb94a03bf  remove-dummy-audio-mmap.patch
+e7f4f35229580ff87572cc8c98fe4d79689c18690fb5c0a0f91de9d8159e7dc0043d3e3e27b788fa421dd682c0bde3ffbfb8ec36663e018c34e5a030ec4a7e6e  remove-mno-thumb-interwork.patch
 "
@@ -28,7 +28,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 # General setup
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE="arm-eabi-"
+CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
@@ -4206,11 +4206,7 @@ CONFIG_DYNAMIC_DEBUG=y
 #
 # Compile-time checks and compiler options
 #
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_GDB_SCRIPTS is not set
+# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1400
@@ -0,0 +1,16 @@
+Fixes clang: error: unknown argument: '-mno-thumb-interwork' for armv7
+
+--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
+@@ -104,9 +104,9 @@
+ tune-y := $(tune-y)
+ 
+ ifeq ($(CONFIG_AEABI),y)
+-CFLAGS_ABI	:=-mabi=aapcs-linux -mno-thumb-interwork -mfpu=vfp
+CFLAGS_ABI	:=-mabi=aapcs-linux -mfpu=vfp
+ else
+-CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
+CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+ endif
+ 
+ ifeq ($(CONFIG_ARM_UNWIND),y)
@@ -3,7 +3,7 @@

 pkgname=linux-samsung-a50
 pkgver=4.14.194
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy A50 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -15,10 +15,10 @@ makedepends="
 	bash
 	bc
 	bison
+	clang
 	devicepkg-dev
 	findutils
 	flex
-	gcc6
 	linux-headers
 	lld
 	llvm
@@ -45,16 +45,12 @@ source="
 	various_firmware_paths.patch
 	dtbinst_remove_target.patch
 	no_trailingspaces.patch
+	arm64-vdso-fix-vdso_offset_sigtramp-undeclared.patch
+	memcpy-STB_GLOBAL.patch
 "
 builddir="$srcdir/$_kernel_repo-$_kernel_repo_commit"
 _outdir="out"

-if [ "${CC:0:5}" != "gcc6-" ]; then
-	CC="gcc6-$CC"
-	HOSTCC="gcc6-gcc"
-	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
-fi
-
 prepare() {
 	default_prepare
 	REPLACE_GCCH=0 . downstreamkernel_prepare
@@ -70,7 +66,20 @@ build() {
 	cp drivers/misc/tzdev/startup_old.tzar $_outdir/drivers/misc/tzdev/startup_old.tzar

 	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
+	make O="$_outdir" ARCH="$_carch" \
+		CC=clang \
+		LD=ld.lld \
+		AR=llvm-ar \
+		NM=llvm-nm \
+		STRIP=llvm-strip \
+		OBJCOPY=llvm-objcopy \
+		OBJDUMP=llvm-objdump \
+		READELF=llvm-readelf \
+		HOSTCC=clang \
+		HOSTCXX=clang++ \
+		HOSTAR=llvm-ar \
+		HOSTLD=ld.lld \
+		LLVM=1 LLVM_IAS=1 \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 }

@@ -80,8 +89,21 @@ package() {

 	# Modules
 	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
+	make O="$_outdir" ARCH="$_carch" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
+		CC=clang \
+		LD=ld.lld \
+		AR=llvm-ar \
+		NM=llvm-nm \
+		STRIP=llvm-strip \
+		OBJCOPY=llvm-objcopy \
+		OBJDUMP=llvm-objdump \
+		READELF=llvm-readelf \
+		HOSTCC=clang \
+		HOSTCXX=clang++ \
+		HOSTAR=llvm-ar \
+		HOSTLD=ld.lld \
+		LLVM=1 LLVM_IAS=1 \
 		INSTALL_MOD_PATH="$pkgdir" \
 		INSTALL_MOD_STRIP=1 \
 		MODLIB="$pkgdir/lib/modules/4.14.194" \
@@ -92,7 +114,7 @@ package() {

 sha512sums="
 a8937404ae7547c7a4b623f77f44a08390749c0d527c783bb7f99758dbfc204b7fe95df1d7b5c3f52bd0febf84fc8fcb28196574436cbd131d476ea707ffdf22  linux-samsung-a50-7f72a8b689677562f028d78b2e91bd79277a0aba.tar.gz
-aad95fc57648cab5d27635abedddfcf7e783d7c557ca9c50b384997f6a3ccc6ef8ec7a147cce48d72fcbf7650d12a34814cce49bb9302d52f3d4545f43880a3d  config-samsung-a50.aarch64
+3e56ab2d917429a25207b19e440b11e47798871fa650a1e311b381fe6dcc814960d509c78c39c620bd63aa10b2435c8fca539a441510ec9e0d29bbdba8becc98  config-samsung-a50.aarch64
 182be3c596b9cc267ac108d7cf03fc8c328ccc6b36770800e4dcedea8d1bb65e3f5eacf590c2948f58b1418cc60a1670ba77dde8c259e428d158c31b6e1dbaf5  fix-check-lxdialog.patch
 c3024ec5bab940c2792d9dd2d6407c6a099ad1c301de3bea087f166e2d0102d653efd7fe21fd74abbeb289cab89090eb8cbd9abf325dcb8327ae75820358b87c  lz4_missing_label.patch
 dd5cbce4ffca5c919b9819bec8ff9d4902e3fb024780d12467c498f933fd9bc4af638ab1eaaf53269e491e1a4576bb34cda980a2e70252aed1b831264aa48e01  disable_optimization_flags.patch
@@ -101,4 +123,6 @@ a3b72366255eeb3a339646b56857171c8f9a20b020ce2fe0837ee0fd32e07a866d0329624cf6d604
 5ae731527b5f9fddeb1f5fa853ded918dc323414453d0600d9c27b42b76a55a47c471344115cb0628195c13815f776e73705bf51c20197c011fbda36a619bcd9  various_firmware_paths.patch
 00ea85c43059d24b6930781ef2e9d1b62ad73416d771445135650d41c4e045528b5237a896de451a68ceeace89223700392e67772efaa723c3e0b11e95e431dc  dtbinst_remove_target.patch
 3143ad3241632d287916216cc0c712307a7efc54f92a2bc57f70948e3e3a102b3140e91030aaff055abd8201309725690c26120551afe6acbe2e9019a0b95939  no_trailingspaces.patch
+db2cd9cbd8447d4bb5387ac34aef7414867a6322f9d3c435be432cfe4b6af535384c042254c934a7aad28b97592593905b26c124692fa207bd1e7b6457ba0a09  arm64-vdso-fix-vdso_offset_sigtramp-undeclared.patch
+6828faf0212198d78e58312669ff306236a95d0e3c3e2b9d81d171b6bb54b72979bb9867cecf584781647fe8ee1011ab080317783bc2ddd6e35ccd07029e3686  memcpy-STB_GLOBAL.patch
 "
@@ -0,0 +1,34 @@
+From 49c7fba8bfd5017a400b6395dc7874636215dfe3 Mon Sep 17 00:00:00 2001
+From: Tiandoufayale <45908670+tiandoufayale@users.noreply.github.com>
+Date: Sat, 24 Feb 2024 15:08:34 +0800
+Subject: [PATCH]  arm64:vdso: fix vdso_offset_sigtramp' undeclared
+
+---
+ arch/arm64/include/asm/vdso.h              | 3 +++
+ arch/arm64/kernel/vdso/gen_vdso_offsets.sh | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm64/include/asm/vdso.h b/arch/arm64/include/asm/vdso.h
+index 839ce0031..61e04da2f 100644
+--- a/arch/arm64/include/asm/vdso.h
+++ b/arch/arm64/include/asm/vdso.h
+@@ -29,6 +29,9 @@
+ 
+ #include <generated/vdso-offsets.h>
+ 
+
+#define vdso_offset_sigtramp
+
+ #define VDSO_SYMBOL(base, name)						   \
+ ({									   \
+ 	(void *)(vdso_offset_##name - VDSO_LBASE + (unsigned long)(base)); \
+diff --git a/arch/arm64/kernel/vdso/gen_vdso_offsets.sh b/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
+index 0664acaf6..d7ff1fe19 100644
+--- a/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
+++ b/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
+@@ -13,4 +13,4 @@
+ 
+ LC_ALL=C
+ sed -n -e 's/^00*/0/' -e \
+-'s/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso_offset_\2\t0x\1/p'
+'s/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso_offset_\2 0x\1/p'
@@ -295,17 +295,16 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
 # CONFIG_CC_STACKPROTECTOR_STRONG is not set
 CONFIG_THIN_ARCHIVES=y
+# CONFIG_LD_BFD is not set
 # CONFIG_LD_GOLD is not set
 CONFIG_LD_LLD=y
-CONFIG_LTO=y
+# CONFIG_LTO is not set
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_THINLTO=y
-CONFIG_THINLTO=y
 CONFIG_ARCH_SUPPORTS_LTO_GCC=y
-# CONFIG_LTO_NONE is not set
-CONFIG_LTO_CLANG=y
-# CONFIG_CFI_CLANG is not set
-CONFIG_LLVM_POLLY=y
+CONFIG_LTO_NONE=y
+# CONFIG_LTO_CLANG is not set
+# CONFIG_LLVM_POLLY is not set
 # CONFIG_GCC_GRAPHITE is not set
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -700,6 +699,7 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y
 CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_MODULE_REGION_FULL=y

 #
 # Boot options
@@ -2064,7 +2064,7 @@ CONFIG_INPUT_MATRIXKMAP=y
 #
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_KEYRESET=y
 # CONFIG_INPUT_TOUCHSCREEN_TCLMV2 is not set
@@ -0,0 +1,85 @@
+From: Fangrui Song <maskray@google.com>
+
+mainline inclusion
+from mainline-5.11-rc1
+commit 735e8d93dc2b107f7891a9c2b1c4cfbea1fcbbbc
+category: feature
+feature: ARM KASAN support
+issue: #I3ZXZF
+CVE: NA
+
+Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
+
+Modified by Aster Boese <asterboese@mailbox.org>
+ Changed to ARM64
+
+-------------------------------------------------
+Commit d6d51a96c7d6 ("ARM: 9014/2: Replace string mem* functions for
+KASan") add .weak directives to memcpy/memmove/memset to avoid collision
+with KASAN interceptors.
+
+This does not work with LLVM's integrated assembler (the assembly snippet
+`.weak memcpy ... .globl memcpy` produces a STB_GLOBAL memcpy while GNU as
+produces a STB_WEAK memcpy). LLVM 12 (since https://reviews.llvm.org/D90108)
+will error on such an overridden symbol binding.
+
+Use the appropriate WEAK macro instead.
+
+Link: https://github.com/ClangBuiltLinux/linux/issues/1190
+Reviewed-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
+Signed-off-by: Chen Jun <chenjun102@huawei.com>
+Signed-off-by: Yu Changchun <yuchangchun1@huawei.com>
+
+---
+ arch/arm64/lib/memcpy.S  | 3 +--
+ arch/arm64/lib/memmove.S | 3 +--
+ arch/arm64/lib/memset.S  | 3 +--
+ 3 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/arch/arm64/lib/memcpy.S b/arch/arm64/lib/memcpy.S
+index 676139377..dfedd4ab1 100644
+--- a/arch/arm64/lib/memcpy.S
+++ b/arch/arm64/lib/memcpy.S
+@@ -68,9 +68,8 @@
+ 	stp \ptr, \regB, [\regC], \val
+ 	.endm
+ 
+-	.weak memcpy
+ ENTRY(__memcpy)
+-ENTRY(memcpy)
+WEAK(memcpy)
+ #include "copy_template.S"
+ 	ret
+ ENDPIPROC(memcpy)
+diff --git a/arch/arm64/lib/memmove.S b/arch/arm64/lib/memmove.S
+index f5ac945d2..d2dadccb6 100644
+--- a/arch/arm64/lib/memmove.S
+++ b/arch/arm64/lib/memmove.S
+@@ -57,9 +57,8 @@ C_h	.req	x12
+ D_l	.req	x13
+ D_h	.req	x14
+ 
+-	.weak memmove
+ ENTRY(__memmove)
+-ENTRY(memmove)
+WEAK(memmove)
+ 	prfm    pldl1strm, [src, #L1_CACHE_BYTES]
+ 	cmp	dstin, src
+ 	b.lo	__memcpy
+diff --git a/arch/arm64/lib/memset.S b/arch/arm64/lib/memset.S
+index f2670a9f2..316263c47 100644
+--- a/arch/arm64/lib/memset.S
+++ b/arch/arm64/lib/memset.S
+@@ -54,9 +54,8 @@ dst		.req	x8
+ tmp3w		.req	w9
+ tmp3		.req	x9
+ 
+-	.weak memset
+ ENTRY(__memset)
+-ENTRY(memset)
+WEAK(memset)
+ 	mov	dst, dstin	/* Preserve return value.  */
+ 	and	A_lw, val, #255
+ 	orr	A_lw, A_lw, A_lw, lsl #8
+-- 
+2.52.0
@@ -3,7 +3,7 @@

 pkgname=linux-samsung-a53x
 pkgver=5.10.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy A53 5G kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -15,13 +15,14 @@ makedepends="
 	bash
 	bc
 	bison
+	clang
 	devicepkg-dev
 	findutils flex
 	openssl-dev
 	perl
+	python3
 	xz
 	llvm
-	clang
 	lld
 	linux-headers
 "
@@ -36,7 +37,8 @@ builddir="$srcdir/gabriel2392_android_kernel_samsung_a53x_xy"
 _outdir="out"

 prepare() {
-	cd $builddir
+	default_prepare
+
 	local i
 	local makefiles="$(find $builddir -type f -name Makefile)
 		$(find . -type f -name Kbuild)"
@@ -48,13 +50,16 @@ prepare() {
 		sed -i 's/=implicit-int//g' $i
 		sed -i 's/=return-type//g' $i
 		sed -i 's/=date-time//g' $i
+		sed -i 's/=unknown-warning-option//g' $i
 	done
-	make PLATFORM_VERSION=12 ANDROID_MAJOR_VERSION=s ARCH=$_carch TARGET_SOC=$_repository $_repository-a53xxx_defconfig
+	make PLATFORM_VERSION=12 ANDROID_MAJOR_VERSION=s \
+		ARCH=$_carch TARGET_SOC=$_repository LLVM=1 \
+		$_repository-a53xxx_defconfig
 	echo "CONFIG_SECTION_MISMATCH_WARN_ONLY=y" >> $builddir/.config
 }

 build() {
-	make ARCH="$_carch" CC="${CC:-gcc}" \
+	make ARCH="$_carch" LLVM=1 \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 }

@@ -66,6 +71,7 @@ package() {

 	make modules_install dtbs_install \
 		ARCH="$_carch" \
+		LLVM=1 \
 		INSTALL_PATH="$pkgdir"/boot/ \
 		INSTALL_MOD_PATH="$pkgdir" \
 		INSTALL_MOD_STRIP=1 \
@@ -3,7 +3,7 @@
 pkgname=device-amlogic-aarch64-tvbox
 pkgdesc="Amlogic AArch64 TV box"
 pkgver=11
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -83,6 +83,7 @@ kernel_p281() {
 kernel_ugoos_am3() {
 	pkgdesc="Kernel for Ugoos AM3 (S912)"
 	depends="linux-postmarketos-amlogic"
+	aml_boot_prep "meson-gxm-ugoos-am3.dtb" "$subpkgdir"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }

@@ -3,7 +3,7 @@
 pkgname=device-apple-mac-aarch64
 pkgdesc="Apple M-series Macs"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,6 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-asahi
 	asahi-audio
-	asahi-fwextract
 	asahi-scripts
 	linux-postmarketos-asahi
 	postmarketos-base
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp5
 pkgdesc="Fairphone 5"
-pkgver=9
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -37,7 +37,6 @@ subpackages="$pkgname-openrc"
 source="
 	81-libssc-fairphone-fp5.rules
 	deviceinfo
-	hexagonrpcd.confd
 	modules-initfs
 	ucm/HiFi.conf
 	ucm/fp5.conf
@@ -59,9 +58,6 @@ package() {
 	mkdir -p "$pkgdir"/usr/share/alsa/ucm2/conf.d/qcm6490
 	ln -s /usr/share/alsa/ucm2/Fairphone/fp5/fp5.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/qcm6490/Fairphone\ 5.conf
-
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 }

 openrc() {
@@ -75,7 +71,6 @@ openrc() {
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp5.rules
 8577d77e9e5fe4981f9800fb361ade934d724bd477b530f5f1c237b529704a450490fa9e045d3e5fb9e998260b89c10e8b633ccee4c411715bee932301b64e4b  deviceinfo
-206c7b2616b61c1f7630933d036875985e78cfc23e6a175795b328d251684abeceb06373da4ae211f6f7dd7e45fb3b3238bb8a4b5698906be626d8d918adf5b3  hexagonrpcd.confd
 6280b66b9d4843ef78d0029c31d267b0bf59ea669bc3f2c268edfddf4edb3cec62d40b97c8204c85d1350759ad56e1ac2a5ba8ddc691f73c35c7385350ef12ee  modules-initfs
 f39b6e5de6d9bfefc841e887b92bb5a92d02d1de46fd376ca83871b7a9cf0da5297d7201457b2bb12c302887bb0a9d328604ff910ebda8022ac71ad120b11a3c  HiFi.conf
 fb510ca806fb76174576218f5cb4d799e05757b3e351eec32b1406bcf22540cf27888f30e3737f016d43e3c38dea8d7418c194e12c9879df9c756d4d80ceae99  fp5.conf
@@ -1,2 +0,0 @@
-# Fairphone 5 specific hexagonrpcd firmware directory
-hexagonrpcd_fw_dir="/usr/share/qcom/qcm6490/Fairphone/fairphone5"
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=device-fairphone-fp6
 pkgdesc="The Fairphone (Gen. 6)"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,7 +17,7 @@ depends="
 	firmware-fairphone-fp6-modem
 	firmware-fairphone-fp6-venus
 	firmware-fairphone-fp6-wpss
-	linux-postmarketos-qcom-sm7635
+	linux-postmarketos-qcom-milos
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
@@ -44,6 +44,6 @@ package() {

 sha512sums="
 17533b261db6ead91b360e2d71355297fc3ad37f3fc68f6f03a8f7bb31e1ca82ecc403454aa360c7eace9164199086422f9e2d7507e24e4695caa8d3c117034f  00-mesa.sh
-4c9e8a1f56351ff316e85a65efb63766408c43d7c32f2f217cd3573ae8c6466c07950114ac5f98d6fbe739728cba2071c352150ab20318528df7dafe8a1a82c0  deviceinfo
+7bd8339e7ffd2da5b741d22d52e67d5ca80d5ddf3d6da8f732ba8ef33fdcf0e32815581321a5ce1e4103bb369f889010c251d8ee86f1a681bae0116b74c1edd7  deviceinfo
 c535c211a6d594605e0e2af3536e457b4b6a4b833f26efda4dbd514597d080393a621338c274173f4633eadefc0c2ae830f7ceaa4cbe56a1e6715ff825af18f1  modules-initfs
 "
@@ -8,7 +8,6 @@ deviceinfo_manufacturer="Fairphone"
 deviceinfo_codename="fairphone-fp6"
 deviceinfo_year="2025"
 deviceinfo_dtb="qcom/milos-fairphone-fp6"
-deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
 deviceinfo_flash_kernel_on_update="true"

@@ -1,6 +1,6 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Joel Selvaraj <foss@joelselvaraj.com>
 # Co-Maintainer: Casey Connolly <kcxt@postmarketos.org>

 pkgname=device-google-blueline
@@ -1,6 +1,6 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Newbyte <newbyte@postmarketos.org>
-# Co-maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
+# Co-Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
 pkgname=device-librecomputer-solitude
 pkgdesc="Libre Computer AML-S905D3-CC"
 pkgver=3
@@ -1,7 +1,7 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
-pkgver=7
+pkgver=8
 pkgrel=0
 _commit="28d2c05ab4e80a7972611cd3188f3e8be4197f6a"
 url="https://postmarketos.org"
@@ -24,7 +24,7 @@ source="
 	pinenote-dist-$_commit.tar.gz::https://git.sr.ht/~hrdl/pinenote-dist/archive/$_commit.tar.gz
 	waveform-extract-use-lib.patch
 	sway-wayland-sessions-use-dbus.patch
-	sway-waybar-config-fix-endless-interval.patch
+	sway-waybar-config-fix-endless-interval-and-invisible-icons.patch
 	sway-sane-scale.patch
 	sway-nwg-menu-fix-css-path.patch

@@ -36,16 +36,17 @@ source="
 	30-eink-waveform.files
 	50-touchscreen.conf
 	panfrost.conf
-	tinydm-ebc.service
+	tinydm-ebc-workaround-override.conf
 "
 subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
-	$pkgname-nonfree-firmware-systemd:nonfree_firmware_systemd
-	$pkgname-x11
+	$pkgname-nonfree-firmware
+	$pkgname-nonfree-firmware-openrc:firmware_openrc
+	$pkgname-nonfree-firmware-systemd:firmware_systemd
 	$pkgname-sway
-	$pkgname-sway-systemd:sway_systemd
+	$pkgname-sway-hrdl
+	$pkgname-systemd
 	$pkgname-xournalpp
+	$pkgname-x11
 "
 builddir="$srcdir"/pinenote-dist-$_commit

@@ -69,29 +70,33 @@ package() {
 		-t "$pkgdir"/etc/libinput

 	# modprobe rules
-	# Hack to get around grep CI error since we don't want to exclude the whole file
-	cd "$builddir"/etc
-	install -Dm644 \
-		modprobe.d/rockchip_ebc.conf \
-		modprobe.d/wifi.conf \
-		-t "$pkgdir"/usr/lib/modprobe.d
-	cd "$builddir"
+	# cd because shellcheck-grep gets confused by usage of etc/modprobe.d
+	(
+		cd "$builddir"/etc

-	# udev rules
-	install -Dm644 \
-		"$builddir"/etc/udev/rules.d/81-libinput-pinenote.rules \
-		"$builddir"/etc/udev/rules.d/83-backlight.rules \
-		"$builddir"/etc/udev/rules.d/84-rockchip-ebc-power.rules \
-		-t "$pkgdir"/usr/lib/udev/rules.d
+		install -Dm644 \
+			./modprobe.d/rockchip_ebc.conf \
+			./modprobe.d/wifi.conf \
+			-t "$pkgdir"/usr/lib/modprobe.d
+
+		# udev rules
+		install -Dm644 \
+			./udev/rules.d/81-libinput-pinenote.rules \
+			./udev/rules.d/83-backlight.rules \
+			./udev/rules.d/84-rockchip-ebc-power.rules \
+			-t "$pkgdir"/usr/lib/udev/rules.d
+	)

 	# bins
+	# rockchip_ebc_dump_buffers.py binary to dump whatever is on the screen framebuffer for debugging
+	# {before,after}_sleep.sh hooks to put a splash screen when sleeping and shutdown backlight
 	install -Dm755 \
 		"$builddir"/bin/rockchip_ebc_dump_buffers.py \
 		"$builddir"/bin/before_sleep.sh \
 		"$builddir"/bin/after_resume.sh \
 		-t "$pkgdir"/usr/bin

-	# python library
+	# python library used by rockchip_ebc_dump_buffers and waveform extraction on first boot
 	local _site_packages_path="$(python -c 'import site; print(site.getsitepackages())' | sed -e "s|\['||" -e "s|'\]||")"
 	install -Dm755 "$builddir"/bin/rockchip_ebc_custom_ioctl.py \
 		-t "$pkgdir"/$_site_packages_path
@@ -99,12 +104,19 @@ package() {
 	# panfront sometimes insists on loading after rockchip_ebc
 	install -Dm644 "$srcdir"/panfrost.conf \
 		-t "$pkgdir"/usr/lib/modprobe.d
+
+	# rockchip_ebc sometimes fails to load the initial waveform.
+	# This forces a reload before starting tinydm
+	# TODO: openrc workaround
+	install -Dm644 \
+		"$srcdir"/tinydm-ebc-workaround-override.conf \
+		"$pkgdir"/usr/lib/systemd/system/tinydm.service.d/override.conf
 }

-sway() {
-	install_if="$pkgname=$pkgver-r$pkgrel sway"
-	install="device-pine64-pinenote-sway.post-install"
-	depends="postmarketos-theme waybar squeekboard swayidle swaybg iio-sensor-proxy
+hrdl() {
+	pkgdesc="Opinionated sway UI by hrdl optimized for the Pinenote"
+	install="$subpkgname.post-install $subpkgname.post-deinstall"
+	depends="postmarketos-ui-sway postmarketos-theme waybar squeekboard swayidle swaybg iio-sensor-proxy
 	brightnessctl jq nwg-menu py3-i3ipc network-manager-applet rot8 papirus-icon-theme
 	ttf-font-awesome font-noto-emoji font-noto lisgd wtype coreutils wtype kitty
 	adwaita-icon-theme tinydm thunar py3-pillow py3-dbus-next py3-pydbus bash"
@@ -150,19 +162,6 @@ sway() {
 		-t "$subpkgdir"/usr/bin
 }

-sway_systemd() {
-	install_if="$pkgname-sway=$pkgver-r$pkgrel systemd"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="systemd"
-
-	# tinydm replacement systemd
-	# rockchip_ebc sometimes fails to load the initial waveform.
-	# This forces a reload before starting tiydm
-	install -Dm644 \
-		"$srcdir"/tinydm-ebc.service \
-		-t "$subpkgdir"/usr/lib/systemd/system/
-}
-
 xournalpp() {
 	install_if="$pkgname=$pkgver-r$pkgrel xournalpp"
 	depends="xournalpp"
@@ -173,14 +172,14 @@ xournalpp() {
 		-t "$subpkgdir"/etc/skel/.config/xournalpp
 }

-nonfree_firmware() {
+firmware() {
 	pkgdesc="WiFi, Bluetooth and display firmware"
 	depends="linux-firmware-cypress linux-firmware-brcm"
 	replaces="firmware-pine64-pinenote"

 	# waveform firmware is provided locally via /dev/disk/by-label/waveform
-	# and then adapted to kernel using hrdl's script
-	# and initd script executes it at first boot of device
+	# extracted using waveform_exctract.sh, then adapted to kernel using wbf_to_custom.py
+	# initd or systemd service execute these on first boot
 	install -Dm644 "$srcdir"/30-eink-waveform.files \
 		"$subpkgdir"/usr/share/mkinitfs/files/30-eink-waveform.files
 	install -Dm755 \
@@ -194,29 +193,50 @@ nonfree_firmware() {
 	touch "$subpkgdir"/lib/firmware/rockchip/ebc.wbf
 	touch "$subpkgdir"/lib/firmware/rockchip/custom_wf.bin

-	# symbolic link for wifi firmware to where it expects it
+	# symbolic link for wifi firmware to where drivers expects it
 	mkdir -p "$subpkgdir"/lib/firmware/brcm
 	ln -s ../cypress/cyfmac43455-sdio.bin.zst "$subpkgdir"/lib/firmware/brcm/brcmfmac43455-sdio.pine64,pinenote-v1.2.bin.zst
 }

-nonfree_firmware_openrc() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="openrc"
+sway() {
+	install_if="$pkgname=$pkgver-r$pkgrel sway"
+	install="$subpkgname.post-upgrade"

-	install -Dm755 "$srcdir"/pinenote-init-waveform.initd \
-		"$subpkgdir"/etc/init.d/pinenote-init-waveform
+	# dummy subpackage to allow seamless upgrade from 7-r0 to 8-r0,
+	# which renamed `sway` to `sway-hrdl. Executes post-upgrade script
+	# that changes default tinydm session back to vanilla sway, with
+	# instructions to `apk add device-pine64-pinenote-sway-hrdl` to
+	# use the opinionated non-default configuration
+	# TODO: remove in preparation for v26.06 release
+	mkdir -p "$subpkgdir"
 }

-nonfree_firmware_systemd() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel systemd"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="systemd"
+systemd() {
+	# post-install enables tinydm if tinydm-ebc was enabled
+	# enables seamless upgrade 7-r0 to 8-r0
+	# TODO: remove in preparation for v26.06
+	install="$subpkgname.post-install"

+	default_systemd
+}
+
+firmware_openrc() {
+	install="$subpkgname.post-install"
+	install -Dm755 "$srcdir"/pinenote-init-waveform.initd \
+		"$subpkgdir"/etc/init.d/pinenote-init-waveform
+
+	# source `install_if`, `pkgdesc` and `depends`
+	default_openrc
+}
+
+firmware_systemd() {
 	install -Dm644 \
 		"$builddir"/systemd/pinenote-hrdl-extract-waveform.service \
 		"$builddir"/systemd/pinenote-hrdl-convert-waveform.service \
 		-t "$subpkgdir"/usr/lib/systemd/system
+
+	# source `install_if`, `pkgdesc` and `depends`
+	default_systemd
 }

 x11() {
@@ -231,8 +251,8 @@ sha512sums="
 4b6548a05dcdbe1ddda97dba58d625407fb553f90817e8e678b97e28603f64aab9a31fa18bda654c06638f3be21d7a6936786197f93f715e7d03a07e380873c5  pinenote-dist-28d2c05ab4e80a7972611cd3188f3e8be4197f6a.tar.gz
 780ece54589b4483461cc07917d9ca6f13222435872386d65c34ff6798758f28d81e913777d41b745e7bb0f53950b8f610ce361f2fe146937afd4080ae2aa904  waveform-extract-use-lib.patch
 16f5c226d1366ebd0efc5bdc92a33ae184773a17ce593bdb71c60f1a091de13b2d39bedee43c46c01229e36d60f3688626a1b1ae08eab2c235ac6f5f0fc3d6a8  sway-wayland-sessions-use-dbus.patch
-b0eb78d9b74b984c4bc5c5e15518a3f659d2e10a46b60085d5bc8bd3927d4724f71ecd623bcdb5743069fbed86291c6a33ac3cfefac21818bf44bdff620e8b14  sway-waybar-config-fix-endless-interval.patch
-74e5a76662b5e4c58ca9f281d4a3964f7e925cc06fc47f9c5f6bf1c3f039d2310495fe1a99b501cb35339309a74c7a4e94f270f511385f7bd2fc3c1a647a1447  sway-sane-scale.patch
+82babd0aa02084c7a05f7b2e3a6d74db373588cd612d4d75f5ec79db895d8bdda4fcde784a1b8340df33a8c5f26204151d55a9d9b9dd2cc317cef623f51b626e  sway-waybar-config-fix-endless-interval-and-invisible-icons.patch
+4a02a3fb225b16290fbc469da5acba8438e959c0471743950ae125ede6b75b61e1772d900bd1f7c5fca55222cf430cae6c953d6065553ea3594babf33b569405  sway-sane-scale.patch
 7effcd37bbf2cab66ccb57ab976de63c93bd03795ccd82f317fbfb16216da287ada4410d9b168057e651fa4d769588d1f0efa713caa28c5b71ba6b73909ae33c  sway-nwg-menu-fix-css-path.patch
 763461efa1c687f778112bc5804ebe66a5185032de0cdf6ae93ebcc70a3117011d6300db4970012c8fae8858b572a0b3ca7fb4344d366c46f32baa32cc9868fc  deviceinfo
 e0d3ac808e7a4f05df327a824e30dc54864908e31f4a643f6e85f054ab812eeb28fef647eb52ae85bfad7d40c9cd81c43c1cdc575de5dbc04304d74862d9772c  modules-initfs
@@ -241,5 +261,5 @@ df0565391a66eed53ed817d3d1415bef000f9ed33ef2e8aa3016be3ecc21dd4a357e57838979d271
 8f7a5ad2f407de8c474d54dfdb9cc099c96e8918fc123f8b2a8ff911d7e1c7ca6fe30f9cea8ee2f0c1ba5f3e53359193d0683ca912f0b66e79a12814ce38dd98  30-eink-waveform.files
 ac433eebbc35a48561837495997aee4e55510b979bc0d8e3bafb761bc1be5b4bdeed2f456369dcbc582688aefd07c63966b0d72b6ffa99e84cfd868e677f02c8  50-touchscreen.conf
 6ba6638754e00908243de2f73ed6898dac03638a200dcf7b7cd9684757355ee1eb0ac874af0f971ad2e054c1a8c471867bdaea4d9aaf7eea6d3cf81ac7dd73a2  panfrost.conf
-efc0b7fd892a9557d404f3dd52e6f03187d183b9432947a8845ef417e52e9dc55a71f920936a8fa11b90e73a355212b6094b86406c564d439a2e0347cfb0cced  tinydm-ebc.service
+3b95a2292a7367d228f281a1f0e031fffb3d26748350d7010d26b18a3fb46bceb214b083e0c8e2d5fe318c67ae3776663ad78fef83ce9030529d3a89b581b703  tinydm-ebc-workaround-override.conf
 "
@@ -1 +0,0 @@
-device-pine64-pinenote-nonfree-firmware-openrc.post-install
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-systemctl enable pinenote-hrdl-convert-waveform.service pinenote-hrdl-extract-waveform.service
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-systemctl enable pinenote-hrdl-convert-waveform.service pinenote-hrdl-extract-waveform.service
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+tinydm-set-session -f -s  /usr/share/wayland-sessions/sway.desktop
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-systemctl disable tinydm.service
-systemctl enable tinydm-ebc.service
@@ -1 +0,0 @@
-device-pine64-pinenote-sway-systemd.post-install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+cat >&2 <<-EOF
+
+Starting with 8-r0 device package version, the opinionated configuration
+from hrdl is not installed by default with sway, and packaged under a
+different subpackage. To keep it, please execute the following
+
+    apk add device-pine64-pinenote-sway-hrdl
+	
+EOF
+
+tinydm-set-session -f -s  /usr/share/wayland-sessions/sway.desktop
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# reenables tinydm if tinydm-ebc is detected as enabled
+# allow seamless upgrade 7-r0 to 8-r0, as tinydm-ebc was removed
+# in favor of a systemd override for tinydm
+# TODO: remove in preparation for v26.06
+if systemctl is-active -q tinydm-ebc.service 2>/dev/null; then
+ 	systemctl disable tinydm-ebc.service
+ 	systemctl enable tinydm.service
+fi
@@ -20,7 +20,7 @@ index 280fd83015..c87676069b 100755
 
 rotnormal() {
 -	swaymsg -- output "-" transform 0 scale 1
-+	swaymsg -- output "-" transform 0 scale 1.5
+	swaymsg -- output "-" transform 0
 	focused_name="$(focusedname)"
 	swaymsg -- input type:touch map_to_output "$focused_name"
 	swaymsg -- input type:tablet_tool map_to_output "$focused_name"
@@ -29,7 +29,7 @@ index 280fd83015..c87676069b 100755
 
 rotleft() {
 -	swaymsg -- output "-" transform 90 scale 1
-+	swaymsg -- output "-" transform 90 scale 1.2
+	swaymsg -- output "-" transform 90
 	focused_name="$(focusedname)"
 	swaymsg -- input type:touch map_to_output "$focused_name"
 	swaymsg -- input type:tablet_tool map_to_output "$focused_name"
@@ -38,7 +38,7 @@ index 280fd83015..c87676069b 100755
 
 rotright() {
 -	swaymsg -- output "-" transform 270 scale 1
-+	swaymsg -- output "-" transform 270 scale 1.2
+	swaymsg -- output "-" transform 270
 	focused_name="$(focusedname)"
 	swaymsg -- input type:touch map_to_output "$focused_name"
 	swaymsg -- input type:tablet_tool map_to_output "$focused_name"
@@ -47,7 +47,7 @@ index 280fd83015..c87676069b 100755
 
 rotinvert() {
 -	swaymsg -- output "-" transform 180 scale 1
-+	swaymsg -- output "-" transform 180 scale 1.5
+	swaymsg -- output "-" transform 180
 	focused_name="$(focusedname)"
 	swaymsg -- input type:touch map_to_output "$focused_name"
 	swaymsg -- input type:tablet_tool map_to_output "$focused_name"
@@ -0,0 +1,374 @@
+diff --git a/etc/sway_hrdl/waybar/config b/etc/sway_hrdl/waybar/config
+index f31a30e..76e041f 100644
+--- a/etc/sway_hrdl/waybar/config
+++ b/etc/sway_hrdl/waybar/config
+@@ -72,15 +72,15 @@
+             "critical": 15
+         },
+         // Connected to AC
+-        "format": " {icon} {capacity}%", // Icon: bolt
+        "format": "\uF0E7 {icon} {capacity}%", // Icon: bolt
+         // Not connected to AC
+         "format-discharging": "{capacity}% {icon}",
+         "format-icons": [
+-            "", // Icon: battery-full
+-            "", // Icon: battery-three-quarters
+-            "", // Icon: battery-half
+-            "", // Icon: battery-quarter
+-            ""  // Icon: battery-empty
+            "\uF244", // Icon: battery-full
+            "\uF243", // Icon: battery-three-quarters
+            "\uF242", // Icon: battery-half
+            "\uF241", // Icon: battery-quarter
+            "\uF240"  // Icon: battery-empty
+         ],
+         "min-length": 5,
+         "tooltip": true
+@@ -94,13 +94,13 @@
+ 
+     "clock#date": {
+       "interval": 10,
+-      "format": "  {:%e %b %Y}", // Icon: calendar-alt
+      "format": "\uF073  {:%e %b %Y}", // Icon: calendar-alt
+       "tooltip-format": "{:%e %B %Y}"
+     },
+ 
+     "cpu": {
+         "interval": 5,
+-        "format": "  {usage}%", // Icon: microchip
+        "format": "\uF2DB  {usage}%", // Icon: microchip
+         "states": {
+           "warning": 70,
+           "critical": 90
+@@ -109,7 +109,7 @@
+ 
+     "memory": {
+         "interval": 5,
+-        "format": "  {}%", // Icon: memory
+        "format": "\uF538  {}%", // Icon: memory
+         "states": {
+             "warning": 70,
+             "critical": 90
+@@ -131,259 +131,221 @@
+       "interval": 5,
+       "format": "{icon}  {temperatureC}°C",
+       "format-icons": [
+-          "", // Icon: temperature-empty
+-          "", // Icon: temperature-quarter
+-          "", // Icon: temperature-half
+-          "", // Icon: temperature-three-quarters
+-          ""  // Icon: temperature-full
+          "\uF2CB", // Icon: temperature-empty
+          "\uF2CA", // Icon: temperature-quarter
+          "\uF2C9", // Icon: temperature-half
+          "\uF2C8", // Icon: temperature-three-quarters
+          "\uF2C8"  // Icon: temperature-full
+       ],
+       "tooltip": true,
+-      "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
+      "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input"
+     },
+ 
+     "custom/kill": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF00D",
+       "on-click": "swaymsg kill",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "custom/winleft": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF104",
+       "on-click": "swaymsg move left",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/winright": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF105",
+       "on-click": "swaymsg move right",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/winup": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF106",
+       "on-click": "swaymsg move up",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/windown": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF107",
+       "on-click": "swaymsg move down",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/splitv": {
+       "format": "/|",
+-      "interval": "once",
+       "on-click": "swaymsg splitv",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/splith": {
+       "format": "/-",
+-      "interval": "once",
+       "on-click": "swaymsg splith",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/mvws_prev": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF100",
+       "on-click": "sway_workspace move prev",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/gows_prev": {
+-      "format": "<",
+-      "interval": "once",
+      "format": "\u2190",
+       "on-click": "sway_workspace goto prev",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/gows_next": {
+-      "format": ">",
+-      "interval": "once",
+      "format": "\u2192",
+       "on-click": "sway_workspace goto next",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/mvws_next": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF101",
+       "on-click": "sway_workspace move next",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/okb": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF11C",
+       "on-click": "toggle_onscreen_keyboard.py",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "custom/smenu": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF277",
+       "on-click": "toggle_menu.sh",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "custom/ws1": {
+       "format": "1",
+-      "interval": "once",
+       "on-click": "swaymsg workspace number 1",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/ws2": {
+       "format": "2",
+-      "interval": "once",
+       "on-click": "swaymsg workspace number 2",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/ws3": {
+       "format": "3",
+-      "interval": "once",
+       "on-click": "swaymsg workspace number 3",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/ws4": {
+       "format": "4",
+-      "interval": "once",
+       "on-click": "swaymsg workspace number 4",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/ws5": {
+       "format": "5",
+-      "interval": "once",
+       "on-click": "swaymsg workspace number 5",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "custom/blc_down": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF063\uF186",
+       "on-click": "brightnessctl --device=backlight_cool set 10%-",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/blc_up": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF186\uF062",
+       "on-click": "brightnessctl --device=backlight_cool set 10%+",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/blw_down": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF063\uF185",
+       "on-click": "brightnessctl --device=backlight_warm set 10%-",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/blw_up": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF185\uF062",
+       "on-click": "brightnessctl --device=backlight_warm set 10%+",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "idle_inhibitor": {
+       "format": "{icon}",
+       "format-icons": {
+-        "activated": "",
+-        "deactivated": ""
+        "activated": "\uF06E",
+        "deactivated": "\uF070"
+       },
+-      "min-length": 5,
+      "min-length": 5
+     },
+     "custom/ebc_dump_buffers": {
+-      "format": "🐃",
+-      "interval": "once",
+      "format": "\u2707",
+       "on-click": "rockchip_ebc_dump_buffers.py",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/ebc_cycle_driver_mode": {
+-      "format": "🚲",
+-      "interval": "once",
+      "format": "\u2727",
+      "format-alt": "\u2726",
+       "on-click": "python -c 'import rockchip_ebc_custom_ioctl as reci; reci.cycle_driver_mode()'",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/ebc_refresh": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uf2f1",
+       "on-click": "dbus-send --type=method_call --dest=org.pinenote.ebc_custom / org.pinenote.ebc_custom.GlobalRefresh",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/rotate_0": {
+-      "format": "R0",
+-      "interval": "once",
+      "format": "\u25AC",
+       "on-click": "sway_rotate.sh rotnormal",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "custom/rotate_90": {
+-      "format": "R90",
+-      "interval": "once",
+      "format": "\u25AE",
+       "on-click": "sway_rotate.sh rotright",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "custom/rotate_180": {
+       "format": "R180",
+-      "interval": "once",
+       "on-click": "sway_rotate.sh rotinvert",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "custom/rotate_270": {
+       "format": "R270",
+-      "interval": "once",
+       "on-click": "sway_rotate.sh rotleft",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "custom/key_pageup": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF102",
+       // "on-click": "wtype -P page_up",
+       "on-click": "swaymsg resize grow width 10px; swaymsg resize grow height 10px",
+       "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+     "custom/key_pagedown": {
+-      "format": "",
+-      "interval": "once",
+      "format": "\uF103",
+       // "on-click": "wtype -P page_down",
+       "on-click": "swaymsg resize shrink width 10px; swaymsg resize shrink height 10px",
+       "min-length": 5,
+-      "tooltip": false,
+-    },
+-
+-    "custom/battery_watts": {
+-      "exec": "battery_watts.sh",
+-      "format": " {}W",
+-      "interval": 10,
+-      "min-length": 5,
+-      "tooltip": false,
+      "tooltip": false
+     },
+ 
+     "tray": {
@@ -1,255 +0,0 @@
-diff --git a/etc/sway_hrdl/waybar/config.orig b/etc/sway_hrdl/waybar/config
-index f31a30eb25..55c8e0214c 100644
--- a/etc/sway_hrdl/waybar/config.orig
-+++ b/etc/sway_hrdl/waybar/config
-@@ -46,7 +46,7 @@
-         "idle_inhibitor",
-         "battery",
-         "tray",
-        // "clock#time",
-+        "clock#time",
-         "custom/kill",
-     ],
- 
-@@ -143,7 +143,6 @@
- 
-     "custom/kill": {
-       "format": "",
-      "interval": "once",
-       "on-click": "swaymsg kill",
-       "min-length": 5,
-       "tooltip": false,
-@@ -151,77 +150,66 @@
- 
-     "custom/winleft": {
-       "format": "",
-      "interval": "once",
-       "on-click": "swaymsg move left",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/winright": {
-       "format": "",
-      "interval": "once",
-       "on-click": "swaymsg move right",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/winup": {
-       "format": "",
-      "interval": "once",
-       "on-click": "swaymsg move up",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/windown": {
-       "format": "",
-      "interval": "once",
-       "on-click": "swaymsg move down",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/splitv": {
-       "format": "/|",
-      "interval": "once",
-       "on-click": "swaymsg splitv",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/splith": {
-       "format": "/-",
-      "interval": "once",
-       "on-click": "swaymsg splith",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/mvws_prev": {
-       "format": "",
-      "interval": "once",
-       "on-click": "sway_workspace move prev",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/gows_prev": {
-       "format": "<",
-      "interval": "once",
-       "on-click": "sway_workspace goto prev",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/gows_next": {
-       "format": ">",
-      "interval": "once",
-       "on-click": "sway_workspace goto next",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/mvws_next": {
-       "format": "",
-      "interval": "once",
-       "on-click": "sway_workspace move next",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/okb": {
-       "format": "",
-      "interval": "once",
-       "on-click": "toggle_onscreen_keyboard.py",
-       "min-length": 5,
-       "tooltip": false,
-@@ -229,7 +217,6 @@
- 
-     "custom/smenu": {
-       "format": "",
-      "interval": "once",
-       "on-click": "toggle_menu.sh",
-       "min-length": 5,
-       "tooltip": false,
-@@ -237,35 +224,30 @@
- 
-     "custom/ws1": {
-       "format": "1",
-      "interval": "once",
-       "on-click": "swaymsg workspace number 1",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/ws2": {
-       "format": "2",
-      "interval": "once",
-       "on-click": "swaymsg workspace number 2",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/ws3": {
-       "format": "3",
-      "interval": "once",
-       "on-click": "swaymsg workspace number 3",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/ws4": {
-       "format": "4",
-      "interval": "once",
-       "on-click": "swaymsg workspace number 4",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/ws5": {
-       "format": "5",
-      "interval": "once",
-       "on-click": "swaymsg workspace number 5",
-       "min-length": 5,
-       "tooltip": false,
-@@ -273,28 +255,24 @@
- 
-     "custom/blc_down": {
-       "format": "",
-      "interval": "once",
-       "on-click": "brightnessctl --device=backlight_cool set 10%-",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/blc_up": {
-       "format": "",
-      "interval": "once",
-       "on-click": "brightnessctl --device=backlight_cool set 10%+",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/blw_down": {
-       "format": "",
-      "interval": "once",
-       "on-click": "brightnessctl --device=backlight_warm set 10%-",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/blw_up": {
-       "format": "",
-      "interval": "once",
-       "on-click": "brightnessctl --device=backlight_warm set 10%+",
-       "min-length": 5,
-       "tooltip": false,
-@@ -310,28 +288,24 @@
-     },
-     "custom/ebc_dump_buffers": {
-       "format": "🐃",
-      "interval": "once",
-       "on-click": "rockchip_ebc_dump_buffers.py",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/ebc_cycle_driver_mode": {
-       "format": "🚲",
-      "interval": "once",
-       "on-click": "python -c 'import rockchip_ebc_custom_ioctl as reci; reci.cycle_driver_mode()'",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/ebc_refresh": {
-       "format": "",
-      "interval": "once",
-       "on-click": "dbus-send --type=method_call --dest=org.pinenote.ebc_custom / org.pinenote.ebc_custom.GlobalRefresh",
-       "min-length": 5,
-       "tooltip": false,
-     },
-     "custom/rotate_0": {
-       "format": "R0",
-      "interval": "once",
-       "on-click": "sway_rotate.sh rotnormal",
-       "min-length": 5,
-       "tooltip": false,
-@@ -339,7 +313,6 @@
- 
-     "custom/rotate_90": {
-       "format": "R90",
-      "interval": "once",
-       "on-click": "sway_rotate.sh rotright",
-       "min-length": 5,
-       "tooltip": false,
-@@ -347,7 +320,6 @@
- 
-     "custom/rotate_180": {
-       "format": "R180",
-      "interval": "once",
-       "on-click": "sway_rotate.sh rotinvert",
-       "min-length": 5,
-       "tooltip": false,
-@@ -355,7 +327,6 @@
- 
-     "custom/rotate_270": {
-       "format": "R270",
-      "interval": "once",
-       "on-click": "sway_rotate.sh rotleft",
-       "min-length": 5,
-       "tooltip": false,
-@@ -363,7 +334,6 @@
- 
-     "custom/key_pageup": {
-       "format": "",
-      "interval": "once",
-       // "on-click": "wtype -P page_up",
-       "on-click": "swaymsg resize grow width 10px; swaymsg resize grow height 10px",
-       "min-length": 5,
-@@ -371,21 +341,12 @@
-     },
-     "custom/key_pagedown": {
-       "format": "",
-      "interval": "once",
-       // "on-click": "wtype -P page_down",
-       "on-click": "swaymsg resize shrink width 10px; swaymsg resize shrink height 10px",
-       "min-length": 5,
-       "tooltip": false,
-     },
- 
-    "custom/battery_watts": {
-      "exec": "battery_watts.sh",
-      "format": " {}W",
-      "interval": 10,
-      "min-length": 5,
-      "tooltip": false,
-    },
-
-     "tray": {
-         "icon-size": 21,
-         "spacing": 10
@@ -0,0 +1,3 @@
+[Service]
+ExecStartPre=+modprobe -r rockchip_ebc
+ExecStartPre=+modprobe rockchip_ebc
@@ -1,50 +0,0 @@
-[Unit]
-Description=Tiny wayland / x11 session starter for single user machines
-
-# replaces the getty
-Conflicts=getty@tty1.service
-After=getty@tty1.service dbus.socket
-
-# Needs all the dependencies of the services it's replacing
-# (currently getty@tty1.service):
-After=rc-local.service plymouth-quit-wait.service systemd-user-sessions.service
-
-# This scope is created by pam_systemd when logging in as the user.
-# This directive is a workaround to a systemd bug, where the setup of the
-# user session by PAM has some race condition, possibly leading to a failure.
-# See README for more details.
-After=session-c1.scope
-
-OnFailure=getty@tty1.service
-
-# Prevent starting on systems without virtual consoles
-ConditionPathExists=/dev/tty0
-
-[Service]
-ExecStartPre=+modprobe -r rockchip_ebc
-ExecStartPre=+modprobe rockchip_ebc
-ExecStart=tinydm-run-session
-User=10000
-Group=10000
-PAMName=login
-WorkingDirectory=~
-Restart=always
-RestartSec=1s
-
-# A virtual terminal is needed.
-TTYPath=/dev/tty1
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-
-# Fail to start if not controlling the tty.
-StandardInput=tty-fail
-StandardOutput=journal
-StandardError=journal
-
-# Log this user with utmp, letting it show up with commands 'w' and 'who'.
-UtmpIdentifier=tty1
-UtmpMode=user
-
-[Install]
-Alias=display-manager.service
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-postmarketos-trailblazer
 pkgdesc="postmarketOS Trailblazer generic ARM64"
-pkgver=16
+pkgver=17
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -88,5 +88,5 @@ kernel_postmarketos_amlogic() {

 sha512sums="
 04f251f4b160f95da2a61ae71ef56a44c2ce751114a488e0acc04fa455b075ff64455b73cf1dedcf4a18c6ff4fe21a6911c7321ee259162d86be39a19208cd38  deviceinfo
-866683bddc285e01f1cf77ec9e695fa9f0722e70d63c5c640666a788a6adb22b16dbf538b1d3f56799487e9088530e5293336538eeb538a3699bd3d97ba683bb  modules-initfs
+e26948d1f5005b16fefcaa51985010a5e55adef9ba3ed9d1f3d046c4b8928afbdd317123d0ca2fb0904e5431536c0d995144f66ad9025c7937ff0aae0537dfef  modules-initfs
 "
@@ -48,6 +48,8 @@ phy-qcom-qusb2
 phy-snps-eusb2
 phy_sun6i_mipi_dphy
 pinctrl-sm6115
+pinctrl_sm8550
+rtc_pm8xxx
 pmic-glink
 pmic-glink-altmode
 ps883x
@@ -0,0 +1,34 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Ben Grisdale <bengris32@protonmail.ch>
+pkgname=device-sony-redwood
+pkgdesc="Sony Xperia XA1 Ultra"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-postmarketos-mediatek-mt6757
+	soc-mediatek-mt6757
+	mkbootimg
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+2ef7ed5dbe9c77f03474094f578945036fe3bdc4133f9f43c2b67fe040f6d9e8515e1ff665463ddee5fdeb60867b92e85183d57a49010a42b8f3654381eb310f  deviceinfo
+297c3089263b24c84ee626302bd95480219bc63c07d57af8bac3bf4c61d83fade1c9ee410262197b88859aa087ffe660a905f93220388e675c84929906bb790d  modules-initfs
+"
@@ -0,0 +1,32 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Sony Xperia XA1 Ultra"
+deviceinfo_manufacturer="Sony"
+deviceinfo_codename="sony-redwood"
+deviceinfo_year="2017"
+deviceinfo_append_dtb="true"
+deviceinfo_dtb="mediatek/mt6757-sony-xperia-xa1-ultra"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_drm="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="1920"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 maxcpus=8 clk_ignore_unused regulator_ignore_unused"
+deviceinfo_generate_bootimg="true"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_flash_offset_base="0x40078000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x04f88000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x03f88000"
+deviceinfo_flash_sparse="true"
@@ -0,0 +1,8 @@
+typec
+extcon-usbc-tusb320
+bq25890_charger
+rt4801-regulator
+pwm-mtk-disp
+panel-td4322-innolux-fhd
+rmi_core
+rmi_i2c
@@ -0,0 +1,31 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Abdullah AL Shohag <HackerShohag@outlook.com>
+pkgname=device-xiaomi-lancelot
+pkgdesc="Xiaomi Redmi 9"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-postmarketos-mediatek-mt6768
+	mkbootimg
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+5359e660135fcb46e3e8a2286efe26cae164daa8e9a2ad20479f694d872c1d4520a04cb524f98c7d0824fed2d3d43badc319554b5637965dd5452804570cb9e5  deviceinfo
+"
@@ -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="Xiaomi Redmi 9"
+deviceinfo_manufacturer="Xiaomi"
+deviceinfo_codename="xiaomi-lancelot"
+deviceinfo_year="2020"
+deviceinfo_dtb="mediatek/mt6769t-xiaomi-lancelot-tianma-ti"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_external_storage="true"
+
+# Custom (got from the docs)
+deviceinfo_drm="true"
+deviceinfo_flash_fastboot_partition_dtbo="dtbo"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 buildvariant=user"
+deviceinfo_generate_bootimg="true"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_header_version="2"
+deviceinfo_append_dtb="false"
+deviceinfo_flash_offset_dtb="0x0bc08000"
+deviceinfo_flash_offset_base="0x40078000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x07c08000"
+deviceinfo_flash_offset_second="0xbff88000"
+deviceinfo_flash_offset_tags="0x0bc08000"
@@ -1,6 +1,6 @@
 pkgname=firmware-acer-t01
 pkgver=1
-pkgrel=0
+pkgrel=1
 _name="Acer Liquid Z330"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -9,6 +9,7 @@ arch="armv7"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/ebRCebX7"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,6 +1,6 @@
 pkgname=firmware-ark-peach
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware for ARK Benefit A3"
 url="https://postmarketos.org"
 subpackages="$pkgname-wcnss-nv:wcnss_nv"
@@ -8,6 +8,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/F2zDaaqf"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,6 +1,6 @@
 pkgname=firmware-bq-picmt
 pkgver=4
-pkgrel=0
+pkgrel=1
 _commit="04cced17ab21d84ea6145e58f0b12fd67ef640d0"
 pkgdesc="Firmware for BQ Aquaris X5"
 url="https://github.com/JonnyMe/picmt-firmware"
@@ -10,6 +10,7 @@ license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 makedepends="pil-squasher"
 source="https://github.com/JonnyMe/picmt-firmware/raw/$_commit/picmt_firmware_files.tar.xz"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,5 +1,5 @@
 # Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Joel Selvaraj <foss@joelselvaraj.com>
 # Co-Maintainer: Casey Connolly <kcxt@postmarketos.org>

 pkgname=firmware-google-blueline-dtbo
@@ -1,5 +1,5 @@
 # Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Joel Selvaraj <foss@joelselvaraj.com>
 # Co-Maintainer: Casey Connolly <kcxt@postmarketos.org>

 pkgname=firmware-google-blueline
@@ -1,6 +1,6 @@
 pkgname=firmware-huawei-g7
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware for Huawei Ascend G7"
 url="https://postmarketos.org"
 subpackages="$pkgname-wcnss-nv:wcnss_nv"
@@ -8,6 +8,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/UmTSZBW7"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,6 +1,6 @@
 pkgname=firmware-huawei-y635
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware for Huawei Y635"
 url="https://postmarketos.org"
 subpackages="$pkgname-wcnss-nv:wcnss_nv"
@@ -8,6 +8,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/yYNgH3PW"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -3,7 +3,7 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-samsung-a3
 pkgver=1
-pkgrel=2
+pkgrel=3
 _name="Samsung Galaxy A3 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -12,6 +12,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/X3t8q7ue"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -2,7 +2,7 @@
 # Co-Maintainer: Alexey Minnekhanov <alexeymin@postmarketos.org>
 pkgname=firmware-samsung-a5
 pkgver=1
-pkgrel=2
+pkgrel=3
 _name="Samsung Galaxy A5 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -11,6 +11,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/br6nKv4W"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,6 +1,6 @@
 pkgname=firmware-samsung-a7
 pkgver=1
-pkgrel=1
+pkgrel=2
 _name="Samsung Galaxy A7 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -9,6 +9,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/qqXtjvd0"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,7 +1,7 @@
 # Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
 pkgname=firmware-samsung-e7
 pkgver=1
-pkgrel=3
+pkgrel=4
 _name="Samsung Galaxy E7"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -10,6 +10,7 @@ arch="armv7"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/qF2Y0k5R"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,13 +1,14 @@
 # Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
 pkgname=firmware-samsung-fortuna
 pkgver=2
-pkgrel=3
+pkgrel=4
 _name="Samsung Galaxy Grand Prime"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
+builddir="$srcdir"

 _subpkgname="${pkgname%-fortuna}"
 _variants="
@@ -1,7 +1,7 @@
 # Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
 pkgname=firmware-samsung-grandmax
 pkgver=1
-pkgrel=2
+pkgrel=3
 _name="Samsung Galaxy Grand Max"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -10,6 +10,7 @@ arch="armv7"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/7Kp9JMgq"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,7 +1,7 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=firmware-samsung-gt510
 pkgver=1
-pkgrel=2
+pkgrel=3
 _name="Samsung Galaxy Tab A 9.7 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -10,6 +10,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/vi1vz9ES"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,7 +1,7 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=firmware-samsung-gt58
 pkgver=1
-pkgrel=2
+pkgrel=3
 _name="Samsung Galaxy Tab A 8.0 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -10,6 +10,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/L95C6H61"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,6 +1,6 @@
 pkgname=firmware-samsung-gtelwifiue
 pkgver=1
-pkgrel=1
+pkgrel=2
 _name="Samsung Galaxy Tab E 9.7 (SM-T560NU)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -9,6 +9,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/KMyWjAHb"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -2,7 +2,7 @@
 # Co-Maintainer: Lin, Meng-Bo <linmengbo06890@proton.me>
 pkgname=firmware-samsung-j3ltetw
 pkgver=1
-pkgrel=3
+pkgrel=4
 _name="Samsung Galaxy J3 2016 (SM-J320YZ)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -11,6 +11,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/fRk3jmJE"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,7 +1,7 @@
 # Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
 pkgname=firmware-samsung-j5x
 pkgver=1
-pkgrel=2
+pkgrel=3
 _name="Samsung Galaxy J5 (2016)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -10,6 +10,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/pL9nwXmg"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,6 +1,6 @@
 pkgname=firmware-samsung-on7
 pkgver=1
-pkgrel=1
+pkgrel=2
 _name="Samsung Galaxy On7 (2015)"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -9,6 +9,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/4c9b2b94"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,7 +1,7 @@
 # Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
 pkgname=firmware-samsung-rossa
 pkgver=2
-pkgrel=1
+pkgrel=2
 _name="Samsung Galaxy Core Prime LTE"
 pkgdesc="Firmware for $_name"
 url="https://postmarketos.org"
@@ -10,6 +10,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/2vBcF82L"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -2,7 +2,7 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-wileyfox-crackling
 pkgver=5
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware for Wileyfox Swift"
 url="https://rizzotherat.gitlab.io/firmware/"
 subpackages="$pkgname-venus $pkgname-wcnss-nv:wcnss_nv"
@@ -11,6 +11,7 @@ license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 makedepends="pil-squasher"
 source="https://rizzotherat.gitlab.io/firmware/crackling.tar.xz"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -1,7 +1,7 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-xiaomi-wt88047
 pkgver=9.2.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Firmware for Xiaomi Redmi 2"
 url="https://androidfilehost.com/?w=files&flid=303434"
 subpackages="$pkgname-wcnss-nv:wcnss_nv"
@@ -9,6 +9,7 @@ arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 source="wt88047-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/bntm8Z7m"
+builddir="$srcdir"

 _fwdir="/lib/firmware/postmarketos"

@@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm64/configs/defconfig

 pkgname=linux-next
-pkgver=6.18_git20251205
+pkgver=6.19_git20251215
 pkgrel=0
 _nextver="${pkgver#*_git}"
 pkgdesc="Linux next kernel"
@@ -91,7 +91,7 @@ package() {
 }

 sha512sums="
-695ceadf8c83bf7c9fa03d0425814a951ee6c40f335a7425f737006263f45dcd257bc22a85dba3e36255a846c07a9e3c766c2b6dbb37d5c1d0da8e30172c6f04  linux-next-next-20251205.tar.gz
-95155055a8234cc50c0b221d5fcfe8141ee957155fe77ae172d6cfd36863a831561bf38cfb8183472e5f2707ee1c1fa2a28ab21ed985c2be58483633266c1d4f  devices.config
+ba5629cb92a2c3e17fef5354b9393ed421db23153e9c3bc7b9651d9e75683e33f7c3e5ec368dc26284f29f9b011a0ed8c314b6941f0e229abf2e4c83eb38b42c  linux-next-next-20251215.tar.gz
+9b97849df749c6051503b4f4522db72bc6d5ec718a65a24f99132138a9262b6a473a33bc02e5f09fdb721066d3f6e6a0577de363cdd8a0e38ee99c9e3b08d01d  devices.config
 ea219f10f6509193d1940f34a92627bf7d6d6b21c2c43f4cbd2c733bdf3e5bcb6b9b39d5bcc3f597f207c6e729a4ca118529fe0cf4d2805e16059de225e3c354  pmos.config
 "
@@ -74,3 +74,4 @@ CONFIG_NFC_PN544_I2C=m
 CONFIG_YAMAHA_YAS530=y
 CONFIG_BMC150_ACCEL=y
 CONFIG_BMC150_ACCEL_I2C=y
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
@@ -2,9 +2,9 @@
 # Kernel config based on: arch/arm64/configs/pinenote_defconfig
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=linux-pine64-pinenote
-pkgver=6.17.9
+pkgver=6.18.1
 _kernver=${pkgver%.*}
-pkgrel=2
+pkgrel=0
 pkgdesc="Pine64 PineNote close to mainline fork"
 arch="aarch64"
 _carch="arm64"
@@ -29,14 +29,17 @@ makedepends="

 # Source
 _config="config-$_flavor.$arch"
-_commit="6f680296674101ffb7db7bd81c8cbd9f6a73fff1"
+_commit="fe4f8068cda0b9f159803cee85254b69da099057"
 source="
 	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
-	$pkgname-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz
 	$pkgname-$_kernver-$_commit.patch::https://ayakael.net/forge/linux-pinenote/compare/$_commit..v$_kernver.patch
 	pmos-kconfig-default.patch
 	$_config
 "
+# get patch releases
+if [ "${pkgver/*.}" -ne 0 ]; then
+	source="$source $pkgname-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz"
+fi
 builddir="$srcdir"/linux-$_kernver

 prepare() {
@@ -77,9 +80,9 @@ package() {
 }

 sha512sums="
-063999d7b819970657f6b7713fdb4173da2065ffdeed7cae197026dbb1edfd7f1d50374f073a1e19ef9686539594824ff6ecb8a930d97c4f272cb12f1c6d8355  linux-6.17.tar.xz
-35593bc973cc7f626aa7a41cf8b7dea1b46fe8922bd57194db363d26e8854af514d103e39d02c642c26748bd933d5e402ff89d2a20d2da5f8d901e4713eafc46  linux-pine64-pinenote-6.17.9.patch.xz
-e08bb4daa33fecf27a011fcf3389ef43162e3484d2e92450717049e5f6e88ed4d86f0126ef12a445603c42f3a009128a133806e1c7ce451f320aed9b5129786b  linux-pine64-pinenote-6.17-6f680296674101ffb7db7bd81c8cbd9f6a73fff1.patch
-bc5a8a90592df3a997246c660a27c87e6ad1da61d779f8c5787457747c80623a9fae2df5c6a0ebdc15239e5266d5855cdb34bcf6df0221b30d66d36ae8d994d7  pmos-kconfig-default.patch
-ec1bcfbb07b5fa1722bce9b37cdeddfb100c07c0455bb607b7484ef5b58fda7bf13cfac0b0d759c40643e6dd1a35131be9d8faba612153809d24e21d775939fb  config-pine64-pinenote.aarch64
+88599ffdec96d150c1feb9b261ba93bb0301a9d0e1ad6bef7aeab1f5372cbfc57d8b43c7e902bd8f76921d1dbd8189663c142ea869e51d0e2b483b150ee00fe0  linux-6.18.tar.xz
+f8443f7ff4262bb9361c9c29ef10b247367a80e7aebbae1efdf3aad545f95c0afc1e1c98f0b4d1e008086809c4ba2264b042178258dc4e1b5692714599e0cd26  linux-pine64-pinenote-6.18-fe4f8068cda0b9f159803cee85254b69da099057.patch
+cbacd525c1b9144064be7b325384684258bd611181c12ef5142e80df08d1ec32b24037c711a8493e6f55ca19cf2af4b24883ca51cee4deee576168396035b1c8  pmos-kconfig-default.patch
+ec0c36542714a844223e916439133537a6eda65b626cea222362b432a0fa6f7aeb6441266e9722cc891afd1cdae72a7661e001054a1577011593f4bac19ed76f  config-pine64-pinenote.aarch64
+09ed1dc6b66ee15921167de612a9e5178d37dfc874731b2893a833acaaddaf929e900ba9366d3aecfd678b67a28d3889f897735c6305c2b4af87a101a84ea775  linux-pine64-pinenote-6.18.1.patch.xz
 "
@@ -1,26 +1,32 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.17.9 Kernel Configuration
+# Linux/arm64 6.18.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.2"
+CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.7"
 CONFIG_GCC_VERSION=0
 CONFIG_CC_IS_CLANG=y
-CONFIG_CLANG_VERSION=210102
+CONFIG_CLANG_VERSION=210107
 CONFIG_AS_IS_LLVM=y
-CONFIG_AS_VERSION=210102
+CONFIG_AS_VERSION=210107
 CONFIG_LD_VERSION=0
 CONFIG_LD_IS_LLD=y
-CONFIG_LLD_VERSION=210102
-CONFIG_RUSTC_VERSION=0
-CONFIG_RUSTC_LLVM_VERSION=0
+CONFIG_LLD_VERSION=210107
+CONFIG_RUSTC_VERSION=109101
+CONFIG_RUSTC_LLVM_VERSION=210102
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_ASSUME=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_CC_HAS_COUNTED_BY=y
 CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING=y
 CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
+CONFIG_RUSTC_HAS_COERCE_POINTEE=y
+CONFIG_RUSTC_HAS_SPAN_FILE=y
+CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
+CONFIG_RUSTC_HAS_FILE_WITH_NUL=y
+CONFIG_RUSTC_HAS_FILE_AS_C_STR=y
 CONFIG_PAHOLE_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -119,6 +125,7 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_LAZY is not set
 # CONFIG_PREEMPT_RT is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
+# CONFIG_SCHED_CORE is not set

 #
 # CPU/Task time and stats accounting
@@ -296,6 +303,7 @@ CONFIG_CRASH_DUMP=y
 # end of General setup

 CONFIG_ARM64=y
+CONFIG_RUSTC_SUPPORTS_ARM64=y
 CONFIG_CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
@@ -336,13 +344,20 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 # CONFIG_ARCH_BLAIZE is not set
 # CONFIG_ARCH_CIX is not set
 # CONFIG_ARCH_EXYNOS is not set
-# CONFIG_ARCH_SPARX5 is not set
 # CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_HISI is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MESON is not set
+
+#
+# Microchip SoC support
+#
+# CONFIG_ARCH_LAN969X is not set
+# CONFIG_ARCH_SPARX5 is not set
+# end of Microchip SoC support
+
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_NXP is not set
@@ -437,11 +452,7 @@ CONFIG_ARM64_VA_BITS=52
 CONFIG_ARM64_PA_BITS_52=y
 CONFIG_ARM64_PA_BITS=52
 CONFIG_ARM64_LPA2=y
-# CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SCHED_MC=y
-# CONFIG_SCHED_CLUSTER is not set
-# CONFIG_SCHED_SMT is not set
 CONFIG_NR_CPUS=4
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_NUMA is not set
@@ -471,7 +482,6 @@ CONFIG_TRANS_TABLE=y
 CONFIG_ARCH_FORCE_MAX_ORDER=10
 # CONFIG_UNMAP_KERNEL_AT_EL0 is not set
 CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
-CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 # CONFIG_ARM64_TAGGED_ADDR_ABI is not set
 CONFIG_COMPAT=y
@@ -542,10 +552,10 @@ CONFIG_ARCH_PKEY_BITS=3
 # end of ARMv8.9 architectural features

 #
-# v9.4 architectural features
+# ARMv9.4 architectural features
 #
 CONFIG_ARM64_GCS=y
-# end of v9.4 architectural features
+# end of ARMv9.4 architectural features

 # CONFIG_ARM64_SVE is not set
 # CONFIG_ARM64_PSEUDO_NMI is not set
@@ -658,8 +668,15 @@ CONFIG_CPU_MITIGATIONS=y
 # General architecture-dependent options
 #
 CONFIG_HOTPLUG_SMT=y
+CONFIG_ARCH_SUPPORTS_SCHED_SMT=y
+CONFIG_ARCH_SUPPORTS_SCHED_CLUSTER=y
+CONFIG_ARCH_SUPPORTS_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_CLUSTER=y
+CONFIG_SCHED_MC=y
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
+CONFIG_GENERIC_IRQ_ENTRY=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
@@ -684,6 +701,7 @@ CONFIG_ARCH_WANTS_NO_INSTR=y
 CONFIG_HAVE_ASM_MODVERSIONS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_RUST=y
 CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
@@ -717,10 +735,11 @@ CONFIG_HAS_LTO_CLANG=y
 # CONFIG_LTO_NONE is not set
 # CONFIG_LTO_CLANG_FULL is not set
 CONFIG_LTO_CLANG_THIN=y
-CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
-CONFIG_CFI_CLANG=y
+CONFIG_ARCH_SUPPORTS_CFI=y
+CONFIG_CFI=y
 CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y
-CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS_CLANG=y
+CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS=y
+CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS_RUSTC=y
 # CONFIG_CFI_PERMISSIVE is not set
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -938,8 +957,17 @@ CONFIG_BINFMT_MISC=m
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
 CONFIG_ZSMALLOC=y
+
+#
+# Zsmalloc allocator options
+#
+
+#
+# Zsmalloc is a common backend allocator for zswap & zram
+#
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
+# end of Zsmalloc allocator options

 #
 # Slab allocator options
@@ -988,6 +1016,7 @@ CONFIG_ARCH_WANTS_THP_SWAP=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_PAGE_MAPCOUNT=y
 CONFIG_PGTABLE_HAS_HUGE_LEAVES=y
+CONFIG_HAVE_GIGANTIC_FOLIOS=y
 CONFIG_CMA=y
 CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_SYSFS=y
@@ -1042,6 +1071,7 @@ CONFIG_NET_CRC32C=y
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_DIAG is not set
+# CONFIG_INET_PSP is not set
 CONFIG_UNIX=y
 CONFIG_AF_UNIX_OOB=y
 # CONFIG_UNIX_DIAG is not set
@@ -1058,6 +1088,7 @@ CONFIG_XFRM_ESP=m
 CONFIG_XFRM_IPCOMP=m
 # CONFIG_NET_KEY is not set
 # CONFIG_XFRM_IPTFS is not set
+# CONFIG_DIBS is not set
 # CONFIG_XDP_SOCKETS is not set
 CONFIG_NET_HANDSHAKE=y
 CONFIG_INET=y
@@ -1630,6 +1661,7 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCI_DOE is not set
+CONFIG_PCI_ECAM=y
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_NPEM is not set
 # CONFIG_PCI_PRI is not set
@@ -1649,6 +1681,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 #
 # PCI controller drivers
 #
+CONFIG_PCI_HOST_COMMON=y
 # CONFIG_PCIE_ALTERA is not set
 # CONFIG_PCI_HOST_THUNDER_PEM is not set
 # CONFIG_PCI_HOST_THUNDER_ECAM is not set
@@ -1940,7 +1973,7 @@ CONFIG_SRAM=y
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_HISI_HIKEY_USB is not set
 # CONFIG_OPEN_DICE is not set
-# CONFIG_NTSYNC is not set
+CONFIG_NTSYNC=m
 # CONFIG_VCPU_STALL_DETECTOR is not set
 # CONFIG_MCHP_LAN966X_PCI is not set
 # CONFIG_C2PORT is not set
@@ -1955,6 +1988,7 @@ CONFIG_EEPROM_93CX6=y
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
 # CONFIG_EEPROM_EE1004 is not set
+# CONFIG_EEPROM_M24LR is not set
 # end of EEPROM support

 # CONFIG_CB710_CORE is not set
@@ -2109,7 +2143,6 @@ CONFIG_ATA_BMDMA=y
 # CONFIG_PATA_LEGACY is not set
 CONFIG_MD=y
 # CONFIG_BLK_DEV_MD is not set
-CONFIG_MD_BITMAP_FILE=y
 # CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
@@ -2411,10 +2444,9 @@ CONFIG_NET_VENDOR_XILINX=y
 # CONFIG_XILINX_LL_TEMAC is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_MICREL_KS8995MA is not set
-# CONFIG_PSE_CONTROLLER is not set
 # CONFIG_MDIO_BUS is not set
+# CONFIG_PHYLIB is not set
+# CONFIG_PSE_CONTROLLER is not set

 #
 # PCS device drivers
@@ -2543,7 +2575,6 @@ CONFIG_KEYBOARD_ADC=m
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
@@ -2622,8 +2653,10 @@ CONFIG_TOUCHSCREEN_CYTTSP5=m
 # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C is not set
 # CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI is not set
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
+# CONFIG_TOUCHSCREEN_HIMAX_HX852X is not set
 # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
 # CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set
+# CONFIG_TOUCHSCREEN_HYNITRON_CST816X is not set
 # CONFIG_TOUCHSCREEN_ILI210X is not set
 # CONFIG_TOUCHSCREEN_ILITEK is not set
 # CONFIG_TOUCHSCREEN_S6SY761 is not set
@@ -2673,6 +2706,7 @@ CONFIG_TOUCHSCREEN_CYTTSP5=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+# CONFIG_INPUT_AW86927 is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
 # CONFIG_INPUT_MMA8450 is not set
@@ -2983,6 +3017,7 @@ CONFIG_PTP_1588_CLOCK_KVM=y
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
 # CONFIG_PTP_1588_CLOCK_FC3W is not set
 # CONFIG_PTP_1588_CLOCK_MOCK is not set
+# CONFIG_PTP_NETC_V4_TIMER is not set
 # end of PTP clock support

 #
@@ -3483,6 +3518,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_MT6370 is not set
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
+# CONFIG_MFD_NCT6694 is not set
 # CONFIG_MFD_OCELOT is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_MFD_CPCAP is not set
@@ -3508,6 +3544,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_BQ257XX is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
@@ -3553,6 +3590,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_QNAP_MCU is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # CONFIG_MFD_RSMU_SPI is not set
+# CONFIG_MFD_MAX7360 is not set
 # end of Multifunction device drivers

 CONFIG_REGULATOR=y
@@ -3592,6 +3630,7 @@ CONFIG_REGULATOR_FAN53555=y
 # CONFIG_REGULATOR_MAX20086 is not set
 # CONFIG_REGULATOR_MAX20411 is not set
 # CONFIG_REGULATOR_MAX77826 is not set
+# CONFIG_REGULATOR_MAX77838 is not set
 # CONFIG_REGULATOR_MCP16502 is not set
 # CONFIG_REGULATOR_MP5416 is not set
 # CONFIG_REGULATOR_MP8859 is not set
@@ -3600,6 +3639,8 @@ CONFIG_REGULATOR_FAN53555=y
 # CONFIG_REGULATOR_MT6311 is not set
 # CONFIG_REGULATOR_PCA9450 is not set
 # CONFIG_REGULATOR_PF9453 is not set
+# CONFIG_REGULATOR_PF0900 is not set
+# CONFIG_REGULATOR_PF530X is not set
 # CONFIG_REGULATOR_PF8X00 is not set
 # CONFIG_REGULATOR_PFUZE100 is not set
 # CONFIG_REGULATOR_PV88060 is not set
@@ -3612,6 +3653,7 @@ CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_RK808=y
 # CONFIG_REGULATOR_RT4801 is not set
 # CONFIG_REGULATOR_RT4803 is not set
+# CONFIG_REGULATOR_RT5133 is not set
 # CONFIG_REGULATOR_RT5190A is not set
 # CONFIG_REGULATOR_RT5739 is not set
 # CONFIG_REGULATOR_RT5759 is not set
@@ -3851,6 +3893,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_GC0308 is not set
+# CONFIG_VIDEO_GC0310 is not set
 # CONFIG_VIDEO_GC05A2 is not set
 # CONFIG_VIDEO_GC08A3 is not set
 # CONFIG_VIDEO_GC2145 is not set
@@ -3880,6 +3923,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_MT9V032 is not set
 # CONFIG_VIDEO_MT9V111 is not set
 # CONFIG_VIDEO_OG01A1B is not set
+# CONFIG_VIDEO_OG0VE1B is not set
 # CONFIG_VIDEO_OV01A10 is not set
 # CONFIG_VIDEO_OV02A10 is not set
 # CONFIG_VIDEO_OV02E10 is not set
@@ -3892,6 +3936,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
 # CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV2735 is not set
 # CONFIG_VIDEO_OV4689 is not set
 # CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
@@ -3901,8 +3946,8 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_OV5675 is not set
 # CONFIG_VIDEO_OV5693 is not set
 # CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV6211 is not set
 # CONFIG_VIDEO_OV64A40 is not set
-# CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV7640 is not set
 # CONFIG_VIDEO_OV7670 is not set
@@ -4351,6 +4396,7 @@ CONFIG_ROCKCHIP_VOP=y
 CONFIG_ROCKCHIP_VOP2=y
 # CONFIG_ROCKCHIP_ANALOGIX_DP is not set
 # CONFIG_ROCKCHIP_CDN_DP is not set
+# CONFIG_ROCKCHIP_DW_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=y
 # CONFIG_ROCKCHIP_DW_HDMI_QP is not set
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
@@ -4392,6 +4438,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set
 # CONFIG_DRM_PANEL_HIMAX_HX83112B is not set
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
+# CONFIG_DRM_PANEL_HYDIS_HV101HD1 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
@@ -4455,6 +4502,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA5X01_AMS561RA01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
@@ -4514,6 +4562,7 @@ CONFIG_DRM_DISPLAY_CONNECTOR=m
 # CONFIG_DRM_SII902X is not set
 # CONFIG_DRM_SII9234 is not set
 # CONFIG_DRM_SIMPLE_BRIDGE is not set
+# CONFIG_DRM_SOLOMON_SSD2825 is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TOSHIBA_TC358762 is not set
 # CONFIG_DRM_TOSHIBA_TC358764 is not set
@@ -4526,6 +4575,7 @@ CONFIG_DRM_DISPLAY_CONNECTOR=m
 # CONFIG_DRM_TI_SN65DSI83 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
 # CONFIG_DRM_TI_TPD12S015 is not set
+# CONFIG_DRM_WAVESHARE_BRIDGE is not set
 # CONFIG_DRM_ANALOGIX_ANX6345 is not set
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # CONFIG_DRM_ANALOGIX_ANX7625 is not set
@@ -4549,6 +4599,7 @@ CONFIG_DRM_DW_MIPI_DSI=m
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
 # CONFIG_DRM_PANEL_MIPI_DBI is not set
+# CONFIG_DRM_PIXPAPER is not set
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9163 is not set
 # CONFIG_TINYDRM_ILI9225 is not set
@@ -5049,6 +5100,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_ES8328_SPI is not set
 # CONFIG_SND_SOC_ES8375 is not set
 # CONFIG_SND_SOC_ES8389 is not set
+# CONFIG_SND_SOC_FS210X is not set
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_HDA is not set
 # CONFIG_SND_SOC_ICS43432 is not set
@@ -5068,6 +5120,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM1754 is not set
 # CONFIG_SND_SOC_PCM1789_I2C is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X_SPI is not set
@@ -5201,6 +5254,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
 CONFIG_HID_GENERIC=m
+# CONFIG_HID_HAPTIC is not set

 #
 # Special HID drivers
@@ -5464,6 +5518,7 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 #
 CONFIG_USB_DWC3_HAPS=y
 CONFIG_USB_DWC3_OF_SIMPLE=y
+CONFIG_USB_DWC3_GENERIC_PLAT=y
 # CONFIG_USB_DWC2 is not set
 # CONFIG_USB_CHIPIDEA is not set
 # CONFIG_USB_ISP1760 is not set
@@ -5952,12 +6007,12 @@ CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_RTC_DRV_CADENCE is not set
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_R7301 is not set
+# CONFIG_RTC_DRV_GOLDFISH is not set

 #
 # 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

@@ -6303,6 +6358,7 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_GPIO is not set
 # CONFIG_EXTCON_LC824206XA is not set
 # CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_MAX14526 is not set
 # CONFIG_EXTCON_PTN5150 is not set
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
@@ -6415,6 +6471,7 @@ CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
 # CONFIG_AD9467 is not set
+# CONFIG_ADE9000 is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_GEHC_PMC_ADC is not set
@@ -6443,6 +6500,7 @@ CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 # CONFIG_NCT7201 is not set
 # CONFIG_PAC1921 is not set
 # CONFIG_PAC1934 is not set
+# CONFIG_ROHM_BD79112 is not set
 # CONFIG_ROHM_BD79124 is not set
 CONFIG_ROCKCHIP_SARADC=m
 # CONFIG_RICHTEK_RTQ6056 is not set
@@ -6768,6 +6826,7 @@ CONFIG_HID_SENSOR_ALS=m
 # CONFIG_VEML3235 is not set
 # CONFIG_VEML6030 is not set
 # CONFIG_VEML6040 is not set
+# CONFIG_VEML6046X00 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -6788,6 +6847,7 @@ CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 # CONFIG_MMC35240 is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_INFINEON_TLV493D is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
 # CONFIG_SENSORS_RM3100_I2C is not set
@@ -6932,6 +6992,7 @@ CONFIG_HID_SENSOR_TEMP=m
 # CONFIG_NTB is not set
 CONFIG_PWM=y
 # CONFIG_PWM_DEBUG is not set
+# CONFIG_PWM_PROVIDE_GPIO is not set
 # CONFIG_PWM_ARGON_FAN_HAT is not set
 # CONFIG_PWM_ATMEL_TCB is not set
 # CONFIG_PWM_CLK is not set
@@ -7093,7 +7154,6 @@ CONFIG_FS_STACK=y
 CONFIG_BUFFER_HEAD=y
 CONFIG_LEGACY_DIRECT_IO=y
 # CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
@@ -7105,11 +7165,17 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_JFS_FS is not set
 CONFIG_XFS_FS=m
 # CONFIG_XFS_SUPPORT_V4 is not set
-CONFIG_XFS_SUPPORT_ASCII_CI=y
+# CONFIG_XFS_SUPPORT_ASCII_CI is not set
 # CONFIG_XFS_QUOTA is not set
 CONFIG_XFS_POSIX_ACL=y
 # CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
+CONFIG_XFS_DRAIN_INTENTS=y
+CONFIG_XFS_LIVE_HOOKS=y
+CONFIG_XFS_MEMORY_BUFS=y
+CONFIG_XFS_BTREE_IN_MEM=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_XFS_ONLINE_SCRUB_STATS=y
+CONFIG_XFS_ONLINE_REPAIR=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
@@ -7120,7 +7186,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_EXPERIMENTAL is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_F2FS_FS=y
 CONFIG_F2FS_STAT_FS=y
@@ -7132,7 +7197,6 @@ CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_FS_COMPRESSION is not set
 CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
-# CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -7499,7 +7563,6 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECDSA=m
 CONFIG_CRYPTO_ECRDSA=m
-CONFIG_CRYPTO_CURVE25519=m
 # end of Public-key cryptography

 #
@@ -7721,18 +7784,16 @@ CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_LIB_AES=y
 CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_LIB_GF128MUL=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
 CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519_INTERNAL=m
+CONFIG_CRYPTO_LIB_CHACHA_ARCH=y
 CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
 CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_MD5=y
 CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_ARCH=y
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA1=y
 CONFIG_CRYPTO_LIB_SHA1_ARCH=y
@@ -7740,8 +7801,6 @@ CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_LIB_SHA256_ARCH=y
 CONFIG_CRYPTO_LIB_SHA512=y
 CONFIG_CRYPTO_LIB_SHA512_ARCH=y
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_POLY1305_NEON=m
 # end of Crypto library routines

 CONFIG_XXHASH=y
@@ -7823,10 +7882,7 @@ CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_COMPAT_VDSO=y
-CONFIG_GENERIC_VDSO_TIME_NS=y
 CONFIG_VDSO_GETRANDOM=y
-CONFIG_GENERIC_VDSO_DATA_STORE=y
 CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -7965,7 +8021,6 @@ CONFIG_HAVE_ARCH_KFENCE=y
 # Debug Oops, Lockups and Hangs
 #
 CONFIG_PANIC_ON_OOPS=y
-CONFIG_PANIC_ON_OOPS_VALUE=1
 CONFIG_PANIC_TIMEOUT=1
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
@@ -1,8 +1,8 @@
 diff --git a/arch/arm64/configs/pinenote_defconfig.orig b/arch/arm64/configs/pinenote_defconfig
-index f27b482..0443fc3 100644
+index f27b482..7dbcc93 100644
 --- a/arch/arm64/configs/pinenote_defconfig.orig
 +++ b/arch/arm64/configs/pinenote_defconfig
-@@ -1,5 +1,41 @@
+@@ -1,5 +1,43 @@
 +# pmos kconfig settings
 +CONFIG_UEVENT_HELPER=y
 +CONFIG_NULL_TTY=m
@@ -27,7 +27,9 @@ index f27b482..0443fc3 100644
 +# CONFIG_LTO_NONE is not set
 +# CONFIG_LTO_CLANG_FULL is not set
 +CONFIG_CFI_CLANG=y
+CONFIG_CFI=y
 +CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y
+CONFIG_NTSYNC=m
 +CONFIG_HAVE_CFI_ICALL_NORMALIZE_INTEGERS_CLANG=y
 +# CONFIG_CFI_PERMISSIVE is not set
 +CONFIG_SHADOW_CALL_STACK=y
@@ -45,7 +47,7 @@ index f27b482..0443fc3 100644
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_GENERIC_IRQ_DEBUGFS=y
-@@ -16,7 +52,6 @@ CONFIG_TASK_DELAY_ACCT=y
+@@ -16,7 +54,6 @@ CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_PSI=y
@@ -53,7 +55,7 @@ index f27b482..0443fc3 100644
 CONFIG_IKCONFIG=m
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
-@@ -26,7 +61,7 @@ CONFIG_MEMCG=y
+@@ -26,7 +63,7 @@ CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
@@ -62,7 +64,7 @@ index f27b482..0443fc3 100644
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
-@@ -42,6 +77,7 @@ CONFIG_NAMESPACES=y
+@@ -42,6 +79,7 @@ CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_BLK_DEV_INITRD=y
@@ -70,7 +72,7 @@ index f27b482..0443fc3 100644
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
 # CONFIG_RD_XZ is not set
-@@ -131,7 +167,7 @@ CONFIG_CHR_DEV_SG=m
+@@ -131,7 +169,7 @@ CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_SCAN_ASYNC=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_MD=y
@@ -79,7 +81,7 @@ index f27b482..0443fc3 100644
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_LDISC_AUTOLOAD is not set
-@@ -154,10 +190,10 @@ CONFIG_EXTCON=y
+@@ -154,10 +192,10 @@ CONFIG_EXTCON=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
@@ -92,7 +94,7 @@ index f27b482..0443fc3 100644
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS=y
 CONFIG_F2FS_FS_SECURITY=y
-@@ -179,7 +215,7 @@ CONFIG_TMPFS_POSIX_ACL=y
+@@ -179,7 +217,7 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_INODE64=y
 CONFIG_HUGETLBFS=y
 CONFIG_CONFIGFS_FS=y
@@ -101,7 +103,7 @@ index f27b482..0443fc3 100644
 # CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
-@@ -208,9 +244,9 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y
+@@ -208,9 +246,9 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y
 # CONFIG_STRICT_DEVMEM is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
 CONFIG_ANDROID_BINDER_IPC=y
@@ -113,7 +115,7 @@ index f27b482..0443fc3 100644
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 CONFIG_KEXEC_CORE=y
-@@ -266,17 +302,17 @@ CONFIG_CRYPTO_ECDH=m
+@@ -266,17 +304,17 @@ CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECDSA=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CURVE25519=m
@@ -135,7 +137,7 @@ index f27b482..0443fc3 100644
 CONFIG_CRYPTO_AEGIS128=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CCM=m
-@@ -287,13 +323,14 @@ CONFIG_CRYPTO_ESSIV=m
+@@ -287,13 +325,14 @@ CONFIG_CRYPTO_ESSIV=m
 CONFIG_CRYPTO_BLAKE2B=m
 CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_GHASH=m
@@ -154,7 +156,7 @@ index f27b482..0443fc3 100644
 CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_WP512=m
-@@ -317,6 +354,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
+@@ -317,6 +356,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
 # CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
@@ -162,7 +164,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: drivers/ata/Kconfig
-@@ -495,7 +533,9 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=y
+@@ -495,7 +535,9 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 ##
 ## file: drivers/firmware/efi/Kconfig
 ##
@@ -173,7 +175,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: drivers/firmware/smccc/Kconfig
-@@ -544,10 +584,135 @@ CONFIG_DRM_ROCKCHIP_EBC=m
+@@ -544,10 +586,135 @@ CONFIG_DRM_ROCKCHIP_EBC=m
 ##
 ## file: drivers/hid/Kconfig
 ##
@@ -310,7 +312,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: drivers/hid/i2c-hid/Kconfig
-@@ -586,7 +751,7 @@ CONFIG_I2C_RK3X=y
+@@ -586,7 +753,7 @@ CONFIG_I2C_RK3X=y
 ##
 ## file: drivers/iio/Kconfig
 ##
@@ -319,7 +321,7 @@ index f27b482..0443fc3 100644
 CONFIG_IIO_SW_TRIGGER=m
 
 ##
-@@ -609,7 +774,7 @@ CONFIG_IIO_SCMI=m
+@@ -609,7 +776,7 @@ CONFIG_IIO_SCMI=m
 ## file: drivers/input/Kconfig
 ##
 CONFIG_INPUT_MOUSEDEV=m
@@ -328,7 +330,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: drivers/input/keyboard/Kconfig
-@@ -617,14 +782,19 @@ CONFIG_INPUT_EVDEV=y
+@@ -617,14 +784,19 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_ADC=m
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_GPIO=y
@@ -349,7 +351,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: drivers/input/mouse/Kconfig
-@@ -654,13 +824,13 @@ CONFIG_ROCKCHIP_IOMMU=y
+@@ -654,13 +826,13 @@ CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=y
@@ -365,7 +367,7 @@ index f27b482..0443fc3 100644
 CONFIG_LEDS_TRIGGER_ONESHOT=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-@@ -672,7 +842,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y
+@@ -672,7 +844,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y
 CONFIG_LEDS_TRIGGER_CAMERA=y
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=y
@@ -374,7 +376,7 @@ index f27b482..0443fc3 100644
 CONFIG_LEDS_TRIGGER_TTY=y
 
 ##
-@@ -889,6 +1059,7 @@ CONFIG_VIDEO_HANTRO_ROCKCHIP=y
+@@ -889,6 +1061,7 @@ CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 ##
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -382,7 +384,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: drivers/mfd/Kconfig
-@@ -1221,12 +1392,13 @@ CONFIG_USB_CONFIGFS_F_UVC=y
+@@ -1221,12 +1394,13 @@ CONFIG_USB_CONFIGFS_F_UVC=y
 ## file: drivers/usb/gadget/legacy/Kconfig
 ##
 CONFIG_USB_GADGETFS=y
@@ -397,7 +399,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: drivers/usb/host/Kconfig
-@@ -1285,6 +1457,7 @@ CONFIG_DW_WATCHDOG=y
+@@ -1285,6 +1459,7 @@ CONFIG_DW_WATCHDOG=y
 ##
 CONFIG_FILE_LOCKING=y
 CONFIG_NETWORK_FILESYSTEMS=y
@@ -405,7 +407,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: fs/cachefiles/Kconfig
-@@ -1408,6 +1581,9 @@ CONFIG_IP_NF_NAT=m
+@@ -1408,6 +1583,9 @@ CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_MANGLE=m
@@ -415,7 +417,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: net/ipv6/Kconfig
-@@ -1423,6 +1599,12 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
+@@ -1423,6 +1601,12 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
 ## file: net/ipv6/netfilter/Kconfig
 ##
 CONFIG_IP6_NF_IPTABLES=m
@@ -428,7 +430,7 @@ index f27b482..0443fc3 100644
 
 ##
 ## file: net/mac80211/Kconfig
-@@ -1437,6 +1619,7 @@ CONFIG_MAC80211_DEBUGFS=y
+@@ -1437,6 +1621,7 @@ CONFIG_MAC80211_DEBUGFS=y
 ##
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_TABLES=m
@@ -436,7 +438,7 @@ index f27b482..0443fc3 100644
 CONFIG_NFT_CT=m
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_MASQ=m
-@@ -1444,6 +1627,19 @@ CONFIG_NFT_REDIR=m
+@@ -1444,6 +1629,19 @@ CONFIG_NFT_REDIR=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
@@ -456,7 +458,7 @@ index f27b482..0443fc3 100644
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
-@@ -1451,6 +1647,14 @@ CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+@@ -1451,6 +1649,14 @@ CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_IPVS=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -1,6 +1,6 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=linux-postmarketos-asahi
-pkgver=6.17.9_p1
+pkgver=6.17.11_p1
 pkgrel=0
 _rel=${pkgver#*_p}
 _kver=${pkgver%_p*}
@@ -91,8 +91,8 @@ package() {
 }

 sha512sums="
-a8d3af18bdc3bc218b4ba7fb0994d4fae23e11e0c4bd93cea50aea36776b4b618b9d2eea8a2c14207cd5ebd4c2348dbe02e694e2727e94a6ee6712750ad5ab60  linux-postmarketos-asahi-6.17.9-1.tar.gz
-26d18cf078495206c63e433b77e358e9ce48c4e6433e2dee53388be5c3456b536a7337d21423566ca6dd3f6e4bbea32fd2066c78e15dac3b2fb0f655728319bf  config-postmarketos-asahi.aarch64
+540abf552d4a3ad8463dbbe076bae6c89fbdf0e23d6b791cd837f16396dcc962b39d6405e587a52fbd119ca4b157e23a753275326d48e7e7ad2ac7cdc2560b9d  linux-postmarketos-asahi-6.17.11-1.tar.gz
+2e4929f131656ce2c65dda996a4c3325aa941f3a09abe9d9c3bb5cbff9e3d84ebf961f6ca3e0041f15dc63a81ea124c20b0b56ad4bdde6713e43fca7c5ef19b6  config-postmarketos-asahi.aarch64
 c23c89cefc4690c69f9e18e12f542078e1231e3f3017624a1e1499bdf8ee132a95c7d8499fe4313d9b19922b043dd9ed7e743ddf046b6f298bbf4e665e4cdc7c  asahi.config
 71aa3bcdf22b81f261db9750eef5c654cbb02e2d710db99346ad4c0a646a75fb24844d89c233e9c06d27979dc7bedc31478ee7e3dea0879ba3de8c6f9419870d  misc.config
 4b82a0e9ed8cd83fcef897c665dd1b386ae1d6d0cbce09d059f39197d899e694e004890712b57a93598e077b59d5b7e460f9190c651666879336e7e3f2035638  pmos.config
@@ -1,16 +1,16 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.17.9 Kernel Configuration
+# Linux/arm64 6.17.11 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.2"
+CONFIG_CC_VERSION_TEXT="Alpine clang version 21.1.7"
 CONFIG_GCC_VERSION=0
 CONFIG_CC_IS_CLANG=y
-CONFIG_CLANG_VERSION=210102
+CONFIG_CLANG_VERSION=210107
 CONFIG_AS_IS_LLVM=y
-CONFIG_AS_VERSION=210102
+CONFIG_AS_VERSION=210107
 CONFIG_LD_VERSION=0
 CONFIG_LD_IS_LLD=y
-CONFIG_LLD_VERSION=210102
+CONFIG_LLD_VERSION=210107
 CONFIG_RUSTC_VERSION=109101
 CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_RUSTC_LLVM_VERSION=210102
@@ -0,0 +1,70 @@
+# Kernel config based on: arch/arm64/configs/defconfig
+# Maintainer: Ben Grisdale <bengris32@protonmail.ch>
+_flavor="postmarketos-mediatek-mt6757"
+pkgname=linux-$_flavor
+pkgver=6.18.0
+pkgrel=0
+pkgdesc="Mainline kernel fork for MT6757"
+arch="aarch64"
+_carch="arm64"
+
+url="https://gitlab.postmarketos.org/mt6757-mainline/linux"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps
+	pmb:cross-native
+	pmb:kconfigcheck-community
+"
+makedepends="
+	bash
+	bison
+	clang
+	findutils
+	flex
+	lld
+	llvm
+	openssl-dev
+	perl
+	postmarketos-installkernel
+	python3
+"
+
+# Source
+_tag="$pkgver-r0"
+_config="config-$_flavor.$arch"
+source="
+	$url/-/archive/$_tag/linux-$_tag.tar.gz
+	$_config
+"
+builddir="$srcdir/linux-$_tag"
+
+prepare() {
+	default_prepare
+	cp "$srcdir/config-$_flavor.$arch" .config
+}
+
+build() {
+	unset LDFLAGS
+	make ARCH="$_carch" LLVM=1 \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1))-$_flavor"
+}
+
+package() {
+	mkdir -p "$pkgdir"/boot
+
+	make zinstall modules_install dtbs_install \
+		ARCH="$_carch" \
+		LLVM=1 \
+		INSTALL_PATH="$pkgdir"/boot/ \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_STRIP=1 \
+		INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
+	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
+
+	install -D "$builddir"/include/config/kernel.release \
+		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
+}
+
+sha512sums="
+28f6871db70de95e79f99e175dbf724fa2e8541e68681008b5d9fdb0f3e6d7a01eb60ab4f5a10f05d2cdcdbdf84d1907f848195631c788793fda18bac9535236  linux-6.18.0-r0.tar.gz
+24592b38290f49492939480e7142df24d7e3e33631003d9bf6eb2791aa61573da6337b80be953b8bfd8066d474bfe1a9ce114ab3d582d78c8a994a1a1aa31c23  config-postmarketos-mediatek-mt6757.aarch64
+"
@@ -1,16 +1,16 @@
-# Maintainer:
 # Mainline Linux kernel fork with patches for MediaTek MT6768 devices
 # Kernel config based on: arch/arm64/configs/mt6768_defconfig
+# Maintainer: Abdullah AL Shohag <HackerShohag@outlook.com>
 _flavor="postmarketos-mediatek-mt6768"
 pkgname=linux-$_flavor
-pkgver=6.1_rc5
+pkgver=6.16.0
 pkgrel=3
-_commit="d8741eb21ebe5b989e69e40a058cd2d593397ae2"
+_commit="781287a2e573dc9bb85a1bc90b86a94f58671853"
 pkgdesc="Mainline Kernel fork for MT6768-based devices"
 arch="aarch64"
 _carch="arm64"
 _config="config-$_flavor.$arch"
-url="https://gitlab.com/mtk-mainline/mt6768/linux"
+url="https://github.com/mt6768-mainline/linux"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps
 	pmb:cross-native
@@ -30,7 +30,7 @@ makedepends="

 # Source
 source="
-	https://gitlab.com/mtk-mainline/mt6768/linux/-/archive/$_commit/linux-$_commit.tar.gz
+	$url/archive/$_commit/linux-$_commit.tar.gz
 	$_config
 "
 builddir="$srcdir/linux-$_commit"
@@ -61,10 +61,10 @@ package() {

 	dtbodir="$builddir/$_outdir/arch/arm64/boot/dts/mediatek"
 	mkdtboimg create "$pkgdir/boot/dtbo.img" \
-		"$dtbodir/mt6769z-volla-mimameid-minimal-dtbo.dtb"
+		"$dtbodir/mt6769t-xiaomi-lancelot-minimal-dtbo.dtb"
 }

 sha512sums="
-20cd7ce324ff0a29a1ceaf0c69e77d619c0b21c924c0913214070308774cb88f1c803bef0da0a85d9bbca3797eadd7f63bb9bc6cf256350c658a8820c275c1e3  linux-d8741eb21ebe5b989e69e40a058cd2d593397ae2.tar.gz
-deb140228aa10fd2fb56b69c9fbacb0b7ba3fcf6039453c02cc4f5a47eb7c6444672b5583931019609ac255b492700ef4ac1972c3844db71ffc2f89fa1f9356d  config-postmarketos-mediatek-mt6768.aarch64
+4dbce2873a545d35199a6b328915f3bb548ff4df41ebf1d5530cbfeb68faa802b028605a707f6aef806f3bfdb1d965f87b6c82b2fb25530fbd88e8fb36554ac6  linux-781287a2e573dc9bb85a1bc90b86a94f58671853.tar.gz
+4d30e11ef402a4b19f84fd07b2e60c9c5a3abe20b9ca10f5802877f58c814a141d8690e6790caf68351b9c8b60f6e1c0fff49a5b611228b5089dac3171230b58  config-postmarketos-mediatek-mt6768.aarch64
 "
				`@@ -1 +0,0 @@`
				`device-pine64-pinenote-nonfree-firmware-openrc.post-install`
				`@@ -1 +0,0 @@`
				`device-pine64-pinenote-sway-systemd.post-install`