oem-intel: add i915 DMC fw to initramfs

Intel >=gen9 GPUs require DMC firmware to support some runtime low power states, it's loaded when i915 starts so let's make sure it's in the initramfs. Also see: https://www.kernel.org/doc/html/latest/gpu/i915.html#dmc-firmware-support
postmarketos-initramfs: switch to udev and kmod
2024-06-18 09:46:04 -07:00 · 2024-06-17 21:46:26 -07:00 · 2024-06-17 14:07:45 -07:00 · 2024-06-17 14:07:45 -07:00 · 2024-06-17 14:07:45 -07:00 · 2024-06-17 14:07:44 -07:00
245 changed files with 23222 additions and 7261 deletions
@@ -16,11 +16,11 @@ fi
 sh_files="
 	./main/mdss-fb-init-hack/mdss-fb-init-hack.sh
 	./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh
+	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
 	./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
-	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/ttyescape/*.post-install
@@ -6,6 +6,8 @@ import glob
 import pytest
 import sys
 import os
+import re
+from pathlib import Path

 import add_pmbootstrap_to_import_path
 import pmb.parse
@@ -40,3 +42,9 @@ def test_aports_kernel(args):
                if "pmb:kconfigcheck-community" not in apkbuild["options"]:
                    raise RuntimeError(f"{aport_name}: \"pmb:kconfigcheck-community\" missing in"
                                       " options= line, required for all community/main devices.")
+
+        # check for postmarketos-installkernel in makedepends when installing kernel with make
+        if bool(re.search("make z?install", Path(path).read_text(encoding="utf-8"))):
+            if "postmarketos-installkernel" not in apkbuild["makedepends"]:
+                raise RuntimeError(f"{aport_name}: \"postmarketos-installkernel\" missing in"
+                                   " makedepends, required when using make install/zinstall.")
@@ -1,7 +1,7 @@
 ---

 # global settings
-image: alpine:edge
+image: alpine:latest
 before_script: &global_before_scripts
  - apk upgrade -U
 after_script:
@@ -27,7 +27,8 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v23.12`
+* [ ] `v24.06`
+* [ ] `v23.12` (supported until 2024-07-16)

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`

@@ -17,7 +17,7 @@ device/*/*-google-x64cros/			@jenneron @JustSoup321 @alpernebbi
 device/*/*-htc-golfu/				@Newbyte
 device/*/*-htc-m8qlul/				@Newbyte
 device/*/*-kobo-clara/				@akemnade
-device/*/*-lenovo-21bx/				@craftyguy
+device/*/*-lenovo-21bx/				@craftyguy @jane400
 device/*/*-lenovo-a6000/			@jenneron @Minecrell
 device/*/*-lenovo-a6010/			@jenneron @Minecrell
 device/*/*-librecomputer-lafrite/		@funderscore
@@ -123,6 +123,9 @@ device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/u-boot-pinebookpro/			@QC8086
 device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
+main/postmarketos*gnome*/			@pabloyoyoista @Newbyte
+main/postmarketos-initramfs/			@calebccff @craftyguy
+main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte
 main/postmarketos-ui-plasma-mobile/		@PureTryOut
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff
@@ -9,13 +9,13 @@ branch_aports=master
 mirrordir_alpine=edge

 [v24.06]
-description=Upcoming stable release (DO NOT USE)
+description=Latest release / Recommended for best stability
 branch_pmaports=v24.06
 branch_aports=3.20-stable
 mirrordir_alpine=v3.20

 [v23.12]
-description=Latest release / Recommended for best stability
+description=Old release (supported until 2024-07-16)
 branch_pmaports=v23.12
 branch_aports=3.19-stable
 mirrordir_alpine=v3.19
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=26
+pkgrel=29

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

 sha512sums="
-0f5f1eb32691016183d9a3011c5643f70a1cdc9f49b1ffefce732cff960cfea4d0db1670564fff5504654bb2f07857e62e5dd076fb40d2c361c441854e5d5e5c  busybox-static-1.36.1-r26-aarch64-edge.apk
+3dd0da90cf278055d2c9e7710bb0389a5af74c0cabd9d786f4244ca4e36872dd307f8ff8a206479714d445fae903b2aa3292279ad737387d0584c7d34d98a274  busybox-static-1.36.1-r29-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=26
+pkgrel=29

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

 sha512sums="
-ad4db0c989c1a4773f75411c2749bcc8d25756d20396cdb6bfa59bd5ed14164928c602e9833101e584b28490971f6d43973a9c7de9c544693aef40dbe183cabc  busybox-static-1.36.1-r26-armhf-edge.apk
+3ed54a2b4c23a08dc066b585198fe81d39b5fd0d54347d9ab727d6bea73cfc4ad9a5fb55c25a3e59ef8fce6cc83a24f0807980f6d3ea6c05029522627192e716  busybox-static-1.36.1-r29-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=26
+pkgrel=29

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

 sha512sums="
-f6664d29ecb22e396133116210d792e101fa552b4f4d2295de19af460830bbb151a2d3c4a7b7bbe1596d7b3ed85042f10dae49d78ae4e6ac053ed565f9043c01  busybox-static-1.36.1-r26-armv7-edge.apk
+3b2124f93cd873440797b25b5c2456dfc441ff18831ae8a0540bd5ca67f3869766aa6a76e31b9f9d0a7382e760b0d8acb1e91599c65a72298fffbbd4aafc6175  busybox-static-1.36.1-r29-armv7-edge.apk
 "
@@ -3,7 +3,7 @@

 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=3
+pkgrel=5

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

 sha512sums="
-4bd0750236a556ad833c27892a55624a324e8ec7cadb0b7287cabd3a9cdded836357ae959aea7ba828be8727b86c6ed4844a1572b68ad3ce3f3e6f913e43ae72  grub-efi-2.12-r3-x86-edge.apk
+3cc14376ad5dc2a4d8488d49199d1257c5024c8c4afcbcdf67a0cd7a66e75962191850cca4248ce13abf060b4d9e2fd0966ef6adeb38a00d58c9e4054eec1e9d  grub-efi-2.12-r5-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-aarch64
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-dddd12728842e84bf7d532901d9b9e26e2c8c86e25a3625329586c9088ec9b3825ce3e512c56b7e875b923905308b89494d31d7ca05ebda5485bd00de3954236  musl-1.2.5-r0-aarch64-edge.apk
-061e68319d2069c211169d7f39b1da572a4c0ab56f8cfe5267c024921ea0e5f44ecc1cca6051bebaa9c83d067f0fd2cbc6b6b73d0e3075410eaf889a25cc82b4  musl-dev-1.2.5-r0-aarch64-edge.apk
+5ad546aca584d77f6fcf7d92bc5e6432d8c32b3db2922a4099423649e674b5c149464bd0048021e50b18398a00382bbeb6a0a598148bea4fa6d783f5c4c4445d  musl-1.2.5-r1-aarch64-edge.apk
+b6fed1441c0eacfea0061967915a876ce0af79b83511d9b05ae7e7cf489d88e36a544fa7f7512f390429d7d0217b672c04a83dfceea603ce0e86d2a47c50f4cc  musl-dev-1.2.5-r1-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armhf
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-4d76f479017b6f666c36782183f3bdb3e58a48f7400cd125c129e380a8654cf99f685f8d3e97b51cb0199b59720a320e251dd9b89fe55ef8f542a043ab3e7355  musl-1.2.5-r0-armhf-edge.apk
-7fa4e9ed4acb6292d46939a63e572eb92085e577bbfce75139a3ebef910434230fcbbb7a236efde7ad6d150d84e31c46edcfe835f4102cb9e68f062eb8488a1e  musl-dev-1.2.5-r0-armhf-edge.apk
+148883dfd80bb670df4c6a919aaf3334d203a87fac98df8046a920a2e4c1c3439347f5653abc2994e9a9fe2946764395cd83e2f2437ab903e37f8ad3fcc6637a  musl-1.2.5-r1-armhf-edge.apk
+052f4f3ff6974aadbe90c1a69c4b29a1fefc25d2f2f794b3d55ed49b79a94dab900592a65b3c80ae9824580eab4fb99cb2cfdf9399354e74a1804871d97774a0  musl-dev-1.2.5-r1-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armv7
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-74e482403f77b9d302a4bb0ad6b86a18e81b5be0eb987296a4b0033c996e474b86eac079abc52bd8f02723aa242ea2a74e61bbd0eee036fbf79a21ae250a6e04  musl-1.2.5-r0-armv7-edge.apk
-02321d629aaa3712546b01645f1eb308f5e25e49bc3c2c42eff3a7cf84cd60327c6bc9818ebeb7d1d9556ddfaa2e132fdab0dc2142eec4df3a799e3402329c49  musl-dev-1.2.5-r0-armv7-edge.apk
+f3da7602184940c3ca4ddc973fd127fe08eb5e9141cf4c22cf49ccf131ef836b7f697f20dc64c7e18661f88779354c8b93c14521d18fb2e83d10638c3c8ed7d5  musl-1.2.5-r1-armv7-edge.apk
+b2678887dfc565691d92c1604137d984c5ce68f7c39c1ec2fd7200d4df4f818d4690c323f93b76ca1d4498a5dc36dff61959e06cc749099c706f85601d915d8e  musl-dev-1.2.5-r1-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-riscv64
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-c11fb5eed8dab05504d88660a4750981a40020a1609b4ec4f9184cf7645283893e7cafc48da471012a4095699d371517cc9e09c0ec73fef4612280c95feebca2  musl-1.2.5-r0-riscv64-edge.apk
-77eba42ed78e680419f838f47a9a9f17d42288259540b70792af23b22f85ba1d2f87958e7db77b11b43629d8593fa58a02902453ecb0a46dd7c33cfca750b820  musl-dev-1.2.5-r0-riscv64-edge.apk
+822f24faaf2285174742788da0dceef3bada4dbd0db9f67362876b3c0ab6bc647a0f2f0cc70e2e28dbb90121f08b65640a344e7cae8416a84bfb389db32e7d9c  musl-1.2.5-r1-riscv64-edge.apk
+04ac4a81d713f71b68082767ce2afab3ce458730664c140f49a0b33f257666a6b4289c5b53935fe16345f8445a458e5307511773651c4574526cfaaf232c239a  musl-dev-1.2.5-r1-riscv64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-7403427bbe6683739ce00c0396dc4bfa8fce2f3e4957d12bc6c31bfb1a60bafca9e7ba266d1ba7ca469ab3738874965cf25e8f3bd838c002b4e5aad702a79e18  musl-1.2.5-r0-x86-edge.apk
-f5b0dfe7543bd7d1de3bfc8617c61fb7287227ea4dd9a722bfd4ec99e8a9405826973375a81a380b04bcba419c18e292cf60aaf1c9503eec3b420ed7adbacd68  musl-dev-1.2.5-r0-x86-edge.apk
+53a30a57f0db29e8d73d7190590fce18a19bcd358f9b0f3d4fa0b8821dad4ed5f1065c3c07dbc373a23cbd98c9a9dc1c2c2d864ac88eefd53dc5f89d8e57ed67  musl-1.2.5-r1-x86-edge.apk
+e9178fcfe27bdc7568c35889cff8cf20829f67460fd6dc22a6ca0465063a809081ee1267b4275432d23d1e7d457a4b207a0ff11c678233c4e430a1173d4ccea8  musl-dev-1.2.5-r1-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86_64
 pkgver=1.2.5
-pkgrel=0
+pkgrel=1
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-8bb997e077850195621916ee0722be7e054086fa5c2907c7d290ee8892910c073e3aece13a2839589966987711f4af6b2f4bffdc6c45d636a24655ef9cbec101  musl-1.2.5-r0-x86_64-edge.apk
-5d93191c3c9bf03b466dc169b57e519f0165c6551d117ae09538907c57a49f58afa3c9225aafc7a61625f224276eff4ee2dbe79d65cf684d03a46c24dd78aa4c  musl-dev-1.2.5-r0-x86_64-edge.apk
+5506970c66b6da294d32961e94cadc6926a7405915a3d4dd519ed8c2aae829f2fbfaab2ccc8d0794f4aa102aa3e8cbd62099aa54668a11ac0c5072f59befece6  musl-1.2.5-r1-x86_64-edge.apk
+bd2602e59831ba860a548c8281bb62be3382b4035f18c9e36350be644db61a762a413e1d696697d402a57d4bc565faf86c2a212e27c9b9a890d765f794bbe829  musl-dev-1.2.5-r1-x86_64-edge.apk
 "
@@ -3,7 +3,7 @@
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
 pkgver=6
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,6 +14,7 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-initramfs-minimal
 "
 makedepends="devicepkg-dev"
 source="
@@ -3,7 +3,7 @@
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
 pkgver=6
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,6 +14,7 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-initramfs-minimal
 "
 makedepends="devicepkg-dev"
 source="
@@ -24,7 +24,11 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	"
 source="deviceinfo modules-initfs"
+# TODO: package iwlwifi-7265D-29.ucode separetely, so we don't depend
+# on linux-firmware-other
 _pmb_recommends="
+	linux-firmware-other
+	linux-firmware-rtl_nic
 	linux-firmware-rtw88
 	oem-intel
 	oem-amd
@@ -1,10 +1,11 @@
-# Maintainer: Konrad Dybcio <konradybcio@kernel.org>
-# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: jane400 <jane400@postmarketos.org>
+# Contributor: Konrad Dybcio <konradybcio@kernel.org>
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -66,7 +67,7 @@ usbguard() {
 sha512sums="
 c3570f44cd0134fd7400a5467cfddb3c1877a771fda8006228d1b0fd81536171ece53bf7562fc0e11dcc1fd3c6830e324e0d5ad9fdc4e16b53107fa3a04004fb  deviceinfo
 82f7719285434d8c7a5268ddc21d513bb3f3788eb3dd2df099e1c245add9d19719047b003a47edb077e095ebe09d9601b1312c001578e7dfa4ed61d72098ef74  firmware.files
-5e91aebdd5aa84eef2660c5cbecd27b1c3662f1707538d53764a74dc1e6cbac451b1041b9aaab92f087d44630036b10e5155a993dd4b2e54cba81637ddb47593  modules-initfs
+654c4e931cfd86bcfd833d5e3ac03fabad5f3d77195ce12509cfce9c1e089822f3cde791ca088ee6611c010a9354efaac488740281c2f5c2ea03b6d7af479935  modules-initfs
 52bbb9564ec713db5d46937701b121afe0c6c644fffe189a05766f491b4997b1bbc4c1f90229efb5764d795df8d40a57d4c840ee4b32d426e7a84520364b8bf5  pipewire.conf
 0d0412eb1f01af39000c39391f622640461305d83dae1a53aa7eef640cc17fd265cabca4e4e57dea053c47a4e50f9feb90f12ee5310d5b6425783e83efc5f9d8  usbguard.conf
 "
@@ -25,3 +25,12 @@ dispcc_sc8280xp
 panel_edp
 phy_qcom_edp
 msm
+
+# USB boot
+phy_qcom_qmp_usb
+phy_qcom_snps_femto_v2
+## Need to load remoteproc modules in the initramfs, if they are loaded later
+## then it can cause a power cycle that breaks USB
+qcom_common
+qcom_q6v5_pas
+qrtr-smd
@@ -2,8 +2,8 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=24
-pkgrel=1
+pkgver=27
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -27,6 +27,8 @@ subpackages="
 	$pkgname-x11
 	$pkgname-xkeyboard-config:xkeyboard_config
 	$pkgname-i3wm
+	$pkgname-upower
+	$pkgname-sxmo
 "
 source="
 	10-initfs-keymap.files
@@ -58,6 +60,8 @@ source="
 	modules.blocklist
 	pointercal
 	proxishot.sh
+	sxmo/deviceprofile.sh
+	sxmo/start_hook.sh
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
 	udev/80-feedbackd-twl4030.rules
@@ -181,6 +185,20 @@ i3wm() {
 		"$subpkgdir"/etc/skel/.Xdefaults
 }

+sxmo() {
+	install_if="$pkgname=$pkgver-r$pkgrel sxmo-utils"
+	replaces="sxmo-utils"
+	# Set !tracedeps, so abuild doesn't extend provides with e.g.:
+	# "cmd:sxmo_deviceprofile_nokia,omap3-n900.sh=1.16.3-r0"
+	# Otherwise this cannot be installed together with sxmo-utils:
+	# conflicts: sxmo-utils-1.16.3-r0[cmd:sxmo_deviceprofile_nokia,omap3-n900.sh=25-r0]
+	options="!tracedeps"
+	install -Dm755 "$srcdir"/deviceprofile.sh \
+		"$subpkgdir"/usr/bin/sxmo_deviceprofile_nokia,omap3-n900.sh
+	install -Dm755 "$srcdir"/start_hook.sh \
+		"$subpkgdir"/usr/share/sxmo/default_hooks/sxmo_hook_start.sh
+}
+
 upower() {
 	install_if="$pkgname=$pkgver-r$pkgrel upower"
 	replaces="upower"
@@ -218,6 +236,8 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
+fc21e3b7e045055c080a7f7ffb0cd4140b63a02690e92c8370dbccbef506fe271ee9584ac9f14725b8bc9fd6e74e7fafde589d2360f44491c614837472d8ad53  deviceprofile.sh
+5dab895c34599bf233635463271ea8308d434c97789efe931eec24870c3b4688fe48ca3b7cdc66e5c1a705940d042b9f18f26420b60f22e1cfad1854e97f8687  start_hook.sh
 239a54ae5c5effb53ccf4d658652c0462da57604b16b77a63627a17caa171caf82e3d1769f9c5afea8756415acbbf3b73db9b57715fce6c70ea3f29e5c6ac84a  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
@@ -0,0 +1,20 @@
+#!/bin/sh
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright 2022 Sxmo Contributors
+
+export WLR_RENDERER=pixman
+export SXMO_LYSTI_LEDS=1
+export SXMO_POWER_BUTTON="0:0:twl_pwrbutton"
+export SXMO_TOUCHSCREEN_ID="TSC2005 touchscreen"
+export SXMO_SWAY_SCALE="1.5"
+#on N900 these two are swaped
+export SXMO_BEMENU_LANDSCAPE_LINES="10"
+export SXMO_BEMENU_PORTRAIT_LINES="8"
+export SXMO_DMENU_LANDSCAPE_LINES="10"
+export SXMO_DMENU_PORTRAIT_LINES="6"
+export SXMO_ROTATE_DIRECTION="left"
+export SXMO_KEYBOARD_SLIDER_EVENT_DEVICE="/dev/input/by-path/platform-gpio_keys-event"
+export SXMO_KEYBOARD_SLIDER_CLOSE_EVENT="*code 10 (SW_KEYPAD_SLIDE), value 0*"
+export SXMO_KEYBOARD_SLIDER_OPEN_EVENT="*code 10 (SW_KEYPAD_SLIDE), value 1*"
+# modem is only supported via ofono, not modemmanager
+export SXMO_NO_MODEM=1
@@ -0,0 +1,130 @@
+#!/bin/sh
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright 2022 Sxmo Contributors
+
+# include common definitions
+# shellcheck source=scripts/core/sxmo_common.sh
+. sxmo_common.sh
+
+# Create xdg user directories, such as ~/Pictures
+xdg-user-dirs-update
+
+sxmo_jobs.sh start daemon_manager superd
+
+# let time to superd to start correctly
+while ! superctl status > /dev/null 2>&1; do
+	sleep 0.5
+done
+
+# Not dangerous if "locker" isn't an available state
+sxmo_state.sh set locker
+
+if [ -n "$SXMO_ROTATE_START" ]; then
+	sxmo_rotate.sh
+fi
+
+# Load our sound daemons
+
+if [ -z "$SXMO_NO_AUDIO" ]; then
+	if [ "$(command -v pulseaudio)" ]; then
+		superctl start pulseaudio
+	elif [ "$(command -v pipewire)" ]; then
+		# pipewire-pulse will start pipewire
+		superctl start pipewire-pulse
+		superctl start wireplumber
+	fi
+
+	# monitor for headphone for statusbar
+	superctl start sxmo_soundmonitor
+fi
+
+# Periodically update some status bar components
+sxmo_hook_statusbar.sh all
+sxmo_jobs.sh start statusbar_periodics sxmo_run_aligned.sh 60 \
+	sxmo_hook_statusbar.sh periodics
+
+# mako/dunst are required for warnings.
+# load some other little things here too.
+case "$SXMO_WM" in
+	sway)
+		superctl start mako
+		superctl start sxmo_wob
+		superctl start sxmo_menumode_toggler
+		superctl start bonsaid
+		swaymsg output '*' bg "$SXMO_BG_IMG" fill
+		;;
+	dwm)
+		superctl start dunst
+		superctl start sxmo_xob
+
+		# Auto hide cursor with touchscreen, Show it with a mouse
+		if command -v "unclutter-xfixes" > /dev/null; then
+			set -- unclutter-xfixes
+		else
+			set -- unclutter
+		fi
+		superctl start "$1"
+
+		superctl start autocutsel
+		superctl start autocutsel-primary
+		superctl start sxmo-x11-status
+		superctl start bonsaid
+		[ -n "$SXMO_MONITOR" ] && xrandr --output "$SXMO_MONITOR" --primary
+		feh --bg-fill "$SXMO_BG_IMG"
+		;;
+esac
+
+# Turn on auto-suspend
+if sxmo_wakelock.sh isenabled; then
+	sxmo_wakelock.sh lock sxmo_not_suspendable infinite
+	superctl start sxmo_autosuspend
+fi
+
+# To setup initial unlock state
+sxmo_state.sh set unlock
+
+# Turn on lisgd
+if [ ! -e "$XDG_CACHE_HOME"/sxmo/sxmo.nogesture ]; then
+	superctl start sxmo_hook_lisgd
+fi
+
+if [ -z "$SXMO_NO_MODEM" ] && command -v ModemManager > /dev/null; then
+	# Turn on the dbus-monitors for modem-related tasks
+	superctl start sxmo_modemmonitor
+
+	# place a wakelock for 120s to allow the modem to fully warm up (eg25 +
+	# elogind/systemd would do this for us, but we don't use those.)
+	sxmo_wakelock.sh lock sxmo_modem_warming_up 120s
+fi
+
+# Monitor the battery
+superctl start sxmo_battery_monitor
+
+# It watch network changes and update the status bar icon by example
+superctl start sxmo_networkmonitor
+
+# The daemon that display notifications popup messages
+superctl start sxmo_notificationmonitor
+
+# Play a funky startup tune if you want (disabled by default)
+#mpv --quiet --no-video ~/welcome.ogg &
+
+# mmsd and vvmd
+if [ -z "$SXMO_NO_MODEM" ]; then
+	if [ -f "${SXMO_MMS_BASE_DIR:-"$HOME"/.mms/modemmanager}/mms" ]; then
+		superctl start mmsd-tng
+	fi
+
+	if [ -f "${SXMO_VVM_BASE_DIR:-"$HOME"/.vvm/modemmanager}/vvm" ]; then
+		superctl start vvmd
+	fi
+fi
+
+# add some warnings if things are not setup correctly
+if ! command -v "sxmo_deviceprofile_$SXMO_DEVICE_NAME.sh";  then
+	sxmo_notify_user.sh --urgency=critical \
+		"No deviceprofile found $SXMO_DEVICE_NAME. See: https://sxmo.org/deviceprofile"
+fi
+
+sxmo_migrate.sh state || sxmo_notify_user.sh --urgency=critical \
+	"Config needs migration" "$? file(s) in your sxmo configuration are out of date and disabled - using defaults until you migrate (run sxmo_migrate.sh)"
@@ -4,7 +4,7 @@
 pkgname=device-samsung-manta
 pkgdesc="Google Nexus 10"
 pkgver=7
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -42,6 +42,10 @@ package() {
 	install -Dm644 "$srcdir"/100-wlan-mac.rules \
 		-t "$pkgdir"/usr/lib/udev/rules.d/

+	mkdir -p "$pkgdir"/etc/modules-load.d
+	echo "ds2482" \
+		> "$pkgdir"/etc/modules-load.d/ds2482.conf
+
 	mkdir -p "$pkgdir"/etc/modprobe.d
 	echo "options ds2482 active_pullup=0" \
 		> "$pkgdir"/etc/modprobe.d/ds2482.conf
@@ -1,5 +1,5 @@
 pkgname=firmware-fairphone-fp4
-pkgver=20231122
+pkgver=20240313
 pkgrel=0
 pkgdesc="Firmware for Fairphone 4"
 subpackages="
@@ -17,7 +17,7 @@ arch="aarch64"
 license="proprietary"
 makedepends="pil-squasher"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="9bcb18012b18756e5f7adc4fcd41396e7f28199b"
+_commit="d95bd920afa9084cefe0f69be931a5421e544154"
 source="https://github.com/FairBlobs/FP4-firmware/archive/$_commit/FP4-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP4-firmware-$_commit"

@@ -39,8 +39,6 @@ adreno() {
 		"$subpkgdir/lib/firmware/qcom/"
 	install -Dm644 "$builddir"/a615_zap.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s a615_zap.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/a615_zap.mdt"
-	ln -s sm7225/fairphone4/a615_zap.mbn "$subpkgdir/lib/firmware/qcom/a615_zap.mdt"
 }

 adsp() {
@@ -48,7 +46,6 @@ adsp() {

 	install -Dm644 "$builddir"/adsp.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s adsp.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/adsp.mdt"
 	install -Dm644 "$builddir"/adsp*.jsn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }
@@ -67,7 +64,6 @@ cdsp() {

 	install -Dm644 "$builddir"/cdsp.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s cdsp.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/cdsp.mdt"
 	install -Dm644 "$builddir"/cdsp*.jsn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }
@@ -78,7 +74,6 @@ ipa() {
 	cd "$builddir"
 	install -Dm644 "$builddir"/lagoon_ipa_fws.mbn \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/ipa_fws.mbn"
-	ln -s ipa_fws.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/ipa_fws.mdt"
 }

 modem() {
@@ -86,7 +81,6 @@ modem() {

 	install -Dm644 "$builddir"/modem.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
-	ln -s modem.mbn "$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/modem.mdt"
 	install -Dm644 "$builddir"/modem*.jsn -t \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"

@@ -111,5 +105,5 @@ wlan() {
 }

 sha512sums="
-c579b1893a61e09f532e0858ddb90b83e663bf1489707ba8b0e524771504db73764233c2dfe3a4b97b40eab4ef88d50adbea33ab25c28c289d1890d7b0addd70  FP4-firmware-9bcb18012b18756e5f7adc4fcd41396e7f28199b.tar.gz
+3839431922c6250fa76c563183387edbc1370f34d833d5d7c6c08f0d921c0498c93ff376af5d43fecf78d4ac6aff3b90e41345310181826b0a21507dbfba778c  FP4-firmware-d95bd920afa9084cefe0f69be931a5421e544154.tar.gz
 "
@@ -1,5 +1,6 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: jane400 <jane400@postmarketos.org>
 pkgname=firmware-lenovo-21bx
 pkgver=1
 pkgrel=0
@@ -1,5 +1,5 @@
 pkgname=firmware-samsung-midas
-pkgver=6.1
+pkgver=6.2
 pkgrel=0
 pkgdesc="Samsung Galaxy Midas board firmware (m0, m3, t0lte, ...)"
 _commit="fdd8c44568a148c22fbf008de822ff4e27992da1"
@@ -10,8 +10,6 @@ _androguide_commit="d5a8735a6ad1fff3091f100383ac004f411d7528"
 _androguide_url="https://raw.githubusercontent.com/Androguide/android_vendor_samsung"
 _vendor_bsp_uboot_commit="246091921433dd11c211a306f042d949ada38924"
 _vendor_bsp_uboot_url="https://github.com/dmarszk/exynos4_uboot"
-_gr8nole_url="https://raw.githubusercontent.com/gr8nole/proprietary_vendor_samsung"
-_gr8nole_commit="38ea48dbc6a683874aaf3376b63fc97ff3823459"
 arch="armv7"
 license="proprietary"
 replaces="firmware-samsung-m0"
@@ -25,9 +23,6 @@ source="
 	bcm4334.hcd-$_commit::$url/raw/$_commit/smdk4412-common/proprietary/bin/bcm4334.hcd
 	brcmfmac4334-sdio.samsung,i9300-$_armbian_commit.txt::$_armbian_url/raw/$_armbian_commit/brcm/brcmfmac4334-sdio.rockchip%2Crk3318-box.txt
 	brcmfmac4334-sdio.samsung,i9305-$_androguide_commit.txt::$_androguide_url/$_androguide_commit/smdk4412-common/proprietary/system/etc/wifi/nvram_net.txt
-	brcmfmac4334-sdio.samsung,t310-$_gr8nole_commit.txt::$_gr8nole_url/$_gr8nole_commit/lt01wifi/proprietary/system/etc/wifi/nvram_net.txt
-	brcmfmac4334-sdio.samsung,t311-$_gr8nole_commit.txt::$_gr8nole_url/$_gr8nole_commit/lt013g/proprietary/system/etc/wifi/nvram_net.txt
-	brcmfmac4334-sdio.samsung,t315-$_gr8nole_commit.txt::$_gr8nole_url/$_gr8nole_commit/lt01lte/proprietary/system/etc/wifi/nvram_net.txt
 	"
 options="!check !strip !archcheck !spdx !tracedeps pmb:cross-native"

@@ -59,21 +54,10 @@ wifi() {
 		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9300.txt
 	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,i9305-$_androguide_commit.txt \
 		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9305.txt
-	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,t310-$_gr8nole_commit.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t310.txt
-	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,t311-$_gr8nole_commit.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t311.txt
-	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,t315-$_gr8nole_commit.txt \
-		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t315.txt
 	ln -s /lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9305.txt \
 		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,n710x.txt
 	ln -s /lib/firmware/brcm/brcmfmac4334-sdio.samsung,i9300.txt \
 		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,n8010.txt
-
-	for _device in "samsung,t310" "samsung,t311" "samsung,t315"; do
-		ln -s /lib/firmware/brcm/brcmfmac4334-sdio.bin \
-			"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.$_device.bin
-	done
 }

 sha512sums="
@@ -81,7 +65,4 @@ sha512sums="
 cbed1dc60829161c7ac9649dcae67fc45204c1a25e8de320ad3bc4e9d5cae573fb8a4745f91355fa96d2d3d4124a9e707341fc5bd1b22705cb2efb16831e029f  bcm4334.hcd-fdd8c44568a148c22fbf008de822ff4e27992da1
 d5c83e1dcd67630e186ab484d150ca5c0af12810de62a46ec6e525b50dabf64a75f1231ef8d7c1d102fb76389210fdb952975460179ca767acd0ffdd869907d7  brcmfmac4334-sdio.samsung,i9300-5ff122ef309a1ddabb4bf7f37c8347c43b314a61.txt
 146aefcccd23d63e434bd7f7d0ac6d5975ad25e44362da10bc583ab9e38b18c53f6ce18890c9790ee88fbb8f6358085bb615d0595388ca43a322f7c819614049  brcmfmac4334-sdio.samsung,i9305-d5a8735a6ad1fff3091f100383ac004f411d7528.txt
-1359b10a0cd043f02fa939e827e24aaa35cf03eee5e5a78f83437899c86e78d5b973b36a61535211bab5dd7e6d210065c1f81addd716caaac147fbfc6c70bac2  brcmfmac4334-sdio.samsung,t310-38ea48dbc6a683874aaf3376b63fc97ff3823459.txt
-81b722b2d5eb3446606a7b10001aeed7af8a8139379c8525d5ddd990a5b10dd3e2103c498d65c0e31cbda7bafc0988dc25b2d227b20dcdf88c5dc57eaa771956  brcmfmac4334-sdio.samsung,t311-38ea48dbc6a683874aaf3376b63fc97ff3823459.txt
-547780ac164b4a7a989965b1561fb318ae30187d2ad45ec0add001c037f2a732abcc73acf8be6f0aee55d28eccb89b992f7d30acd9872d1998682d9110eec09e  brcmfmac4334-sdio.samsung,t315-38ea48dbc6a683874aaf3376b63fc97ff3823459.txt
 "
@@ -1,5 +1,6 @@
-# Maintainer: Konrad Dybcio <konradybcio@kernel.org>
-# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Maintainer: Clayton Craft <clayton@craftyguy.net>
+# Co-Maintainer: jane400 <jane400@postmarketos.org>
+# Contributor: Konrad Dybcio <konradybcio@kernel.org>
 pkgname=linux-lenovo-21bx
 pkgver=6.9
 pkgrel=1
@@ -1,8 +1,8 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.9
-pkgrel=0
+pkgver=6.9.2
+pkgrel=1
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -18,9 +18,9 @@ makedepends="
 	bison
 	findutils
 	flex
-	installkernel
 	openssl-dev
 	perl
+	postmarketos-installkernel
 	gmp-dev
 	mpc1-dev
 	mpfr-dev
@@ -68,8 +68,8 @@ package() {
 }

 sha512sums="
-fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579  linux-6.9.tar.xz
-f148cf476030eba3034c56e3ca51b982f8230e2d7b199b59f021612943ec1ae8899c0b308593bf1b10f3b632aa7232c695fbed348c406258b8e6a998ffb00803  config-postmarketos-mediatek-mt8173.aarch64
+a168f5b3e7ee7451d5bb1c7f6c090d6002330a4529ef74b2e47f6902ba3d6feaa8dc89f7b5a072d52f6933fd08354a0ff1e12f22240ce53c758c144d4ad132cd  linux-6.9.2.tar.xz
+0a28bc2e6d57a95ec5125f0c8a21b42d63af7a907e214e3ca3fa90a6741277bb809426a1b8a26b52452854ff6cb04800887552b86c37c0c6af1ad0b7f8acfcd7  config-postmarketos-mediatek-mt8173.aarch64
 4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710  fix-mmc1-speed.patch
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de  fix-spi-nor-max-frequency.patch
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.9.0 Kernel Configuration
+# Linux/arm64 6.9.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
 CONFIG_CC_IS_GCC=y
@@ -3,7 +3,7 @@ new file mode 100644
 index 000000000..f7b371179
 --- /dev/null
 +++ b/arch/arm/boot/dts/ti/omap/twl6032.dtsi
-@@ -0,0 +1,88 @@
+@@ -0,0 +1,93 @@
 +/*
 + * Integrated Power Management Chip
 + * http://www.ti.com/lit/ds/symlink/twl6032.pdf
@@ -79,7 +79,7 @@ index 000000000..f7b371179
 +               regulator-always-on;
 +       };
 +
-+       vusb: regulator-vusb {
+       ldousb: regulator-ldousb {
 +               compatible = "ti,twl6032-ldousb";
 +               regulator-min-microvolt = <3300000>;
 +               regulator-max-microvolt = <3300000>;
@@ -91,4 +91,9 @@ index 000000000..f7b371179
 +               interrupts = <3>;
 +               #io-channel-cells = <1>;
 +       };
+
+       twl_usb_comparator: usb-comparator {
+               compatible = "ti,twl6030-usb";
+               interrupts = <4>, <10>;
+       };
 +};
@@ -13,7 +13,7 @@ new file mode 100644
 index 000000000..b44af61d4
 --- /dev/null
 +++ b/arch/arm/boot/dts/ti/omap/omap4-samsung-espresso-common.dtsi
-@@ -0,0 +1,676 @@
+@@ -0,0 +1,678 @@
 +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 +/dts-v1/;
 +#include "dt-bindings/gpio/gpio.h"
@@ -274,6 +274,12 @@ index 000000000..b44af61d4
 +		compatible = "gpio-ir-tx";
 +		gpios = <&gpio2 27 GPIO_ACTIVE_HIGH>; /* GPIO_59 */
 +	};
+
+       wlan_pwrseq: wlan-pwrseq {
+               compatible = "mmc-pwrseq-simple";
+               clocks = <&twl 0>; // 0 is ckl32kg, 1 is clk32kaudio
+               clock-names = "ext_clock";
+       };
 +};
 +
 +&omap4_pmx_wkup {
@@ -512,6 +518,7 @@ index 000000000..b44af61d4
 +
 +	twl: twl@48 {
 +		reg = <0x48>;
+		#clock-cells = <1>;
 +
 +		pinctrl-names = "default";
 +		pinctrl-0 = <
@@ -522,11 +529,7 @@ index 000000000..b44af61d4
 +		/* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */
 +		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_1N cascaded to gic */
 +		interrupt-parent = <&gic>;
-+
-+		twl_power: power {
-+			compatible = "ti,twl6030-power";
-+			ti,system-power-controller;
-+		};
+		system-power-controller;
 +	};
 +};
 +
@@ -610,10 +613,8 @@ index 000000000..b44af61d4
 +	};
 +};
 +
-+#include "twl6030.dtsi"
-+
 +&twl_usb_comparator {
-+	usb-supply = <&vusb>;
+	usb-supply = <&ldousb>;
 +};
 +
 +&usb_otg_hs {
@@ -658,6 +659,7 @@ index 000000000..b44af61d4
 +	non-removable;
 +	bus-width = <4>;
 +	vmmc-supply = <&reg_espresso_wlan>;
+	mmc-pwrseq = <&wlan_pwrseq>;
 +
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&mmc5_pins>;
@@ -35,7 +35,7 @@ index 000000000..9d715bd7e
 +/ {
 +	model = "Samsung Galaxy Tab 2 (7 inch)";
 +	compatible = "samsung,espresso7", "ti,omap4430", "ti,omap4";
-+	
+
 +	backlight: backlight {
 +		compatible = "pwm-backlight";
 +		pinctrl-names = "default";
@@ -80,7 +80,7 @@ index 000000000..9d715bd7e
 +				remote-endpoint = <&bridge_out>;
 +			};
 +		};
-+	};	
+	};
 +};
 +
 +&i2c3 {
@@ -72,17 +72,17 @@ index 000000000..3fa4b18bd
 +
 +		panel-timing {
 +			clock-frequency = <69818000>;
-+			
+
 +			hback-porch = <64>;
 +			hactive = <1280>;
 +			hfront-porch = <16>;
 +			hsync-len = <48>;
-+	
+
 +			vback-porch = <11>;
 +			vactive = <800>;
 +			vfront-porch = <16>;
 +			vsync-len = <3>;
-+	
+
 +			hsync-active = <0>;
 +			vsync-active = <0>;
 +			de-active = <1>;
@@ -1,194 +0,0 @@
-diff --git a/Documentation/devicetree/bindings/mfd/twl6030-power.txt b/Documentation/devicetree/bindings/mfd/twl6030-power.txt
-new file mode 100644
-index 000000000..a78f0f842
--- /dev/null
-+++ b/Documentation/devicetree/bindings/mfd/twl6030-power.txt
-@@ -0,0 +1,32 @@
-+
-+Texas Instruments TWL family (twl6030) reset and power management module
-+
-+For now, the binding only supports the complete shutdown of the system after
-+poweroff.
-+
-+Required properties:
-+- compatible : must be
-+	"ti,twl6030-power"
-+
-+Optional properties:
-+
-+- ti,system-power-controller: This indicates that TWL6030 is the
-+  power supply master of the system. With this flag, the chip will
-+  initiate an ACTIVE-to-OFF or SLEEP-to-OFF transition when the
-+  system poweroffs.
-+
-+Example:
-+&i2c1 {
-+	clock-frequency = <2600000>;
-+
-+	twl: twl@48 {
-+		reg = <0x48>;
-+		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
-+		interrupt-parent = <&intc>;
-+
-+		twl_power: power {
-+			compatible = "ti,twl6030-power";
-+			ti,system-power-controller;
-+		};
-+	};
-+};
-diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
-index 02c253de9..b27ae703f 100644
--- a/arch/arm/mach-omap2/Kconfig
-+++ b/arch/arm/mach-omap2/Kconfig
-@@ -140,7 +140,8 @@ config ARCH_OMAP2PLUS_TYPICAL
- 	select REGULATOR
- 	select REGULATOR_FIXED_VOLTAGE
- 	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
-	select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
-+	select TWL4030_POWER if ARCH_OMAP3
-+	select TWL6030_POWER if ARCH_OMAP4
- 	select VFP
- 	help
- 	  Compile a kernel suitable for booting most boards
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index ca0edab91..525fdf347 100644
--- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -1671,6 +1671,16 @@ config MFD_TWL4030_AUDIO
- 	select MFD_CORE
- 	default n
- 
-+config TWL6030_POWER
-+	bool "TI TWL6030 power resources"
-+	depends on TWL4030_CORE && ARM
-+	help
-+	  Say yes here if you want to use the power resources on the
-+	  TWL6030 family chips.
-+
-+	  When used as system power controller, this driver allows turning off
-+	  the main power supply.
-+
- config TWL6040_CORE
- 	bool "TI TWL6040 audio codec"
- 	depends on I2C=y
-diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
-index 2ba6646e8..ccdd8efa3 100644
--- a/drivers/mfd/Makefile
-+++ b/drivers/mfd/Makefile
-@@ -111,6 +111,7 @@ obj-$(CONFIG_MENELAUS)		+= menelaus.o
- obj-$(CONFIG_TWL4030_CORE)	+= twl-core.o twl4030-irq.o twl6030-irq.o
- obj-$(CONFIG_TWL4030_POWER)    += twl4030-power.o
- obj-$(CONFIG_MFD_TWL4030_AUDIO)	+= twl4030-audio.o
-+obj-$(CONFIG_TWL6030_POWER)	+= twl6030-power.o
- obj-$(CONFIG_TWL6040_CORE)	+= twl6040.o
- 
- obj-$(CONFIG_MFD_MX25_TSADC)	+= fsl-imx25-tsadc.o
-diff --git a/drivers/mfd/twl6030-power.c b/drivers/mfd/twl6030-power.c
-new file mode 100644
-index 000000000..f6bacdfc3
--- /dev/null
-+++ b/drivers/mfd/twl6030-power.c
-@@ -0,0 +1,103 @@
-+
-+/*
-+ * TWL6030 power
-+ *
-+ * Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
-+ *
-+ * This file is subject to the terms and conditions of the GNU General
-+ * Public License. See the file "COPYING" in the main directory of this
-+ * archive for more details.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/pm.h>
-+#include <linux/mfd/twl.h>
-+#include <linux/platform_device.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+
-+#define TWL6030_PHOENIX_DEV_ON		0x25
-+
-+#define TWL6030_PHOENIX_APP_DEVOFF	(1 << 0)
-+#define TWL6030_PHOENIX_CON_DEVOFF	(1 << 1)
-+#define TWL6030_PHOENIX_MOD_DEVOFF	(1 << 2)
-+
-+void twl6030_power_off(void)
-+{
-+	int err;
-+
-+	err = twl_i2c_write_u8(TWL6030_MODULE_ID0, TWL6030_PHOENIX_APP_DEVOFF |
-+		TWL6030_PHOENIX_CON_DEVOFF | TWL6030_PHOENIX_MOD_DEVOFF,
-+		TWL6030_PHOENIX_DEV_ON);
-+	if (err)
-+		pr_err("TWL6030 Unable to power off\n");
-+}
-+
-+static bool twl6030_power_use_poweroff(const struct twl4030_power_data *pdata,
-+	struct device_node *node)
-+{
-+	if (pdata && pdata->use_poweroff)
-+		return true;
-+
-+	if (of_property_read_bool(node, "ti,system-power-controller"))
-+		return true;
-+
-+	return false;
-+}
-+
-+#ifdef CONFIG_OF
-+static const struct of_device_id twl6030_power_of_match[] = {
-+	{
-+		.compatible = "ti,twl6030-power",
-+	},
-+	{ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, twl6030_power_of_match);
-+#endif	/* CONFIG_OF */
-+
-+static int twl6030_power_probe(struct platform_device *pdev)
-+{
-+	const struct twl4030_power_data *pdata = dev_get_platdata(&pdev->dev);
-+	struct device_node *node = pdev->dev.of_node;
-+
-+	if (!pdata && !node) {
-+		dev_err(&pdev->dev, "Platform data is missing\n");
-+		return -EINVAL;
-+	}
-+
-+	/* Board has to be wired properly to use this feature */
-+	if (twl6030_power_use_poweroff(pdata, node) && !pm_power_off)
-+		pm_power_off = twl6030_power_off;
-+
-+	return 0;
-+}
-+
-+static int twl6030_power_remove(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+static struct platform_driver twl6030_power_driver = {
-+	.driver = {
-+		.name	= "twl6030_power",
-+		.of_match_table = of_match_ptr(twl6030_power_of_match),
-+	},
-+	.probe		= twl6030_power_probe,
-+	.remove		= twl6030_power_remove,
-+};
-+
-+module_platform_driver(twl6030_power_driver);
-+
-+MODULE_AUTHOR("Paul Kocialkowski <contact@paulk.fr>");
-+MODULE_DESCRIPTION("Power management for TWL6030");
-+MODULE_LICENSE("GPL");
@@ -0,0 +1,13 @@
+diff --git a/drivers/iio/afe/iio-rescale.c b/drivers/iio/afe/iio-rescale.c
+index 56e5913ab..e0d5e437f 100644
+--- a/drivers/iio/afe/iio-rescale.c
+++ b/drivers/iio/afe/iio-rescale.c
+@@ -289,7 +289,7 @@ static int rescale_configure_channel(struct device *dev,
+ 	chan->ext_info = rescale->ext_info;
+ 	chan->type = rescale->cfg->type;
+ 
+-	if (iio_channel_has_info(schan, IIO_CHAN_INFO_RAW) &&
+	if (iio_channel_has_info(schan, IIO_CHAN_INFO_RAW) ||
+ 	    (iio_channel_has_info(schan, IIO_CHAN_INFO_SCALE) ||
+ 	     iio_channel_has_info(schan, IIO_CHAN_INFO_OFFSET))) {
+ 		dev_info(dev, "using raw+scale/offset source channel\n");
@@ -3,7 +3,7 @@
 # Kernel config based on: arch/arm/configs/omap2plus_defconfig

 pkgname=linux-postmarketos-omap
-pkgver=6.9.0
+pkgver=6.9.3
 pkgrel=0
 pkgdesc="Mainline kernel fork for OMAP devices"
 arch="armv7"
@@ -37,8 +37,8 @@ source="
 	0002-arm-dts-Add-common-dtsi-for-espresso.patch
 	0003-arm-dts-Add-espresso7-support.patch
 	0004-arm-dts-Add-espresso10-support.patch
-	0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
-	0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+	0005-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+	0006-iio-rescale-revert-logic.patch
 	0007-hsi-ssi_port-force-pio-path.patch
 	0008-n900-dts-volume-keys.patch
 	0009-ARM-dts-disable-twl-off-idle-configuration-for-N900.patch
@@ -74,14 +74,14 @@ package() {
 }

 sha512sums="
-fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579  linux-6.9.tar.xz
-c0ab8a8126b78a5c5ba9106adc01b92d4bb9f198ef307362db585a988aee509f6bec43fbd4314b3438b470f8b3c6357e9f16b4952981ed185100b5b7e34f317c  config-postmarketos-omap.armv7
-fe4307a6af41913a7e5d59288b563865116797d3272e0570faff4532e198831e764e0067f53afdd39e57665196ae44f05d554bbd7d55d556d4b2d3c9d2efd41f  0001-Add-TWL6032-dtsi.patch
-2c13c46b4db0d4a75c3aae3a46041fe43f841dc4ab3c7b08cd9db22a73c8355701d85c8c1e979aba93002b96d63ad3f1f8e46c15ecdde4391ea677b71dd17b45  0002-arm-dts-Add-common-dtsi-for-espresso.patch
-4efda42604f5a6d5f9d4ceb9f87aaa5ad81d9299b3cd8ae930aafa895df5041ff5ee2cf441bbf7fdd002a52df378ee08c0bde85657e5d2086404b9f08b3a742d  0003-arm-dts-Add-espresso7-support.patch
-f0bb41630d8e08adcffa433f3c82047e8787c96b7cc7301eb80bf5e5298010c136cd10c756278fb2331d66dde33d6a13128420f5af022b117f9e3ddb23070934  0004-arm-dts-Add-espresso10-support.patch
-9dc84421cbc2ea7c2c37847d8704ff46dd4a485485bfa4a671167fdef4ac6f53a4e8f787aa774f3748299c374e7c7dc5d36fd4ba9b1a1a9697e0526f2bf3ece4  0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
-fe9ce7ed5757a1e72663c15e80cef47531b80150e8c45fa94c03a291edc39a401c0678894c3f7afbe9b78b5cbe88529982bd6c90ab3f515c31199e6939aa3b96  0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+119320627a73c260725a51ee4234942cc137aeb8b7c67428204ae14e3b518cf7b770e75a8dd0df7fa910333a64241146eb8f93463163f386dae8ddbd6943a631  linux-6.9.3.tar.xz
+4bd7828c0f2afd5ef3829df8bff1c503b4e426fe2621f9c754dcdef1d1118fdd06729729a6516140783e382ccddd38f0f8f0dbeab6624bdd6d7013ce2c9afc97  config-postmarketos-omap.armv7
+9a187d93885f07467ec67094621b2d762607d58622e67172bdfcd8ba5f3d6aab900ca5d233efd3d447540f9b906ba950083a35997c84b315801604e1cd5cddc3  0001-Add-TWL6032-dtsi.patch
+f7d1a87088c65278a114125e732d5bebebb560a6245afb34e003083d808ef3f8c5f49ff23131953508a6daae111ab6adfffdbcf56b79260a6d4115f859c7bb3a  0002-arm-dts-Add-common-dtsi-for-espresso.patch
+089ca0547997c7cd5d1b65924c134eb6b7703a7439729923d3639d125763412fa7e826d1cb839ac0b6cd22e614f69a3b52605a75b571e271c33f9a27ff6ac9c2  0003-arm-dts-Add-espresso7-support.patch
+97f6671bd6fa02d095b726793a3ae68a5b94b0a89719006121a6eaf1607c477f74446489a0f62250edc3c193945f571c92196c85ec8043ae18a141ea9adffd51  0004-arm-dts-Add-espresso10-support.patch
+fe9ce7ed5757a1e72663c15e80cef47531b80150e8c45fa94c03a291edc39a401c0678894c3f7afbe9b78b5cbe88529982bd6c90ab3f515c31199e6939aa3b96  0005-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+1a68e3a32ae1e56d325c0f759ee66d64d14f46a5d52e75ae008dfddac335beb3aa7acaf62abb95b6d5ce1557f0cf9b4c31ab78e110af178db1ac963bb377dbf0  0006-iio-rescale-revert-logic.patch
 c3af9715b3559c2d593f4fcfa078730722c7deeec132c5b83e085ff4d9815d85ef349384097c580efe1bbc37c60f42e18ef559f0abccfe236080670e4403fa77  0007-hsi-ssi_port-force-pio-path.patch
 b98ce806b3d5a0122086e4c9670639174470ff6d29851c60258cc5d699ce9a479dbf4996b24299fc075d25e9fe8f6b1250fafdff742deea0ddeaf53d342a9d72  0008-n900-dts-volume-keys.patch
 66abb5548910ad369608b08200f5835d5a8526c04cc3617221ef546f3e3d22cd944db91dc6727a5c26a102b24d8ef1306ea01254c9c382759afced91b31747ef  0009-ARM-dts-disable-twl-off-idle-configuration-for-N900.patch
@@ -3703,7 +3703,6 @@ CONFIG_MFD_TPS65910=y
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_POWER=y
 CONFIG_MFD_TWL4030_AUDIO=y
-CONFIG_TWL6030_POWER=y
 CONFIG_TWL6040_CORE=y
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_LM3533 is not set
@@ -7245,7 +7244,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_ISO8859_8 is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-qcom-sc7180
 pkgver=6.1.39
-pkgrel=6
+pkgrel=7
 pkgdesc="Mainline kernel fork for Qualcomm Snapdragon 7c devices"
 arch="aarch64"
 _carch="arm64"
@@ -17,12 +17,12 @@ makedepends="
 	bison
 	findutils
 	flex
-	installkernel
 	openssl-dev
 	perl
 	gmp-dev
 	mpc1-dev
 	mpfr-dev
+	postmarketos-installkernel
 	xz
 "

@@ -1,29 +0,0 @@
-From f0de38394feba36de5448d11fe57b674dbf1f946 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <uwu@icenowy.me>
-Date: Tue, 27 Feb 2024 20:38:22 +0800
-Subject: [PATCH 1/2] arm64: dts: qcom: sdm845-xiaomi-polaris: Enable ath10k
- host-cap skip quirk
-
-The WiFi firmware used on Polaris (Xiaomi Mi Mix2s) doesn't
-support the host-capability QMI request, hence enable the skip
-quirk for this device.
-
-Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
---
- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
-index e386b504e978b..8df61887e3dc4 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
-+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
-@@ -711,5 +711,6 @@ &wifi {
- 	vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
- 	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
- 	vdd-3.3-ch1-supply = <&vreg_l23a_3p3>;
-+	qcom,snoc-host-cap-skip-quirk;
- 	status = "okay";
- };
-- 
-2.43.0
-
@@ -1,28 +0,0 @@
-From cc4d4b1e5a1c9d8592f10fdcb7f8c16c279460f7 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <uwu@icenowy.me>
-Date: Tue, 27 Feb 2024 20:40:41 +0800
-Subject: [PATCH 2/2] drm: panel: Enable prepare_prev_first flag for NT35596s
-
-This panel needs DSI command sent in prepare() callback, thus set the
-prepare_prev_first flag to allow this.
-
-Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
---
- drivers/gpu/drm/panel/panel-novatek-nt35596s.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpu/drm/panel/panel-novatek-nt35596s.c b/drivers/gpu/drm/panel/panel-novatek-nt35596s.c
-index b1c724ebf8f5e..e441409c68602 100644
--- a/drivers/gpu/drm/panel/panel-novatek-nt35596s.c
-+++ b/drivers/gpu/drm/panel/panel-novatek-nt35596s.c
-@@ -477,6 +477,7 @@ static int nt35596s_panel_add(struct nt35596s_panel *pinfo)
- 				     "failed to get reset gpio from DT\n");
- 
- 	drm_panel_init(&pinfo->base, dev, &panel_funcs, DRM_MODE_CONNECTOR_DSI);
-+	pinfo->base.prepare_prev_first = true;
- 
- 	drm_panel_add(&pinfo->base);
- 
-- 
-2.43.0
-
@@ -6,7 +6,7 @@
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
 pkgver=6.9.0
-pkgrel=0
+pkgrel=2
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -15,17 +15,15 @@ license="GPL-2.0-only"
 options="!check !tracedeps
 	pmb:cross-native
 	pmb:kconfigcheck-community"
-makedepends="bash bison findutils flex installkernel openssl-dev perl zstd"
+makedepends="bash bison findutils flex installkernel openssl-dev perl zstd python3"

 _config="config-$_flavor.$arch"
-_tag="sdm845-6.9.0"
+_tag="sdm845-6.9.0-r2"

 # Source
 source="
 	linux-$_tag.tar.gz::https://gitlab.com/sdm845-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
 	$_config
-	0001-arm64-dts-qcom-sdm845-xiaomi-polaris-Enable-ath10k-h.patch
-	0002-drm-panel-Enable-prepare_prev_first-flag-for-NT35596.patch
 "
 builddir="$srcdir/linux-$_tag"

@@ -73,8 +71,6 @@ package() {
 }

 sha512sums="
-42176b7b292a67ec85abe2faefd3e4c571425a35bcc7e63b219a9e06f73e7ed3f21fb5ea6e66072d96d31125dbd35b32ca82ebce2423e8268aa82ad56f230733  linux-sdm845-6.9.0.tar.gz
-012db792018c7a98c530db1a3edf8a737a9350be7e0db4fc8d2099df94add3277736193d7f0f3a571228f98025c46c770afb4ca20dfe9ce106bd4d109679dbd0  config-postmarketos-qcom-sdm845.aarch64
-e0ae8b9da09cd2552244cfbcd6a63272c766d082306573a679497ab0bd30a44dfa0023503a7628b7ea87238a62da13704de5e2a57952310c7866b770e5c474ad  0001-arm64-dts-qcom-sdm845-xiaomi-polaris-Enable-ath10k-h.patch
-d7c857500348a1420ccd1a255c667704e54ee88f5c563bcb92885aaa5a9b5dc5a87d12ab782822de523d01c63b277ff60b57cc5307a0663bf42ad7b69da3d1c5  0002-drm-panel-Enable-prepare_prev_first-flag-for-NT35596.patch
+45fb653328776a7b3687b9192979ada93c5ac7c321d54d4b72f47cddc10120982701d4990edc9103f6ec3ffcd2bc917b43ce7fea6ec15a3d3aded2279ecd9226  linux-sdm845-6.9.0-r2.tar.gz
+8a5e7b40e82196bcf7c160a3e6de34b7b0328431af7b4ac636d9687035e40f542f05424dc918443ea020067b900d8b87f62d17827e1d192f2f68917034c43a08  config-postmarketos-qcom-sdm845.aarch64
 "
@@ -2,21 +2,20 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 6.9.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130201
-CONFIG_CLANG_VERSION=0
-CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_CC_VERSION_TEXT="clang version 17.0.6"
+CONFIG_GCC_VERSION=0
+CONFIG_CC_IS_CLANG=y
+CONFIG_CLANG_VERSION=170006
+CONFIG_AS_IS_LLVM=y
+CONFIG_AS_VERSION=170006
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
+CONFIG_PAHOLE_VERSION=126
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -110,6 +109,7 @@ CONFIG_BPF_JIT=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
 CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
+# CONFIG_BPF_LSM is not set
 # end of BPF subsystem

 CONFIG_PREEMPT_BUILD=y
@@ -173,11 +173,9 @@ CONFIG_UCLAMP_BUCKETS_COUNT=5
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
-CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough"
 CONFIG_GCC10_NO_ARRAY_BOUNDS=y
-CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
-CONFIG_CC_NO_STRINGOP_OVERFLOW=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -191,7 +189,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=n
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -226,7 +224,9 @@ CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_ZSTD=y
-# CONFIG_BOOT_CONFIG is not set
+CONFIG_BOOT_CONFIG=y
+# CONFIG_BOOT_CONFIG_FORCE is not set
+# CONFIG_BOOT_CONFIG_EMBED is not set
 CONFIG_INITRAMFS_PRESERVE_MTIME=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -276,6 +276,7 @@ CONFIG_PERF_EVENTS=y

 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y

 #
 # Kexec and crash features
@@ -291,7 +292,7 @@ CONFIG_CRASH_DUMP=y
 # end of General setup

 CONFIG_ARM64=y
-CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
+CONFIG_CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARM64_CONT_PTE_SHIFT=4
@@ -515,6 +516,7 @@ CONFIG_ARM64_TLB_RANGE=y
 #
 CONFIG_AS_HAS_ARMV8_5=y
 CONFIG_ARM64_BTI=y
+CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARM64_AS_HAS_MTE=y
@@ -712,6 +714,7 @@ CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -765,6 +768,7 @@ CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_LTO_NONE=y
 CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
+# CONFIG_CFI_CLANG is not set
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -824,10 +828,9 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling

 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FUNCTION_ALIGNMENT=4
+CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
 # end of General architecture-dependent options

 CONFIG_RT_MUTEXES=y
@@ -1513,6 +1516,7 @@ CONFIG_NET_FLOW_LIMIT=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
 # end of Network testing
 # end of Networking options

@@ -1533,7 +1537,6 @@ CONFIG_BT_LEDS=y
 # CONFIG_BT_AOSPEXT is not set
 # CONFIG_BT_DEBUGFS is not set
 # CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_FEATURE_DEBUG is not set

 #
 # Bluetooth device drivers
@@ -1769,6 +1772,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Firmware loader
 #
 CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_DEBUG=y
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_FW_LOADER_COMPRESS is not set
@@ -2604,12 +2608,14 @@ CONFIG_ATH10K_SNOC=m
 CONFIG_ATH10K_DEBUG=y
 CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K_SPECTRAL=y
+# CONFIG_ATH10K_TRACING is not set
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_ATH11K=m
 CONFIG_ATH11K_AHB=m
 CONFIG_ATH11K_PCI=m
 # CONFIG_ATH11K_DEBUG is not set
+# CONFIG_ATH11K_TRACING is not set
 # CONFIG_ATH12K is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 # CONFIG_AT76C50X_USB is not set
@@ -2806,6 +2812,8 @@ CONFIG_MOUSE_ELAN_I2C_I2C=y
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_SMT_FTS_DOWNSTREAM is not set
+# CONFIG_TOUCHSCREEN_FTM4 is not set
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
@@ -4518,6 +4526,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9882T=m
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
+CONFIG_DRM_PANEL_LG_SW43408=y
 # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set
 CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
@@ -6526,6 +6535,7 @@ CONFIG_QCOM_KRYO_L2_ACCESSORS=y
 CONFIG_QCOM_MDT_LOADER=y
 CONFIG_QCOM_OCMEM=y
 CONFIG_QCOM_PDR_HELPERS=y
+# CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 CONFIG_QCOM_PMIC_GLINK=m
 CONFIG_QCOM_QMI_HELPERS=y
 # CONFIG_QCOM_RAMP_CTRL is not set
@@ -7368,6 +7378,7 @@ CONFIG_STM=m
 # CONFIG_STM_DUMMY is not set
 # CONFIG_STM_SOURCE_CONSOLE is not set
 # CONFIG_STM_SOURCE_HEARTBEAT is not set
+# CONFIG_STM_SOURCE_FTRACE is not set
 # CONFIG_INTEL_TH is not set
 # CONFIG_HISI_PTT is not set
 # end of HW tracing support
@@ -7686,7 +7697,7 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_ISO8859_8 is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
@@ -7765,7 +7776,6 @@ CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y
 # CONFIG_INIT_STACK_NONE is not set
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
 CONFIG_INIT_STACK_ALL_ZERO=y
-# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
@@ -7779,9 +7789,9 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # end of Hardening of kernel data structures

+CONFIG_CC_HAS_RANDSTRUCT=y
 CONFIG_RANDSTRUCT_NONE=y
 # CONFIG_RANDSTRUCT_FULL is not set
-# CONFIG_RANDSTRUCT_PERFORMANCE is not set
 # end of Kernel hardening options
 # end of Security options

@@ -8071,6 +8081,7 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+# CONFIG_TRACE_MMIO_ACCESS is not set

 #
 # Crypto library routines
@@ -8230,8 +8241,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DYNAMIC_DEBUG_CORE is not set
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DYNAMIC_DEBUG_CORE=y
 CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
@@ -8253,12 +8264,13 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
 # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
 # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_PAHOLE_HAS_SPLIT_BTF=y
+CONFIG_PAHOLE_HAS_BTF_TAG=y
+CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
 # CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
 # CONFIG_HEADERS_INSTALL is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
@@ -8301,6 +8313,7 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_TABLE_CHECK is not set
 # CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 CONFIG_ARCH_HAS_DEBUG_WX=y
 # CONFIG_DEBUG_WX is not set
@@ -8411,6 +8424,7 @@ CONFIG_RCU_TRACE=y
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
+CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y
@@ -8420,8 +8434,43 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
 CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
+CONFIG_FTRACE=y
+CONFIG_BOOTTIME_TRACING=y
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+# CONFIG_OSNOISE_TRACER is not set
+# CONFIG_TIMERLAT_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_TRACER_SNAPSHOT is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+# CONFIG_SYNTH_EVENTS is not set
+# CONFIG_USER_EVENTS is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACE_EVENT_INJECT is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_RV is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
@@ -8494,6 +8543,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_TEST_DYNAMIC_DEBUG is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
@@ -0,0 +1,2 @@
+# DMC fw is required on newer GPUs to enable lower power states
+/lib/firmware/i915/*_dmc*
@@ -1,8 +1,8 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=oem-intel
 pkgdesc="Intel device support"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -18,11 +18,16 @@ subpackages="
 	$pkgname-libva
 	$pkgname-vulkan
 "
-source="00-oem-intel.modules"
+source="
+	00-oem-intel.modules
+	00-oem-intel-i915-firmware.files
+	"

 package() {
 	install -Dm644 00-oem-intel.modules \
 		-t "$pkgdir"/usr/share/mkinitfs/modules
+	install -Dm644 00-oem-intel-i915-firmware.files \
+		-t "$pkgdir"/usr/share/mkinitfs/files
 }

 libva() {
@@ -43,4 +48,5 @@ vulkan() {

 sha512sums="
 48b8c0454c8c80e7ad0ebd139c01790eed3fbd4265bf4ce64882d354b091ac7f63084eaf2b00d1244a7a692c73fa900193724577f9a8d753fa8b6743fe1c8990  00-oem-intel.modules
+c17f5c505e0e280a9e51ac1b4264e7703b744fd3831d75ce95f41be4755ae4ccd24b7ca09ba1e236df499a5e748c64a0d2054c9d55d8c8c713fa8c5646ed9a3c  00-oem-intel-i915-firmware.files
 "
@@ -1,7 +1,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=firmware-brcm43752
-pkgver=0.3_git20230613
-pkgrel=0
+pkgver=3_git20230613
+pkgrel=1
 _commit="84b8b00f57a9495c05190477c5895cd66f69b873"
 pkgdesc="Firmware for the Broadcom brcm43752 Wifi/BT adapter"
 url="https://source.puri.sm/Librem5/firmware-brcm43752-nonfree"
@@ -12,10 +12,8 @@ source="https://source.puri.sm/Librem5/firmware-brcm43752-nonfree/-/archive/$_co
 builddir="$srcdir/firmware-brcm43752-nonfree-$_commit"

 package() {
-
-	for f in brcmfmac43752-sdio.bin brcmfmac43752-sdio.clm_blob brcmfmac43752-sdio.txt BCM4362A2.hcd; do
-		install -Dm644 firmware/brcm/"$f" "$pkgdir/lib/firmware/postmarketos/brcm/$f"
-	done
+	mkdir -p "$pkgdir/lib/firmware/postmarketos"
+	cp -r "$builddir/firmware/brcm" "$pkgdir/lib/firmware/postmarketos"
 }

 sha512sums="
@@ -3,10 +3,10 @@
 # Co-Maintainer: Alistair Francis <alistair@alistair23.me>
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=linux-purism-librem5
-pkgver=6.6.29
+pkgver=6.6.32
 pkgrel=0
 # NOTE: Don't forget to rebase the config! See prepare() for instructions.
-_purismrel=1
+_purismrel=2
 # <kernel ver>.<purism kernel release>
 _purismver=${pkgver}pureos$_purismrel
 pkgdesc="Purism Librem 5 phone kernel fork"
@@ -83,6 +83,6 @@ package() {
 }

 sha512sums="
-bf333875ee04550eff77527d2f6ce0a07d89e585e678e9bd2cd6a596a402f515ea555a906ddaa659a2c0ab5b0a8839544853720e5a821c93749c9d3389efc6e6  linux-purism-librem5-6.6.29pureos1.tar.gz
-1310b92498585fe141f8285df3a1705132dfe8d84453e51c358cd7d20df755901e1a6c94166e09e2d5961eb9cd597be06b25290b3010caea7aac789ff020c5f9  config-purism-librem5.aarch64
+42242ccc182fe8ca73207e4c5ce824ba9f9b194e068fb49a280777e3dbd7326a446a098aecc7ebbf28cf4cb3d9c3f62837d9f718623652dfa50e7cc1bc807773  linux-purism-librem5-6.6.32pureos2.tar.gz
+603356f7cd756c0e93f1cbeca38bda7c34db27c13abb5db30786e51967bf94fa19ed6e3925d13c5ebb06d43db5c5fa75fba847d81c0f213a48cf72373eff1622  config-purism-librem5.aarch64
 "
@@ -0,0 +1,31 @@
+From c977b184350479b8c43a0e002eaf2b13b510ba4f Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <msuchanek@suse.de>
+Date: Thu, 13 Oct 2022 22:39:51 +0200
+Subject: [PATCH] libfdt: Fix invalid version warning
+
+python does not like the u-boot- prefix in the version, drop it.
+
+/usr/lib/python3.10/site-packages/setuptools/dist.py:544: UserWarning:
+The version specified ('u-boot-2022.10') is an invalid version, this may
+not work as expected with newer versions of setuptools, pip, and PyPI.
+Please see PEP 440 for more details.
+
+Signed-off-by: Michal Suchanek <msuchanek@suse.de>
+Reviewed-by: Simon Glass <sjg@chromium.org>
+---
+ scripts/dtc/pylibfdt/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile
+index 493995e30384..a7579f0c5f67 100644
+--- a/scripts/dtc/pylibfdt/Makefile
+++ b/scripts/dtc/pylibfdt/Makefile
+@@ -17,7 +17,7 @@ quiet_cmd_pymod = PYMOD   $@
+       cmd_pymod = unset CROSS_COMPILE; unset CFLAGS; \
+ 		CC="$(HOSTCC)" LDSHARED="$(HOSTCC) -shared " \
+ 		LDFLAGS="$(HOSTLDFLAGS)" \
+-		VERSION="u-boot-$(UBOOTVERSION)" \
+		VERSION="$(UBOOTVERSION)" \
+ 		CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
+ 		SOURCES="$(PYLIBFDT_srcs)" \
+ 		SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \
@@ -4,7 +4,7 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=u-boot-librem5
 pkgver=2022.10
-pkgrel=1
+pkgrel=2
 # 'upstream/librem5' branch in uboot repo
 _commit="c4960dade272da9d6a7f53f6956d4d6747d573e9"
 # 'librem5' branch in atf repo
@@ -34,6 +34,7 @@ source="
 	https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-$_firmwareversion.bin
 	update-u-boot
 	0001-librem5-enable-console-on-UART4.patch
+	0002-libfdt-Fix-invalid-version-warning.patch
 	"
 install="$pkgname.post-upgrade"
 install="$pkgname.post-upgrade $pkgname-devkit.post-upgrade"
@@ -117,4 +118,5 @@ d35e46b94ebf50a7ffcedf824f19bca5195cbf0bbcee1dd6cea115f090a3a963975e6eaaa33eac62
 1f968558bf158401ee5afe1c67e67bdd8ca2cb5d07029e78c745e751c665b68fa74128fca8b7161501a6445bbb18e8d463b42d787a61132db5c8778703462668  firmware-imx-8.12.bin
 e46a863001872943301f9712e45797553ce52d8b0c3e63dba7beb1a54b857e8f3a715863b84cd7ab784f039f82d29a2b19b581891d11a84c342b1570e5ccfed3  update-u-boot
 f5c8a49bda189639386f2367418ab492f10e0e3c0c3f4ca078c461c0cf4427e113a90f49c37f01ef4db0a6e0f55d4f0a6346777e291918866821e659077e374a  0001-librem5-enable-console-on-UART4.patch
+895a6e7794257a2b13ecd4e10426d1539338b3ed2000df99ec94c7a319154895794a60aeae2946f4ca32d37095e4142ebbdb049bbccf70f257e77e977b1cedf8  0002-libfdt-Fix-invalid-version-warning.patch
 "
@@ -1,30 +0,0 @@
-# Maintainer: Leandro Friedrich <email@leandrofriedrich.de>
-# Co-Maintainer: map220v <map220v300@gmail.com>
-pkgname=alsa-ucm-conf-samsung-sm7125
-pkgver=1.1
-pkgrel=0
-pkgdesc="ALSA Use Case Manager configuration for Samsung Galaxy Phones based on Qualcomm's SM7125 SoC"
-url="https://alsa-project.org"
-arch="aarch64"
-license="BSD-3-Clause"
-source="
-	sm7125_GalaxyA52_HiFi.conf
-	sm7125_GalaxyA52.conf
-"
-options="!check" # no tests
-depends="alsa-ucm-conf"
-replaces="alsa-ucm-conf"
-
-package() {
-	install -Dm644 "$srcdir/sm7125_GalaxyA52.conf" \
-		"$pkgdir/usr/share/alsa/ucm2/conf.d/sm8250/Galaxy A52.conf"
-	install -Dm644 "$srcdir/sm7125_GalaxyA52.conf" \
-		"$pkgdir/usr/share/alsa/ucm2/conf.d/sm8250/Galaxy A72.conf"
-	install -Dm644 "$srcdir/sm7125_GalaxyA52_HiFi.conf" \
-		"$pkgdir/usr/share/alsa/ucm2/Samsung/a52q/HiFi.conf"
-}
-
-sha512sums="
-79fd2c205785333018612a17560e3c03956e7847c83820ff3b21a68c4bd4c9dab8410d781af64fb812d6df9abdf56370cc4079d37ea03c4714cf699f287c4562  sm7125_GalaxyA52_HiFi.conf
-5bef7639487dea0853c89d55fd9adf28189b0a1439b9edb7278ef4ef15784c93017844e2947e0e16648cb31ce4a62cf77455c706b0377398530421d1b07d54c2  sm7125_GalaxyA52.conf
-"
@@ -1,10 +0,0 @@
-# Use case configuration for Galaxy A52/A72
-# Author: map220v <map220v300@gmail.com>
-# Author: Leandro Friedrich <email@leandrofriedrich.de>
-
-Syntax 3
-
-SectionUseCase."HiFi" {
-	File "/Samsung/a52q/HiFi.conf"
-	Comment "HiFi quality Music."
-}
@@ -1,36 +0,0 @@
-# Use case configuration for Galaxy A52/A72
-# Author: map220v <map220v300@gmail.com>
-# Author: Leandro Friedrich <email@leandrofriedrich.de>
-
-SectionVerb {
-	EnableSequence [
-		# SPEAKER PLAYBACK
-		cset "name='Left ASI1 Sel' Left"
-		cset "name='Right ASI1 Sel' Right"
-		# Enable Quinary MI2S mixer on MultiMedia1
-		cset "name='QUIN_MI2S_RX Audio Mixer MultiMedia1' 1"
-	]
-
-	DisableSequence [
-		# Disable Quinary MI2S mixer on MultiMedia1
-		cset "name='QUIN_MI2S_RX Audio Mixer MultiMedia1' 0"
-	]
-
-	# Set initial volumes
-	BootSequence [
-	]
-
-	Value {
-		TQ "HiFi"
-	}
-}
-
-SectionDevice."Speaker" {
-	Comment "Speaker playback"
-
-	Value {
-		PlaybackPriority 150
-		PlaybackPCM "hw:${CardId},0"
-		PlaybackChannels 2
-	}
-}
@@ -0,0 +1,41 @@
+# Maintainer: Andreas Kemnade <andreas@kemnade.info>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-epson-embt2ws
+pkgdesc="Epson Moverio BT-200"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	linux-epson-embt2ws
+	postmarketos-base
+	u-boot-epson-embt2ws
+	u-boot-tools
+"
+_pmb_recommends="linux-firmware-ti-connectivity"
+makedepends="devicepkg-dev"
+
+source="
+	deviceinfo
+	modules-initfs
+	sdboot.cmd
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+	mkimage -A arm -O linux -T script -n postmarketOS \
+		-d "$srcdir"/sdboot.cmd "$srcdir/sdboot.scr"
+	install -Dm644 "$srcdir/sdboot.scr" "$pkgdir/boot/sdboot.scr"
+}
+
+sha512sums="
+9b4b61df13463565f18044672690ffd559d89121dda8b84930f7f78829f18565e4c91d5e5eb921a035825abdd7aa18f0aa2bf99edfd432e631f277cf17eb1c4e  deviceinfo
+e6d26536578432bd1d9123d3b3eb621e39d5475e5ce9086c42fae213be6fa05d56bd6b42d08f6f5afccffe5b01ca940239c11b8046e0be1a5962ac95a0b0dfa4  modules-initfs
+2c3a39107dd6c061d001d11211b816fc0e1fb060e0bcbf0fcf057d7910a7dcc4d1d06c6b0572ee0d616f1d06679ca48872395f62c1f44f5460cceefbbd2b5050  sdboot.cmd
+"
@@ -0,0 +1,28 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Epson Moverio BT-200"
+deviceinfo_manufacturer="Epson"
+deviceinfo_codename="epson-embt2ws"
+deviceinfo_year="2014"
+deviceinfo_arch="armv7"
+deviceinfo_dtb="omap4-epson-embt2ws"
+deviceinfo_kernel_cmdline="console=ttyS2,115200"
+deviceinfo_generate_extlinux_config="true"
+# Device related
+# chassis = touchpad with buttons + glasses
+deviceinfo_chassis="embedded"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_boot_part_start="2048"
+deviceinfo_boot_filesystem="fat32"
+deviceinfo_getty="ttyS2;115200"
+deviceinfo_no_framebuffer="true"
+
+deviceinfo_sd_embed_firmware_step_size="512"
+deviceinfo_sd_embed_firmware="u-boot/epson-embt2ws/MLO:256,u-boot/epson-embt2ws/u-boot.img:512"
@@ -0,0 +1,2 @@
+phy-omap-usb2
+phy-twl6030-usb
@@ -0,0 +1,6 @@
+# secret
+# md5sum("# secret") should be 92b12a37d1913ac41d2956120a475aca
+# for avoiding hassle with factory u-boot
+# secret has not yet been found
+fatload mmc 0:1 0x80800000 /u-boot-ml.bin
+go 0x80800000
@@ -3,7 +3,7 @@
 pkgname=device-google-peach-pi
 pkgdesc="Samsung Chromebook 2 (13.3 inch)"
 pkgver=6
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,6 +14,7 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-initramfs-minimal
 "
 makedepends="devicepkg-dev"
 source="
@@ -0,0 +1,2 @@
+[quirks]
+fbdev_force_refresh=true
@@ -2,7 +2,7 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -19,6 +19,7 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="
+	10-unl0kr-msm.conf
 	90-feedbackd-drv2624.rules
 	deviceinfo
 	modules-initfs
@@ -35,6 +36,8 @@ package() {

 	install -Dm644 "$srcdir"/90-feedbackd-drv2624.rules \
 		-t "$pkgdir"/usr/lib/udev/rules.d
+	install -Dm644 "$srcdir"/10-unl0kr-msm.conf \
+		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr-msm.conf
 }

 nonfree_firmware() {
@@ -54,8 +57,9 @@ nonfree_firmware() {
 }

 sha512sums="
+f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr-msm.conf
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 8af19da4e4a4a59c49263722065229fae849c3273af313300b7ea1b8fe008c6e55cfd060b91909306dd600134e2494f740adda245707dbcff84b1ab2f37dbde7  deviceinfo
-1eb5f138619f499fab31ea64f63ee9f8984f195528708ec6a01ddc533c74cfb71d1442b97905ae15db24b8faac259fa3e89db357ca9c747ce3ee598c2d681639  modules-initfs
+9e2bd634e8f0104827991c5ce7b2346187310a6362f47a67d16e2bd93a910e8ec49f6b98608908febb7cecde14687af094bd95b8b3c1f8122d3710333ecf417e  modules-initfs
 7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
 "
@@ -1,3 +1,9 @@
+dispcc_sdm845
+drm_exec
+gpu_sched
 i2c_qcom_geni
+mdt_loader
+msm
+panel_samsung_s6e3fa7
 rmi_core
 rmi_i2c
@@ -2,7 +2,7 @@
 pkgname=device-google-spring
 pkgdesc="HP Chromebook 11 G1"
 pkgver=2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-initramfs-minimal
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
@@ -0,0 +1,39 @@
+# Maintainer: Andreas Kemnade <andreas@kemnade.info>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-kobo-clara2e
+pkgdesc="Kobo Clara 2E"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	linux-postmarketos-imx-ereader
+	kobo-epdc-extractor
+	postmarketos-base
+	u-boot-kobo-clara2e
+"
+_pmb_recommends="
+	linux-firmware-mrvl
+	linux-firmware-nxp
+"
+makedepends="devicepkg-dev"
+
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+57a6c9fbf96f3adeb64462a859226fa846a0b1344667cf1b143f79e0c736b18be6be16d26856b48a77a819c7beb6fd6255fcceb57b1010a870aef369e2a21f10  deviceinfo
+90da9f4f7833af6286c7dad81c5601bb2e35f814f501d02d9e37a80f35c453ae8b8a5c49ed36fcb5b35eef1d81280679a82ef80a60b4bca373a33b0b8f881511  modules-initfs
+"
@@ -0,0 +1,29 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Kobo Clara 2E"
+deviceinfo_manufacturer="Kobo"
+deviceinfo_codename="kobo-clara2e"
+deviceinfo_year="2022"
+deviceinfo_arch="armv7"
+deviceinfo_dtb="imx6sll-kobo-clara2e-a"
+deviceinfo_kernel_cmdline="console=ttymxc0,115200"
+deviceinfo_generate_extlinux_config="true"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1072"
+deviceinfo_screen_height="1448"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_boot_part_start="49152"
+deviceinfo_getty="ttymxc0;115200"
+deviceinfo_no_framebuffer="true"
+
+deviceinfo_sd_embed_firmware_step_size="512"
+deviceinfo_sd_embed_firmware="u-boot/kobo-clara2e/u-boot.imx:2"
@@ -0,0 +1 @@
+mxc_epdc_drm
@@ -0,0 +1,45 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Danct12 <danct12@disroot.org>
+pkgname=device-pine64-pinetab2
+pkgdesc="Pine64 PineTab 2"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	mesa-egl
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+_pmb_recommends="firmware-bestechnic-bes2600"
+subpackages="
+	$pkgname-kernel-v0:kernel_v0
+	$pkgname-kernel-v2:kernel_v2
+	"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+kernel_v0() {
+	pkgdesc="Kernel for PineTab 2 Dev Units"
+	depends="linux-pine64-pinetab2"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_v2() {
+	pkgdesc="Kernel for PineTab 2 Early Adopter"
+	depends="linux-pine64-pinetab2"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+sha512sums="
+80ba9d116dfaf3cdc0c3baf6048974160150d3b59d6fcd5188801edb938ca8caa7e0d1581f2fe9340bb0b23635432405fad0ecdd45e94cd82c32adb5eeb8e804  deviceinfo
+"
@@ -0,0 +1,23 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="PINE64 PineTab 2"
+deviceinfo_manufacturer="PINE64"
+deviceinfo_codename="pine64-pinetab2"
+deviceinfo_year="2023"
+deviceinfo_dtb_v0="rockchip/rk3566-pinetab2-v0.1"
+deviceinfo_dtb_v2="rockchip/rk3566-pinetab2-v2.0"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_kernel_cmdline="earlycon=uart8250,mmio32,0xfe660000 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
@@ -2,7 +2,7 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-qcom-msm8916
 pkgdesc="Generic device package for various Qualcomm MSM8916/MSM8939-based devices"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -59,5 +59,5 @@ kernel_efi() {

 sha512sums="
 965af8d7c00e4c88883669fa69bd44d340525fa6283cc92f15f2b8c554c432a3e66408b55419a913afe16e317075e0d16d6d19913bddde8394e52adf5e027ef7  deviceinfo
-28aae94b3367677dad685901c71bad36d79635942b749a54628922210bbf8bcf962707e25115d3012d653c48106e5e77db2b54216fef05641ac4bc1c8496c6ae  modules-initfs
+80b037998756dab0c6b2a3bb438fb2d6bf727148c4af29648074b85c3beacdbbbffb2fefd477e68904d4c3bedb76bf0e532719a15a3bb7c8ef5f922be0d73c1d  modules-initfs
 "
@@ -1,5 +1,6 @@
 adv7511
 display-connector
+panel-acer-a1-724-hx8394d
 panel-alcatel-auo-hx8394d
 panel-alcatel-idol3-nt35596
 panel-alcatel-idol3-r63315
@@ -1,47 +0,0 @@
-# Maintainer: Leandro Friedrich <email@leandrofriedrich.de>
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-a52q
-pkgdesc="Samsung Galaxy A52"
-pkgver=1
-pkgrel=4
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	linux-postmarketos-qcom-sm7125
-	mkbootimg
-	postmarketos-base
-	soc-qcom-sm7125
-	alsa-ucm-conf-samsung-sm7125
-"
-makedepends="devicepkg-dev"
-source="deviceinfo"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Firmware for GPU, Audio, Modem, WiFi, etc."
-	depends="
-		firmware-samsung-a52q-adreno
-		firmware-samsung-a52q-adsp
-		firmware-samsung-a52q-cdsp
-		firmware-samsung-a52q-ipa
-		firmware-samsung-a52q-modem
-		firmware-samsung-a52q-wlan
-		firmware-samsung-a52q-bluetooth
-		firmware-samsung-a52q-venus
-	"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-b2e3c34e0539b72561f90f1b12da782831cbd52b385bda643dd23f6ec31f83dfbc09c474e1020c6617946e1876ebebd95db863af95a8bd14f1fc718e3b8a8576  deviceinfo
-"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a6lte
 pkgdesc="Samsung Galaxy A6 2018"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,6 +29,7 @@ source="
 	etc-init.d-wlan0-up
 	etc-lightdm-lightdm.conf
 	etc-NetworkManager-conf.d-swlan0-unmanaged.conf
+	etc-NetworkManager-conf.d-wlan0-preserve-mac.conf
 	usr-libexec-samsungipcd-voicecall.sh
 	usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf
 	usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf
@@ -54,7 +55,6 @@ package() {
 	install -Dm644 etc-conf.d-samsungipcd "$pkgdir"/etc/conf.d/samsungipcd
 	install -Dm755 etc-init.d-wlan0-up "$pkgdir"/etc/init.d/wlan0-up
 	install -Dm644 etc-lightdm-lightdm.conf "$pkgdir"/etc/lightdm/lightdm.conf
-	install -Dm644 etc-NetworkManager-conf.d-swlan0-unmanaged.conf "$pkgdir"/etc/NetworkManager/conf.d/swlan0-unmanaged.conf
 	install -Dm755 usr-libexec-samsungipcd-voicecall.sh "$pkgdir"/usr/libexec/samsungipcd/voicecall.sh
 	install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/HiFi.conf
 	install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-Universal7870-I.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/Universal7870-I.conf
@@ -90,6 +90,8 @@ downstream_quirks() {
 	install="$subpkgname.post-install"
 	install -Dm755 etc-init.d-udev-settle "$subpkgdir"/etc/init.d/udev-settle
 	install -Dm755 etc-init.d-hciattach-ttySAC0 "$subpkgdir"/etc/init.d/hciattach-ttySAC0
+	install -Dm644 etc-NetworkManager-conf.d-swlan0-unmanaged.conf "$pkgdir"/etc/NetworkManager/conf.d/swlan0-unmanaged.conf
+	install -Dm644 etc-NetworkManager-conf.d-wlan0-preserve-mac.conf "$pkgdir"/etc/NetworkManager/conf.d/wlan0-preserve-mac.conf
 	# we run bootmac ourselves and don't want it to trigger from the udev rule
 	# so remove the rule
 	install -Dm755 /dev/null "$subpkgdir"/usr/lib/udev/rules.d/90-bootmac.rules
@@ -104,6 +106,7 @@ bfe2b5455084554d9dc8d30ec5ff72564cfe9574618d0ccc6d544f336d2869bd18a8617ddb3d5873
 203b832a7080d5f1351c5e024e444f9fe509f6e0fd4b376a60c7d73359b7e356863a4f15caf9b2e4e733dc44d2971722083e7c69ca94a012eb004b4b8ded9d09  etc-init.d-udev-settle
 7caddfe4659c969a33adcc27a760bc78d4f70ca4b7a4a5ec28a6411c12f3e6dd6d427b59f75976a737a5fe0f09806f8b6d65798f6358bd1e1954ad2a28fbfdc8  etc-init.d-wlan0-up
 861270c6bc0b2a3e6cd389c21c8c895e62de8cf8bec6fcf23c178f8cbaae855d62b0ee98692671ab4f518d84cb43dd0b2fe46f5a609f65af6a6c06e0fdbb6d0c  etc-lightdm-lightdm.conf
+5c3a692f22a29fca792c114c6d94ff1bf0d6921f068f207a2894a8f99c73dcc319e7c803ed7adfe64eb3e60088f37e2a2730118b2ed57aa01b35415664085567  etc-NetworkManager-conf.d-wlan0-preserve-mac.conf
 ef24527b13e48a9153643f3713167d3d08486e7de8b4c94d7c446ff380396115890573d8cd4aa5448766d9e779e189833a83e7921081679bd348c3f8a59410af  etc-NetworkManager-conf.d-swlan0-unmanaged.conf
 abe1c4a2f59fe862cebef75c54b8806bd86ce06aeb15d8c0699ab1338c9d575cb72a4d5b099f94272b1d9c9c3f4960af209a9e058ea9e57733b7d905dad0d33f  usr-libexec-samsungipcd-voicecall.sh
 2169590d10d6123575d43e8ff7dc0d2ba824f8266d9fa75a5b59a4cc5753e47e327368b777082930d6b7a7aed6f57fa6ac2c5a2e816e1e12cd1032a8bb1822b5  usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf
@@ -0,0 +1,2 @@
+[connection]
+wifi.cloned-mac-address=preserve
@@ -1,48 +0,0 @@
-# Maintainer: map220v <map220v300@gmail.com>
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-a72q
-pkgdesc="Samsung Galaxy A72"
-pkgver=1
-pkgrel=4
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	alsa-ucm-conf-samsung-sm7125
-	linux-postmarketos-qcom-sm7125
-	mkbootimg
-	postmarketos-base
-	soc-qcom-sm7125
-"
-makedepends="devicepkg-dev"
-source="deviceinfo"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Firmware for GPU, Audio, Modem, WiFi, etc."
-	depends="
-		firmware-samsung-a72q-adreno
-		firmware-samsung-a72q-adsp
-		firmware-samsung-a72q-cdsp
-		firmware-samsung-a72q-ipa
-		firmware-samsung-a72q-modem
-		firmware-samsung-a72q-wlan
-		firmware-samsung-a72q-bluetooth
-		firmware-samsung-a72q-venus
-		linux-firmware-ath10k
-	"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-0df29e44ee8cfd796740b2ee3752ee67cfab11b6adf39214ea4ca4be416cbf97e46a0b66eadd1e9b0bf7a92233d7747817e72756ade34d23c2b53150f78926aa  deviceinfo
-"
@@ -1,38 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy A72"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-a72q"
-deviceinfo_year="2021"
-deviceinfo_dtb="qcom/sm7125-samsung-a72q"
-deviceinfo_append_dtb="true"
-deviceinfo_arch="aarch64"
-deviceinfo_gpu_accelerated="true"
-
-# Device related
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="1080"
-deviceinfo_screen_height="2400"
-
-# Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="console=null"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_mkimage="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="4096"
-deviceinfo_flash_offset_base="0x00000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x02000000"
-deviceinfo_flash_offset_second="0x00000000"
-deviceinfo_flash_offset_tags="0x01e00000"
-deviceinfo_flash_heimdall_partition_kernel="BOOT"
-deviceinfo_flash_heimdall_partition_rootfs="SUPER"
-deviceinfo_rootfs_image_sector_size="4096"
-deviceinfo_flash_sparse="true"
@@ -2,7 +2,7 @@
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F/G9006/G9008/G9009W)"
 pkgver=7
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -11,6 +11,7 @@ depends="
 	lk2nd-msm8974
 	mkbootimg
 	postmarketos-base
+	postmarketos-initramfs-minimal
 	swclock-offset
 "
 makedepends="devicepkg-dev"
@@ -3,7 +3,7 @@
 pkgname=device-samsung-lt01
 pkgdesc="Samsung Galaxy Tab 3 8.0"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -46,8 +46,8 @@ package() {
 nonfree_firmware() {
 	pkgdesc="WiFi, Bluetooth, MFC firmware"
 	depends="
-		firmware-samsung-midas-bluetooth
-		firmware-samsung-midas-wifi
+		firmware-samsung-lt01-bluetooth
+		firmware-samsung-lt01-wifi
 		linux-firmware-s5p-mfc
 		"
 	mkdir "$subpkgdir"
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-skomer
 pkgdesc="Samsung Galaxy Xcover 2"
-pkgver=4
-pkgrel=6
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,12 +12,10 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-kwin
-	$pkgname-phosh
 "
 source="
 	deviceinfo
 	kwin.sh
-	phoc.ini
 "

 build() {
@@ -39,14 +37,7 @@ kwin() {
 	install -Dm644 "$srcdir"/kwin.sh "$subpkgdir"/etc/profile.d/kwin.sh
 }

-phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-			"$subpkgdir"/etc/phosh/phoc.ini
-}
-
 sha512sums="
 828a520f13bd3b60053b7f7f1651799add4545232a1a6b57c511a62da60859b621452a9aaa86a0f479e92fb6b411f4df7699acb64b2947565db38822e38cb379  deviceinfo
 685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  kwin.sh
-95576332f1ad579d30359df9a3efcc3f478c56688509b5c470a70e8ae41466dbb397fb6db7578b5c54e13795ab8cf869b5c63ba775951817a8bb3d4c682bdfd5  phoc.ini
 "
@@ -1,2 +0,0 @@
-[output:DSI-1]
-scale = 1.2
@@ -1,15 +1,20 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-clover
 pkgdesc="Xiaomi Mi Pad 4"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-qcom-adreno-a530
+	firmware-xiaomi-clover
 	mkbootimg
+	msm-firmware-loader
 	postmarketos-base
+	soc-qcom-sdm660
+	soc-qcom-sdm660-rproc
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -43,7 +48,7 @@ kernel_cloverplus() {
 }

 sha512sums="
-d3d0ca6a2a8edc471bd1087afa72dbb69d869e597e58867d437be4aa34b0b1dbd637d81c6835a0ba3d9f264ca6d24e7a0d77b892b7d35b48355f02e9e11b6bc7  deviceinfo
+bdc81c13e2ae7aa36f055bcc2b671cb83cb4ed906a0d6f5b6f50942b77606c5fbfde9094fcd1470fce296dcef7cbb7abc9ec0c062ef6c8b6441dd3d44ea3a93d  deviceinfo
 709e3b6b082189d3a84e56d624221a6d5e502cd3d2a61080979cabfc2f048dc90b45f2cf1dd79c095e74db726d5670d22772bdc1a3ab6c42f97cd6ac09c86946  modules-initfs.clover
 103ecf9d5005d44114fa644f61d059b5b22d5936ed71da460e55614ed9ec795595d4e9e2f2b79fb3511751edcf8e88ae134c5530ce037f86ae92c87768396e49  modules-initfs.cloverplus
 "
@@ -1,6 +1,5 @@
 # Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
+# Please use double quotes only. You can source this file in shell scripts.

 deviceinfo_format_version="0"
 deviceinfo_name="Xiaomi Mi Pad 4"
@@ -11,6 +10,7 @@ deviceinfo_dtb_clover="qcom/sdm660-xiaomi-clover"
 deviceinfo_dtb_cloverplus="qcom/sdm660-xiaomi-clover-plus"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
+deviceinfo_flash_kernel_on_update="true"

 # Device related
 deviceinfo_chassis="tablet"
@@ -22,7 +22,7 @@ deviceinfo_screen_height="1920"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_fastboot_partition_vbmeta="vbmeta"
-deviceinfo_kernel_cmdline="console=tty0 clk_ignore_unused PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline="ignore_loglevel PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
@@ -33,4 +33,3 @@ deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="4096"
-
@@ -2,15 +2,31 @@
 # Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-xiaomi-lavender
 pkgdesc="Xiaomi Redmi Note 7"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="linux-postmarketos-qcom-sdm660 mkbootimg postmarketos-base"
+depends="
+	firmware-xiaomi-lavender
+	firmware-qcom-adreno-a530
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+	soc-qcom-sdm660
+	soc-qcom-sdm660-rproc
+"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+subpackages="
+	$pkgname-kernel-boe:kernel_boe
+	$pkgname-kernel-tianma:kernel_tianma
+"
+source="
+	deviceinfo
+	modules-initfs.boe
+	modules-initfs.tianma
+"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -20,7 +36,19 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

+kernel_boe() {
+	pkgdesc="For Redmi Note 7 with BOE panel"
+	depends="linux-postmarketos-qcom-sdm660"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_tianma() {
+	pkgdesc="For Redmi Note 7 with Tianma panel"
+	depends="linux-postmarketos-qcom-sdm660"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
 sha512sums="
-eab75a375ba212afea4c7cdc0754d3eac6b7bb1631d3d98c992c84f3520edfd4abe9861e110cb9d797faf7a516d3dd0f1558b70623391745efe920739e58e6f6  deviceinfo
-029156e04ee0f9e20cf37d6fd0f52278ecc6a029b9ca86845a5e9a7b550ed1211b62f09e5ed36083061269d4e83b648788b87bbde0fba3cd1eb68675c47b79eb  modules-initfs
+b566c8bb8c38bca4313cef769e189be8eff8c53d1fb6cc7ec299e076595c13ea97ccca9af26b38c39ee30f15521d9d3aea97172dab4e00223f12175ad667f697  deviceinfo
+77f0b637ca0d6512da7964425c08f0b8c2d8ac40b784301055fc70769d15989713388dd098ee9ee89520a52ead96283f9898da6d87b6e0e70143ce5859f9b61b  modules-initfs.boe
+2985ce67fe3a5cd4cd03c9c5e7af072174775a97b4d26c40b025a82b33fead69f7cb4ac185db1b7b97d61b02ebdf56c88f77f55d2dd352ac2d7e47394563dbe2  modules-initfs.tianma
 "
@@ -6,11 +6,14 @@ deviceinfo_name="Xiaomi Redmi Note 7"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-lavender"
 deviceinfo_year="2019"
-deviceinfo_dtb="qcom/sdm660-xiaomi-lavender"
+deviceinfo_dtb_boe="qcom/sdm660-xiaomi-lavender-boe"
+deviceinfo_dtb_tianma="qcom/sdm660-xiaomi-lavender-tianma"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
+deviceinfo_flash_kernel_on_update="true"

 # Device related
+deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="handset"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
@@ -0,0 +1,2 @@
+msm
+panel-boe-td4320
@@ -1 +1,2 @@
+msm
 nt36xxx
@@ -0,0 +1,47 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: David Wronek <david@mainlining.org>
+pkgname=device-xiaomi-miatoll
+pkgdesc="Xiaomi Redmi Note 9 Pro / Redmi Note 9S"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	make-dynpart-mappings
+	mkbootimg
+	postmarketos-base
+	swclock-offset
+"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+
+subpackages="
+	$pkgname-kernel-curtana:kernel_curtana
+	$pkgname-kernel-joyeuse:kernel_joyeuse
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+kernel_curtana() {
+	pkgdesc="Xiaomi Redmi Note 9S. To know which model you have, visit https://wiki.postmarketos.org/wiki/Xiaomi-miatoll-variants"
+	depends="linux-postmarketos-qcom-sm7125"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_joyeuse() {
+	pkgdesc="Xiaomi Redmi Note 9 Pro (Global). To know which model you have, visit https://wiki.postmarketos.org/wiki/Xiaomi-miatoll-variants"
+	depends="linux-postmarketos-qcom-sm7125"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+sha512sums="
+8127f706f04c9e57902c3287ef088441fa3efd3d922805ef4957897f4b193e6c1b022b933834684b3db3d0d9739769dcb5084a556ef3cda77e80e8443401bccf  deviceinfo
+"
@@ -3,36 +3,43 @@
 # scripts.

 deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy A52"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-a52q"
-deviceinfo_year="2021"
-deviceinfo_dtb="qcom/sm7125-samsung-a52q"
-deviceinfo_append_dtb="true"
+deviceinfo_name="Xiaomi Redmi Note 9 Pro / Redmi Note 9S"
+deviceinfo_manufacturer="Xiaomi"
+deviceinfo_codename="xiaomi-miatoll"
+deviceinfo_year="2020"
 deviceinfo_arch="aarch64"
-deviceinfo_gpu_accelerated="true"
+deviceinfo_flash_kernel_on_update="true"

 # Device related
+deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="handset"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2400"

+# Kernel options
+deviceinfo_dtb_curtana="qcom/sm7125-xiaomi-curtana"
+deviceinfo_dtb_joyeuse="qcom/sm7125-xiaomi-joyeuse"
+deviceinfo_append_dtb="true"
+
 # Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
+deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="console=null"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
 deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x02000000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00000000"
-deviceinfo_flash_offset_tags="0x01e00000"
-deviceinfo_flash_heimdall_partition_kernel="BOOT"
-deviceinfo_flash_heimdall_partition_rootfs="SUPER"
-deviceinfo_rootfs_image_sector_size="4096"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
+
+# Required for devices using UFS as storage (instead of e.g. eMMC)
+deviceinfo_rootfs_image_sector_size="4096"
+
+# Support super partition flashing
+deviceinfo_super_partitions="/dev/sda17"
@@ -1,5 +1,5 @@
 # Maintainer: Danila Tikhonov <danila@jiaxyga.com>
-# Co-Maintainer: David Wronek <davidwronek@gmail.com>
+# Co-Maintainer: David Wronek <david@mainlining.org>
 # Reference: <https://postmarketos.org/devicepkg>

 pkgname=device-xiaomi-surya
@@ -0,0 +1,22 @@
+pkgname=firmware-bestechnic-bes2600
+pkgver=0_git20231227
+pkgrel=0
+_commit=7a305de61771a84f1264866b204cf172df6d9195
+pkgdesc="Firmware for Bestechnic BES2600 WLAN/BT combo chip"
+url="https://gitlab.com/pine64-org/bes2600-firmware"
+arch="all"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+source="https://gitlab.com/pine64-org/bes2600-firmware/-/archive/$_commit/bes2600-firmware-$_commit.tar.gz"
+builddir="$srcdir/bes2600-firmware-$_commit"
+
+package() {
+	mkdir -p "$pkgdir"/lib/firmware/postmarketos
+	mv firmware/bes2600 "$pkgdir"/lib/firmware/postmarketos
+
+	# This is not needed for initializing WLAN
+	rm "$pkgdir"/lib/firmware/postmarketos/bes2600/bes2600_factory.txt
+}
+sha512sums="
+1ba0c4473348711b201d3f78cf2a1d6b6ec88de48cd90e3c6137a1565a46e25925b9330dbaf40add3b47d485c388755262b60b275d97cd078118017df36155fa  bes2600-firmware-7a305de61771a84f1264866b204cf172df6d9195.tar.gz
+"
@@ -1,5 +1,5 @@
 pkgname=firmware-fairphone-fp5
-pkgver=20231122
+pkgver=20240417
 pkgrel=0
 pkgdesc="Firmware for Fairphone 5"
 subpackages="
@@ -17,7 +17,7 @@ arch="aarch64"
 license="proprietary"
 makedepends="pil-squasher"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="3f529aecb4a9c61299c5f93d1137c6870daf93d3"
+_commit="73b1f5451539063c161f805efd1717d6e8ee4070"
 source="https://github.com/FairBlobs/FP5-firmware/archive/$_commit/FP5-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP5-firmware-$_commit"

@@ -111,5 +111,5 @@ wpss() {
 }

 sha512sums="
-a1f52a30858b85784298fc0da239ab764a53123670ee3c2fdda3ee760d9ad34a1122d6c4601ae6fa38aa93918ed9e53b4e46eaf8eb2c5f86590be836a199ee32  FP5-firmware-3f529aecb4a9c61299c5f93d1137c6870daf93d3.tar.gz
+7c21f8ba33e34167555769ded52debb472552e421608b54c33f244edc9f1ff633400ae2bf21bfe8df00e6a138d8ed53b9edf5d6aa5c0cdd63308854881077f7e  FP5-firmware-73b1f5451539063c161f805efd1717d6e8ee4070.tar.gz
 "
@@ -1,97 +0,0 @@
-# Maintainer: Leandro Friedrich <email@leandrofriedrich.de>
-pkgname=firmware-samsung-a52q
-pkgver=20220820
-pkgrel=0
-pkgdesc="Firmware for Samsung Galaxy A52"
-subpackages="
-	$pkgname-adreno
-	$pkgname-adsp
-	$pkgname-cdsp
-	$pkgname-ipa
-	$pkgname-modem
-	$pkgname-venus
-	$pkgname-wlan
-	$pkgname-bluetooth
-	"
-url="https://github.com/budderbrot/a52q-firmware"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="3ec32aecf7837a34240702955f5d01a336cf0c2c"
-source="https://github.com/budderbrot/a52q-firmware/archive/$_commit/a52q-firmware-$_commit.tar.gz"
-builddir="$srcdir/a52q-firmware-$_commit"
-
-package() {
-	# parent package is empty
-	mkdir -p "$pkgdir"
-}
-
-adreno() {
-	pkgdesc="Samsung Galaxy A52 adreno firmware"
-
-	install -Dm644 "$builddir"/a6* -t \
-		"$subpkgdir/lib/firmware/qcom/"
-}
-
-adsp() {
-	pkgdesc="Samsung Galaxy A52 adsp firmware"
-
-	install -Dm644 "$builddir"/adsp* -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a52q/"
-}
-
-cdsp() {
-	pkgdesc="Samsung Galaxy A52 cdsp firmware"
-
-	install -Dm644 "$builddir"/cdsp* -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a52q/"
-}
-
-ipa() {
-	pkgdesc="Samsung Galaxy A52 ipa firmware"
-
-	install -Dm644 "$builddir"/ipa_fws.* -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a52q/"
-}
-
-modem() {
-	pkgdesc="Samsung Galaxy A52 modem firmware"
-
-	# cp because of the modem_pr directory
-	mkdir -p "$subpkgdir/lib/firmware/qcom/sm7125/a52q/"
-	cp -r "$builddir"/modem* \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a52q/"
-	find "$subpkgdir/lib/firmware/qcom/sm7125/a52q/" \
-		-type f -exec chmod 0644 {} \;
-}
-
-venus() {
-	pkgdesc="Samsung Galaxy A52 venus firmware"
-
-	install -Dm644 "$builddir"/venus.* -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a52q/"
-}
-
-wlan() {
-	pkgdesc="Samsung Galaxy A52 wlan firmware"
-
-	install -Dm644 "$builddir"/board-2.bin -t \
-		"$subpkgdir/lib/firmware/ath10k/WCN3990/hw1.0/"
-	install -Dm644 "$builddir"/firmware-5.bin -t \
-		"$subpkgdir/lib/firmware/ath10k/WCN3990/hw1.0/"
-	install -Dm644 "$builddir"/wlanmdsp.mbn -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a52q/"
-}
-
-bluetooth() {
-	pkgdesc="Samsung Galaxy A52 bluetooth firmware"
-
-	install -Dm644 "$builddir"/crbtfw21.tlv -t \
-		"$subpkgdir/lib/firmware/qca/"
-	install -Dm644 "$builddir"/crnv21.* -t \
-		"$subpkgdir/lib/firmware/qca/sm7125/a52q/"
-}
-
-sha512sums="
-fbd93fc61903d16489f531c8431e8e1a4d5c21c0ada0c998c619c3b5193506c2fc6b6b56d6dd3002f834955e5d884dd80519eee260a04c96319b125ffad4b60a  a52q-firmware-3ec32aecf7837a34240702955f5d01a336cf0c2c.tar.gz
-"
@@ -1,93 +0,0 @@
-# Maintainer: map220v <map220v300@gmail.com>
-pkgname=firmware-samsung-a72q
-pkgver=20220820
-pkgrel=0
-pkgdesc="Firmware for Samsung Galaxy A72"
-subpackages="
-	$pkgname-adreno
-	$pkgname-adsp
-	$pkgname-cdsp
-	$pkgname-ipa
-	$pkgname-modem
-	$pkgname-venus
-	$pkgname-wlan
-	$pkgname-bluetooth
-	"
-url="https://github.com/map220v/a72q-firmware"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="d279fb298ad9c9e7f23c23c8d88344d3724c5be9"
-source="https://github.com/map220v/a72q-firmware/archive/$_commit/a72q-firmware-$_commit.tar.gz"
-builddir="$srcdir/a72q-firmware-$_commit"
-
-package() {
-	# parent package is empty
-	mkdir -p "$pkgdir"
-}
-
-adreno() {
-	pkgdesc="Samsung Galaxy A72 adreno firmware"
-
-	install -Dm644 "$builddir"/a6* -t \
-		"$subpkgdir/lib/firmware/qcom/"
-}
-
-adsp() {
-	pkgdesc="Samsung Galaxy A72 adsp firmware"
-
-	install -Dm644 "$builddir"/adsp* -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a72q/"
-}
-
-cdsp() {
-	pkgdesc="Samsung Galaxy A72 cdsp firmware"
-
-	install -Dm644 "$builddir"/cdsp* -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a72q/"
-}
-
-ipa() {
-	pkgdesc="Samsung Galaxy A72 ipa firmware"
-
-	install -Dm644 "$builddir"/ipa_fws.* -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a72q/"
-}
-
-modem() {
-	pkgdesc="Samsung Galaxy A72 modem firmware"
-
-	# cp because of the modem_pr directory
-	mkdir -p "$subpkgdir/lib/firmware/qcom/sm7125/a72q/"
-	cp -r "$builddir"/modem* \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a72q/"
-	find "$subpkgdir/lib/firmware/qcom/sm7125/a72q/" \
-		-type f -exec chmod 0644 {} \;
-}
-
-venus() {
-	pkgdesc="Samsung Galaxy A72 venus firmware"
-
-	install -Dm644 "$builddir"/venus.* -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a72q/"
-}
-
-wlan() {
-	pkgdesc="Samsung Galaxy A72 wlan firmware"
-
-	install -Dm644 "$builddir"/wlanmdsp.mbn -t \
-		"$subpkgdir/lib/firmware/qcom/sm7125/a72q/"
-}
-
-bluetooth() {
-	pkgdesc="Samsung Galaxy A72 bluetooth firmware"
-
-	install -Dm644 "$builddir"/crbtfw21.tlv -t \
-		"$subpkgdir/lib/firmware/qca/"
-	install -Dm644 "$builddir"/crnv21.* -t \
-		"$subpkgdir/lib/firmware/qca/sm7125/a72q/"
-}
-
-sha512sums="
-1ccbbfb73bf949fe202d3333a59e39f2027ac5f67e536a8c28fa1154425b72a0a6a41eededa9af9b82292beefe4843e4e449fe84d87c31d5f2d6513004f04e18  a72q-firmware-d279fb298ad9c9e7f23c23c8d88344d3724c5be9.tar.gz
-"
@@ -0,0 +1,60 @@
+# Maintainer: knuxify <knuxify@gmail.com>
+pkgname=firmware-samsung-lt01
+pkgver=1.0
+pkgrel=0
+pkgdesc="Samsung Galaxy Tab 3 8.0 firmware"
+url="https://github.com/gr8nole/proprietary_vendor_samsung"
+arch="armv7"
+license="proprietary"
+_url="https://raw.githubusercontent.com/gr8nole/proprietary_vendor_samsung"
+_commit="38ea48dbc6a683874aaf3376b63fc97ff3823459"
+source="
+	bcm4334.hcd-$_commit::$_url/$_commit/lt01-common/proprietary/system/bin/bcm4334.hcd
+	brcmfmac4334-sdio.samsung,t310-$_commit.txt::$_url/$_commit/lt01wifi/proprietary/system/etc/wifi/nvram_net.txt
+	brcmfmac4334-sdio.samsung,t311-$_commit.txt::$_url/$_commit/lt013g/proprietary/system/etc/wifi/nvram_net.txt
+	brcmfmac4334-sdio.samsung,t315-$_commit.txt::$_url/$_commit/lt01lte/proprietary/system/etc/wifi/nvram_net.txt
+
+	"
+options="!check !strip !archcheck !spdx !tracedeps pmb:cross-native"
+builddir="$srcdir/proprietary_vendor_samsung-$_commit"
+subpackages="
+	$pkgname-bluetooth
+	$pkgname-wifi
+"
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+bluetooth() {
+	depends="$pkgname"
+
+	install -Dm644 "$srcdir"/bcm4334.hcd-$_commit \
+		"$subpkgdir"/lib/firmware/brcm/BCM4334B0.hcd
+}
+
+wifi() {
+	depends="$pkgname linux-firmware-brcm"
+
+	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,t310-$_commit.txt \
+		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t310.txt
+	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,t311-$_commit.txt \
+		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t311.txt
+	install -Dm644 "$srcdir"/brcmfmac4334-sdio.samsung,t315-$_commit.txt \
+		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t315.txt
+
+	ln -s /lib/firmware/brcm/brcmfmac4334-sdio.bin \
+		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t310.bin
+	ln -s /lib/firmware/brcm/brcmfmac4334-sdio.bin \
+		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t311.bin
+	ln -s /lib/firmware/brcm/brcmfmac4334-sdio.bin \
+		"$subpkgdir"/lib/firmware/brcm/brcmfmac4334-sdio.samsung,t315.bin
+
+}
+
+sha512sums="
+c688c49c291223bccd5e123c8654f9faf6e203bfd82179ea811f7d450e2c746d68fbd5d98e821daf839ea51df70ffbce32e1ae13b09b6ad90fe3de11337d5af7  bcm4334.hcd-38ea48dbc6a683874aaf3376b63fc97ff3823459
+1359b10a0cd043f02fa939e827e24aaa35cf03eee5e5a78f83437899c86e78d5b973b36a61535211bab5dd7e6d210065c1f81addd716caaac147fbfc6c70bac2  brcmfmac4334-sdio.samsung,t310-38ea48dbc6a683874aaf3376b63fc97ff3823459.txt
+81b722b2d5eb3446606a7b10001aeed7af8a8139379c8525d5ddd990a5b10dd3e2103c498d65c0e31cbda7bafc0988dc25b2d227b20dcdf88c5dc57eaa771956  brcmfmac4334-sdio.samsung,t311-38ea48dbc6a683874aaf3376b63fc97ff3823459.txt
+547780ac164b4a7a989965b1561fb318ae30187d2ad45ec0add001c037f2a732abcc73acf8be6f0aee55d28eccb89b992f7d30acd9872d1998682d9110eec09e  brcmfmac4334-sdio.samsung,t315-38ea48dbc6a683874aaf3376b63fc97ff3823459.txt
+"