firmware-xiaomi-beryllium: use upstream board-2.bin

Provide common board-2.bin file, extended from linux-firmware. This file will be temporarily provided and dropped once all devices are added to upstream linux-firmware's board-2.bin file.
firmware-shift-sdm845: use upstream board-2.bin
2023-08-17 11:33:26 +02:00 · 2023-08-17 11:28:36 +02:00 · 2023-08-17 11:23:53 +02:00 · 2023-08-17 10:00:50 +02:00 · 2023-08-16 14:49:30 -07:00 · 2023-08-16 14:45:25 -07:00
735 changed files with 25634 additions and 5193 deletions
@@ -45,3 +45,10 @@ if grep --exclude='source_deviceinfo' -qEr 'source /etc/deviceinfo|\. /etc/devic
 	grep --color=always --exclude='rootfs-usr-share-misc-source_deviceinfo' -Er 'source /etc/deviceinfo|\. /etc/deviceinfo' -- *
 	exit 1
 fi
+
+# Removed deviceinfo variable
+if grep -qr 'deviceinfo_modules_initfs' -- *; then
+	echo 'ERROR: deviceinfo_modules_initfs variable has been removed. Use "modules-initfs" file instead.'
+	grep --color=always -r 'deviceinfo_modules_initfs' -- *
+	exit 1
+fi
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=4
+pkgrel=6

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

 sha512sums="
-c0ea71bcec70e35de3dcb919c22c02afe7e35b3168845209e93bcd15ff380d62dc807848e36e1e5fef22c16adbbdfc1dc3a3559015d0c4a3b2978e0e303d4413  busybox-static-1.36.1-r4-aarch64-edge.apk
+2645e724a4762ae18eaf1eee7048a30d86a6745dd7d4dc296080f40ce0ceb334b89a7dbad05f56657ea3794361e14d03b0f7f03ae83ad3d34f28ec025e45bbee  busybox-static-1.36.1-r6-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=4
+pkgrel=6

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

 sha512sums="
-701ee52541aee37a075563c430b891860afd205e4446379a4686b3eac57ce8443c1203b06fb90f146c88064e00d99101c86d0d8b3a91377e465d46958c942366  busybox-static-1.36.1-r4-armhf-edge.apk
+6ac00686670a1e5fed1221b9e2e88ecc9e46af83ae1f63b844155ce7d122cb247169fa2c35a20154618c536f514ba53f74d4385e92ae2b4c930df7938822d4b8  busybox-static-1.36.1-r6-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=4
+pkgrel=6

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

 sha512sums="
-e01fdc7edfe06b9b8c30acb0df90f026c49982d378724c8afd4e545f5ab7e9d317a9fd8e1e7ae06d3f89e3ddf5e572ad3f7d2d033225f195d5bc7530e6e4bcd2  busybox-static-1.36.1-r4-armv7-edge.apk
+e59173164044ecabfe9e6784d90143e62b7346c0db4e36fbb4df7e4f6916b1d5823284ff98a9408a1af4f8406f6f9c5f60908e1b748e4510a21cc60a1eac4448  busybox-static-1.36.1-r6-armv7-edge.apk
 "
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=1
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -428,6 +428,7 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install

 	ln -s gcc "$pkgdir"/usr/bin/cc
+	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc

 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=1
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -428,6 +428,7 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install

 	ln -s gcc "$pkgdir"/usr/bin/cc
+	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc

 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=1
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -428,6 +428,7 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install

 	ln -s gcc "$pkgdir"/usr/bin/cc
+	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc

 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
@@ -34,7 +34,7 @@ _pkgsnap="${pkgver##*_git}"
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-riscv64
-pkgrel=1
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -428,6 +428,7 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install

 	ln -s gcc "$pkgdir"/usr/bin/cc
+	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc

 	if $LANG_JIT; then
 		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-aarch64
-pkgver=1.2.4
-pkgrel=6
+pkgver=1.2.4_git20230717
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

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

 sha512sums="
-8de3c16bb4eb20e8b06f1a4b4aa494fe08b55ccb243bf3ab8972454b158b29debf0d0e137ccb7b838ea0580917d21d7a9c7170fd3d603c2ba940048a1c97ee1f  musl-1.2.4-r6-aarch64-edge.apk
-2030151102c2445f55d1c841f54283e86e8d5440fec220a7a90b3e50e35aa624a01b76dc7659fb7dbd40175c10051ba8793515d7403518dafe3a7e39069ebc42  musl-dev-1.2.4-r6-aarch64-edge.apk
+4c09316bf7c43332911bd845c1c737fdb032f1c05103db52d7a84a823d3e0ce8aeb2767e544c6121a9b77f64e38d60b98c19a079299ff16cbd79331364a3cc52  musl-1.2.4_git20230717-r2-aarch64-edge.apk
+eb509419fda2d08096b147a66fe4a412d0d5341d26ed78dfacc4aef90b02277072b7b1865f5843386f9c73500eb2984a28252519fe2c264aafe95e4ead2dd8d2  musl-dev-1.2.4_git20230717-r2-aarch64-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armhf
-pkgver=1.2.4
-pkgrel=6
+pkgver=1.2.4_git20230717
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

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

 sha512sums="
-73486b70e66b5dc717bd9b4543996c68449c611b97574a893b990999cabe0531e46645aa403076edbbfdbd3a22f26ef61faf39fa7229fa59a706e5fa9d2d63c3  musl-1.2.4-r6-armhf-edge.apk
-f3d3b71b4f77504e8144d1659e8e05bde18d89dc60502eb947ebee387ed3109c6515175dfd71a9ab5eb478413ed7c13f1cb7789fc6395ba3e6edacc3312564d5  musl-dev-1.2.4-r6-armhf-edge.apk
+3cf75f7d646b721359620549c429025d944d88a57146633b4ca3b9ae4019fcfa2701ceeeb8c93ffa992ff29f19914bb6c6478ef1002032bd046bbd78a244203b  musl-1.2.4_git20230717-r2-armhf-edge.apk
+e7f64f165e5ca3a36dfc233ca10d9609772e29c51a40e0d2dcae518179b4c2f9c86d09884d82e5767fef82ea55bacf5169fd6028f30ca68ba27d984713f37241  musl-dev-1.2.4_git20230717-r2-armhf-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armv7
-pkgver=1.2.4
-pkgrel=6
+pkgver=1.2.4_git20230717
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

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

 sha512sums="
-31378f327c915a1d110f9763b33004ce62e78ef81db5f1fad3d0296f997cc178608dec202f61181034c8588634ba102859721342d1aab7bb14349346eed96f97  musl-1.2.4-r6-armv7-edge.apk
-f62ef6e6dda116e409fb46bea99af3fcc8c04622b1950706fe0fa02a4bf65fbde5bad3147e6f506899c2c279afa588641207a2695f285394f3b65c53574a6ee0  musl-dev-1.2.4-r6-armv7-edge.apk
+ea0bb9d0b3bf8b36d2e3e12430c1cc21b4e722d3a162fced049dcb8a5f9089c324695c10e8cec181cba73c3c83fc6c9b5b70f38509c60127a6e9bcd6621dca37  musl-1.2.4_git20230717-r2-armv7-edge.apk
+80b71f862149d9d28df52eb73ea1f42d387fe400a5982f751e64323713be86dcb53a7492ea6b24fa56ac0d8e518f07dcc6341b9a026d06c144fe6bbf83bb4b2e  musl-dev-1.2.4_git20230717-r2-armv7-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-riscv64
-pkgver=1.2.4
-pkgrel=6
+pkgver=1.2.4_git20230717
+pkgrel=2
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

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

 sha512sums="
-b6e005d34c75fd0e3de17d7ce37042202daad3d58a24f02ee48544b2a4743f58918cf54db026f6f17288e9b70fc6da4dd60857d815d98a4989b087e8a562e564  musl-1.2.4-r6-riscv64-edge.apk
-8231dca1300b2e141761e982e10e42f6a5558c6b229dd7fcdec476310fd2d768e00cabb27f947c91ad360cf74d53ea73d298e572c1ee2397b8ee6e6467a4fcb5  musl-dev-1.2.4-r6-riscv64-edge.apk
+76da75cb9de40f521ece5518980e28a8bdc7ee108229f574d9e7c61bc7956eae7f8ecf226b93fdd8d5d75ca9392cf6e0fe8b6f8044bfb07a8253ce6082689ca0  musl-1.2.4_git20230717-r2-riscv64-edge.apk
+7faed112e8b521c469acb7aad062beff8637be8ae403d856f3c1c678ce9921239ad4fdbaa196ca7abad88fc8952038627a3c4c741e5368a6de66ea7eb1440f51  musl-dev-1.2.4_git20230717-r2-riscv64-edge.apk
 "
@@ -1,6 +1,5 @@
-# A temporary package until these MRs are merged and available in Alpine:
-# - https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/596
-# - https://github.com/alsa-project/alsa-ucm-conf/pull/162
+# A temporary package until pulseaudio upstream tags a new release with these changes merged
+# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/596
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=alsa-ucm-conf-google-gru
 pkgver=1
@@ -3,7 +3,7 @@
 pkgname=device-arrow-db410c
 pkgdesc="Arrow DragonBoard 410c"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+source="deviceinfo modules-initfs"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 _pmb_select="soc-qcom-msm8916-rproc"

@@ -32,5 +32,6 @@ nonfree_firmware() {
 }

 sha512sums="
-a75bcb772637cc87c6eacb593e684b8fd8307203f6371dd73c9ac90ee6231a6bef80e0a8b33f072da8cb350d0001388950fc050c2c17122220f506c661399b6a  deviceinfo
+b8bb88f11bf7f5889a0159e63fac5e38e7ca68a11aa3b89294ee6bc4f6f56a02964d213ce418d7bd5231fb977e4d62a555d587807f5a3ad0d40fb1b5798a6f7d  deviceinfo
+ccd6758cb4954eb0a96c7fb15e732e8147414f8edc498d9faf7d04ddef85d817733669ec1a6003e623e8392f3f6bb85f71160efe4e82f27e300d58aa6f5c8549  modules-initfs
 "
@@ -8,7 +8,6 @@ deviceinfo_codename="arrow-db410c"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/apq8016-sbc"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="display-connector adv7511 msm"
 deviceinfo_arch="aarch64"

 # Device related
@@ -0,0 +1,3 @@
+display-connector
+adv7511
+msm
@@ -3,7 +3,7 @@
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
 pkgver=6
-pkgrel=1
+pkgrel=2
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"
@@ -21,6 +21,7 @@ depends="
 makedepends="devicepkg-dev meson eudev-dev"
 source="https://github.com/me176c-dev/linux-me176c/archive/$_commit.tar.gz
 	deviceinfo
+	modules-initfs
 	phoc.ini
 	sof-workaround.conf
 	"
@@ -82,7 +83,8 @@ libva() {

 sha512sums="
 75243e3d0bc9a352465683ec8cf8b83566e4131bb7fae0f388267a62bdbf4691c955ed034b30df550f921b771080688123ae8db144b72f786bf1677ef1d83f57  3155254999ac36c3051a2118c415de25a072c0f6.tar.gz
-2f5bc546336673452413948d3bbed6af45ef08f0b568b6398739a4c6a918e8b4c358191f0a8c84efccde490d559883ceab4ba81dfcf30593f3552dd867930ab5  deviceinfo
+966d864a951e066180cf44131bfa866cae4f0a272f0f28a882a0af38d7698f7974744e1f34c631a7138f8f5204737d578b665d3010cf145badc0308630f52a40  deviceinfo
+9e9998420a23ae5ff955e0c860913ace9b2228ddd4bb041b3fe86df4611572ed3303e9d483797b1381696094a99cb5f82b3812fe3287025607224bc6e138cbc5  modules-initfs
 3823556d741a352fc7f43567d7218255a27c45c2c5d4d4bdf23f4d26ce2828c5a1c642519b84fef7f59756c990e6a199d72e6ba0c277939b08a40526c3ff3714  phoc.ini
 3d0dd014ac7c2700c4ceb7adf549b96dd0eaa7e75bc4ebee7aab23dc31679edc822e9f6ab0e51a1500459e7f04683c00b5a5c600aa2e13a61697e415ad4a019d  sof-workaround.conf
 "
@@ -6,7 +6,6 @@ deviceinfo_name="ASUS MeMO Pad 7 (ME176C(X))"
 deviceinfo_codename="asus-me176c"
 deviceinfo_manufacturer="ASUS"
 deviceinfo_year="2014"
-deviceinfo_modules_initfs="gpio-crystalcove intel_crystal_cove_charger 8250_dw x86-android-tablets mmc_block sdhci_acpi phy-tusb1210 dwc3 dwc3-pci goodix_ts"
 deviceinfo_arch="x86_64"

 # Device related
@@ -0,0 +1,10 @@
+gpio-crystalcove
+intel_crystal_cove_charger
+8250_dw
+x86-android-tablets
+mmc_block
+sdhci_acpi
+phy-tusb1210
+dwc3
+dwc3-pci
+goodix_ts
@@ -3,7 +3,7 @@
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
 pkgver=6
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+source="deviceinfo modules-initfs"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
@@ -38,5 +38,6 @@ nonfree_firmware() {
 }

 sha512sums="
-285087d1309c7bc6d4c11aaf4c89f754e5386cb53e1ab5ee6cfabe8fefa5ad95042d0b55fa12d2615df0bd82b668c6131435d8b770fa751ca5f6bd464e3bdecb  deviceinfo
+b33c075d49febd0bcff4c696214e39f134f7e05dc4770f60bfff52fb7e7b432b53ef69803ac32957e921d45cb7a35cc205112f6691dbdfd1a5032c89d34789fa  deviceinfo
+da0ed734b3aec09e866eb6ec6b53aaf0e0b171fba3caae56b3f42de46cd4bae47f7dd7da2c5aa79815b8d53335f454756ffd53296a674789769be2a312d15c92  modules-initfs
 "
@@ -8,7 +8,6 @@ deviceinfo_codename="bq-paella"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-longcheer-l8910"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="smb1360 panel-longcheer-yushun-nt35520 panel-longcheer-truly-otm1288a msm himax-hx852x"
 deviceinfo_arch="aarch64"

 # Device related
@@ -0,0 +1,5 @@
+smb1360
+panel-longcheer-yushun-nt35520
+panel-longcheer-truly-otm1288a
+msm
+himax-hx852x
@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=1.2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -23,6 +23,7 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	90-feedbackd-aw8695.rules
 	deviceinfo
+	modules-initfs
 	gtk.css
 	phoc.ini
 	"
@@ -72,7 +73,8 @@ phosh() {

 sha512sums="
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
-75c47a29ee990845826c5c3f0829a59b210345b79de109572c3d3d15828cc4f5bd8ed5e79c5be22f9af36c5ddb276ed49685c0c4691bbccd720c8b80eef224cc  deviceinfo
+e223df827d1d18507197d64fc409f527514f7f76b68f784811b7b59452260dbd72133c85277b1e7df38b0058e0f16ac0d1174104a193b7f6c8dcf64577863eba  deviceinfo
+285dcb0011a2114e83621811a4204dfae4310ff9312f727d2cbf5d10712fe7fae7a20f636fc02b7794a41af67864a42d04f8c2f7e241f9f5182827d0a0556179  modules-initfs
 25a93dcbe6dbc6cff24f57cbf5539bc475c5fe0f6bf5e8374c7032b9c38a939bef0aa0cde1707afcc16b1ec2d0859c03c6ee92d80d8048d1c6adc6e25178b85f  gtk.css
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "
@@ -9,7 +9,6 @@ deviceinfo_codename="fairphone-fp4"
 deviceinfo_year="2021"
 deviceinfo_dtb="qcom/sm7225-fairphone-fp4"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="msm panel-hx83112a-auo"
 deviceinfo_arch="aarch64"
 deviceinfo_flash_kernel_on_update="true"

@@ -0,0 +1,2 @@
+msm
+panel-hx83112a-auo
@@ -0,0 +1,58 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-gru
+pkgdesc="Google Gru Chromebooks"
+pkgver=5
+pkgrel=3
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf-google-gru
+	depthcharge-tools
+	eudev-hwids>=3.2.12-r0
+	linux-postmarketos-rockchip
+	postmarketos-base
+	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo modules-initfs"
+
+# provides and replaces to switch old installations to this package
+provides="
+	device-google-dru=$pkgver-r$pkgrel
+	device-google-druwl=$pkgver-r$pkgrel
+	device-google-dumo=$pkgver-r$pkgrel
+	device-google-kevin=$pkgver-r$pkgrel
+	device-google-bob=$pkgver-r$pkgrel
+"
+replaces="
+	device-google-dru
+	device-google-druwl
+	device-google-dumo
+	device-google-kevin
+	device-google-bob
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT and DP firmware"
+	depends="linux-firmware-ath10k linux-firmware-qca linux-firmware-mrvl linux-firmware-rockchip"
+	mkdir "$subpkgdir"
+}
+
+
+sha512sums="
+bf5d1d687e5dd4231eea758611799bfb2aef8caf3314e9469093bf7158ed85dd3aa2fd7894a1a97542a076ddd2ca8a735e54b012f6bee9522fea85d8556a8b90  deviceinfo
+a750a0c41068082e0b82351d5aec91715e1a5215b09b26fec644dfe259cea2d662e878433a732a8c06dab2a9b420baec2bcc6161d8357cf3ed770239c5165090  modules-initfs
+"
@@ -3,20 +3,18 @@
 # scripts.

 deviceinfo_format_version="0"
-deviceinfo_name="ASUS Chromebook Flip C101"
-deviceinfo_manufacturer="ASUS"
-deviceinfo_codename="google-bob"
+deviceinfo_name="Google Gru Chromebook"
+deviceinfo_manufacturer="Google"
+deviceinfo_codename="google-gru"
 deviceinfo_year="2017"
-deviceinfo_dtb="rockchip/rk3399-gru-bob"
-deviceinfo_modules_initfs="gpu-sched elants-i2c elan-i2c cros-ec-keyb sbs-battery"
+deviceinfo_dtb="rockchip/rk3399-gru*"
 deviceinfo_arch="aarch64"

 # Device related
+# chassis does not make sense here, will probably be removed (pmb#2255)
 deviceinfo_chassis="convertible"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
-deviceinfo_screen_width="1280"
-deviceinfo_screen_height="800"
 deviceinfo_gpu_accelerated="true"

 # Bootloader related
@@ -25,6 +23,6 @@ deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
-deviceinfo_depthcharge_board="bob"
+deviceinfo_depthcharge_board="gru"
 deviceinfo_generate_depthcharge_image="true"
 deviceinfo_generate_extlinux_config="true"
@@ -0,0 +1,8 @@
+gpu-sched
+panel-innolux-p079zca
+panel-kingdisplay-kd097d04
+elants-i2c
+elan-i2c
+atmel-mxt-ts
+cros-ec-keyb
+sbs-battery
@@ -0,0 +1,79 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-kukui
+pkgdesc="Google Kukui Chromebooks"
+pkgver=6
+pkgrel=2
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf-google-kukui
+	depthcharge-tools
+	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
+	postmarketos-base
+	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
+	soc-mediatek-mt8183
+"
+makedepends="devicepkg-dev"
+source="deviceinfo modules-initfs"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+
+# provides and replaces to switch old installations to this package
+provides="
+	device-google-burnet=$pkgver-r$pkgrel
+	device-google-cerise=$pkgver-r$pkgrel
+	device-google-cozmo=$pkgver-r$pkgrel
+	device-google-damu=$pkgver-r$pkgrel
+	device-google-fennel=$pkgver-r$pkgrel
+	device-google-fennel14=$pkgver-r$pkgrel
+	device-google-juniper=$pkgver-r$pkgrel
+	device-google-kakadu=$pkgver-r$pkgrel
+	device-google-kappa=$pkgver-r$pkgrel
+	device-google-katsu=$pkgver-r$pkgrel
+	device-google-kenzo=$pkgver-r$pkgrel
+	device-google-kodama=$pkgver-r$pkgrel
+	device-google-krane=$pkgver-r$pkgrel
+	device-google-makomo=$pkgver-r$pkgrel
+	device-google-stern=$pkgver-r$pkgrel
+	device-google-willow=$pkgver-r$pkgrel
+"
+replaces="
+	device-google-burnet
+	device-google-cerise
+	device-google-cozmo
+	device-google-damu
+	device-google-fennel
+	device-google-fennel14
+	device-google-juniper
+	device-google-kakadu
+	device-google-kappa
+	device-google-katsu
+	device-google-kenzo
+	device-google-kodama
+	device-google-krane
+	device-google-makomo
+	device-google-stern
+	device-google-willow
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT firmware"
+	depends="linux-firmware-ath10k linux-firmware-qca linux-firmware-mediatek"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+4c7f6c37afbf2fbd9169f158dc8ab2c29599a3eb1f945b51c46dfb3a385ee007c3524b8c689dfc19f51f4e850ec87550f7af6ab3c0590ba713ba14f549a3efb2  deviceinfo
+8e95624610dae7d18684056396c9e82635ddce7303d6770e965f9372ffa101fdfd5f8337bc7368004890e9836798663a98c142c52ed63795877ea37ac8da56af  modules-initfs
+"
@@ -0,0 +1,34 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Google Kukui Chromebook"
+deviceinfo_manufacturer="Google"
+deviceinfo_codename="google-kukui"
+deviceinfo_year="2020"
+deviceinfo_dtb="mediatek/mt8183-kukui*"
+deviceinfo_arch="aarch64"
+
+# Device related
+# chassis does not make sense here, will probably be removed (pmb#2255)
+deviceinfo_chassis="convertible"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_flash_method="none"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="8192"
+deviceinfo_cgpt_kpart_size="65536"
+# We are supposed to use "kukui" board here, but lazor dts does
+# not include kukui compatible which results in loading a wrong
+# dtb. "mt8183" board may result in including dtbs that are for
+# mt8183 but not related to Chrome OS devices which would increase
+# image size. This doesn't happen for us because we provide only 
+# dtbs from deviceinfo_dtb variable and nothing more, so use "mt8183"
+# board here.
+deviceinfo_depthcharge_board="mt8183"
+deviceinfo_generate_depthcharge_image="true"
@@ -0,0 +1,11 @@
+atmel-mxt-ts
+cros-ec-keyb
+elan-i2c
+elants-i2c
+gpu-sched
+hid-generic
+hid-multitouch
+i2c-hid-of
+i2c-hid-of-goodix
+i2-hid-of
+sbs-battery
@@ -1,9 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Jenneron <jenneron@protonmail.com>
-pkgname=device-google-elm
-pkgdesc="Acer Chromebook R13"
-pkgver=3
-pkgrel=0
+pkgname=device-google-oak
+pkgdesc="Google Oak Chromebooks"
+pkgver=4
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,12 +13,17 @@ depends="
 	depthcharge-tools
 	linux-postmarketos-mediatek-mt8173
 	postmarketos-base
+	postmarketos-cros-common
 	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
-source="deviceinfo"
+source="deviceinfo modules-initfs"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

+# provides and replaces to switch old installations to this package
+provides="google-elm=$pkgver-r$pkgrel google-hana=$pkgver-r$pkgrel"
+replaces="google-elm google-hana"
+
 build() {
 	devicepkg_build $startdir $pkgname
 }
@@ -34,5 +39,6 @@ nonfree_firmware() {
 }

 sha512sums="
-82a9f31e09680b98bf688bf14a8d1b00ad78c78409c2cc1006c71b9bbadc49665b1b54354aa7b7053236ff2d4519761e3f9c86bb918b08bbcb908ac86b89620b  deviceinfo
+866dad1295698accf952a52bdabd8be99d3449c6131d305067ed404e917a36a5d28e2482c6a205774c9438d17b9d50a2da66a26d58f147ae1aeaa4f225a377c8  deviceinfo
+4b0197eacfeeb4b13f5abc26950f570ee762742547674ce10110ccea63eb46630a2e3b5f87e9c9a1f9deda21baf05bec248ab7a65656687ec94d296b5657dafa  modules-initfs
 "
@@ -3,15 +3,15 @@
 # scripts.

 deviceinfo_format_version="0"
-deviceinfo_name="Google Hana Chromebook"
+deviceinfo_name="Google Oak Chromebook"
 deviceinfo_manufacturer="Google"
-deviceinfo_codename="google-hana"
+deviceinfo_codename="google-oak"
 deviceinfo_year="2017"
-deviceinfo_dtb="mediatek/mt8173-elm-hana mediatek/mt8173-elm-hana-rev7"
-deviceinfo_modules_initfs="hid-i2c-of hid-multitouch elants-i2c elan-i2c melfas-mip4 cros-ec-keyb"
+deviceinfo_dtb="mediatek/mt8173-elm*"
 deviceinfo_arch="aarch64"

 # Device related
+# chassis does not make sense here, will probably be removed (pmb#2255)
 deviceinfo_chassis="convertible"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
@@ -24,5 +24,12 @@ deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
-deviceinfo_depthcharge_board="hana"
+# We are supposed to use "oak" board here, but lazor dts does
+# not include oak compatible which results in loading a wrong
+# dtb. "mt8173" board may result in including dtbs that are for
+# mt8173 but not related to Chrome OS devices which would increase
+# image size. This doesn't happen for us because we provide only
+# dtbs from deviceinfo_dtb variable and nothing more, so use "mt8173"
+# board here.
+deviceinfo_depthcharge_board="mt8173"
 deviceinfo_generate_depthcharge_image="true"
@@ -0,0 +1,6 @@
+i2c-hid-of
+hid-multitouch
+elants-i2c
+elan-i2c
+melfas-mip4
+cros-ec-keyb
@@ -2,26 +2,25 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
-pkgver=3
-pkgrel=0
+pkgver=4
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf
-	postmarketos-base
+	depthcharge-tools
 	linux-postmarketos-exynos5
-	u-boot-peach-pit
-"
-makedepends="
-	devicepkg-dev
-	u-boot-tools
+	postmarketos-base
+	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
+makedepends="devicepkg-dev"
 source="
 	deviceinfo
+	modules-initfs
 	i3wm/xorg.conf.d/90-tap-to-click.conf
-	uboot-script.cmd
 	ucm/Peach-Pit-I2S-MAX98090.conf
 	ucm/HiFi.conf
 "
@@ -32,17 +31,6 @@ subpackages="

 build() {
 	devicepkg_build $startdir $pkgname
-
-	mkimage \
-		-A arm \
-		-O linux \
-		-T script \
-		-C none \
-		-a 0 \
-		-e 0 \
-		-n postmarketos \
-		-d "$srcdir"/uboot-script.cmd \
-		"$srcdir"/boot.scr
 }

 package() {
@@ -55,10 +43,6 @@ package() {
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/Peach-Pit-I2S-MAX98090/HiFi.conf
 	ln -s /usr/share/alsa/ucm2/conf.d/Peach-Pit-I2S-MAX98090 \
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/Peach-Pit-I2S-M
-
-	# U-Boot script
-	install -Dm644 "$srcdir"/boot.scr \
-		"$pkgdir"/boot/boot.scr
 }

 i3wm() {
@@ -74,9 +58,9 @@ nonfree_firmware() {
 }

 sha512sums="
-0de17ee83b81220bf6b107ad80801e52ccc1ab5a13b035df32dfba286153ab34830861547fe180f40c38c89e627900ab59f1499b2e455832c1b4e6069abf86c8  deviceinfo
+c0bce7063912e13464ad7b4338eea3135b86cf7e946f535c48d4bf180bab58739e97791ada53df5065eb0bec0649b125b6f4f39bf23f1315316e71ce36243a16  deviceinfo
+a1fd6b4964b0bd4c66983430528f5906eea5cc9ddbe8485ba17e97496652240d0a93dbd3af34ecd3c273b7172202b8dcb24e0b5fa372512d01affec3914a023d  modules-initfs
 e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da  90-tap-to-click.conf
-7c59bbec6b54d4a96d7e80468a49f1ccb7e4ec216c6a598a0f2fe3bc5b0aea19640eeb311a25d5ac4532ff85ed98a8612f22a02e723d089940da8efdbbd047f0  uboot-script.cmd
 6fe67c8f2e09e3e37297eebaf2a86a32671923a5fd4d18e5aeb10e580fb998e4ddb4a691531a0c8f4b4e70c6f0f7e91008dd836ffca8026d59862c6e829fd996  Peach-Pit-I2S-MAX98090.conf
 194b6169168b40592cf1e6b5f3b21aaa24a602869d7aec358cd5e1f06de34e9b0fe3da094e438ef2d3ab5be80275e6c0b6afe7ce92e2365a70e8b5a21a873234  HiFi.conf
 "
@@ -8,7 +8,6 @@ deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="google-peach-pit"
 deviceinfo_year="2014"
 deviceinfo_dtb="exynos5420-peach-pit"
-deviceinfo_modules_initfs="drm-dp-aux-bus panel-edp drm-kms-helper cros-ec-keyb sbs-battery tps65090-charger"
 deviceinfo_arch="armv7"

 # Device related
@@ -21,6 +20,10 @@ deviceinfo_gpu_accelerated="true"

 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_cgpt_kpart="/usr/share/u-boot/google-peach-pit/u-boot-dtb.img.kpart"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
-deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_cgpt_kpart_size="16384"
+deviceinfo_kernel_cmdline="console=null mem=3523M"
+deviceinfo_depthcharge_board="peach-pit"
+deviceinfo_generate_depthcharge_image="true"
+deviceinfo_generate_extlinux_config="true"
@@ -0,0 +1,6 @@
+drm-dp-aux-bus
+panel-edp
+drm-kms-helper
+cros-ec-keyb
+sbs-battery
+tps65090-charger
@@ -2,26 +2,26 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
-pkgver=2
-pkgrel=0
+pkgver=4
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
 	alsa-ucm-conf
+	depthcharge-tools
+	linux-postmarketos-exynos5
 	postmarketos-base
-	u-boot-snow
-"
-makedepends="
-	devicepkg-dev
-	u-boot-tools
+	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
+makedepends="devicepkg-dev"
 source="
 	deviceinfo
+	modules-initfs
 	i3wm/xorg.conf.d/90-tap-to-click.conf
 	modprobe.d/mali.conf
-	uboot-script.cmd
 	ucm/HiFi.conf
 	ucm/Snow-I2S-MAX98090.conf
 	mpv/mpv.conf.wayland
@@ -31,8 +31,6 @@ source="
 "
 subpackages="
 	$pkgname-i3wm
-	$pkgname-kernel-rev4:kernel_rev4
-	$pkgname-kernel-rev5:kernel_rev5
 	$pkgname-mpv-wayland:mpv_wayland
 	$pkgname-mpv-xorg:mpv_xorg
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -41,17 +39,6 @@ subpackages="

 build() {
 	devicepkg_build $startdir $pkgname
-
-	mkimage \
-		-A arm \
-		-O linux \
-		-T script \
-		-C none \
-		-a 0 \
-		-e 0 \
-		-n postmarketos \
-		-d "$srcdir"/uboot-script.cmd \
-		"$srcdir"/boot.scr
 }

 package() {
@@ -66,10 +53,6 @@ package() {
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/Snow-I2S-MAX980/Snow-I2S-MAX98090.conf
 	install -Dm644 "$srcdir"/HiFi.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/Snow-I2S-MAX980/HiFi.conf
-
-	# U-Boot script
-	install -Dm644 "$srcdir"/boot.scr \
-		"$pkgdir"/boot/boot.scr
 }

 i3wm() {
@@ -78,20 +61,6 @@ i3wm() {
 		"$subpkgdir"/etc/X11/xorg.conf.d/90-tap-to-click.conf
 }

-# Kernel subpackages to copy correct DTB, uboot-script.cmd selects copied one
-
-kernel_rev4() {
-	pkgdesc="Google Snow Rev 4"
-	depends="linux-postmarketos-exynos5"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_rev5() {
-	pkgdesc="Google Snow Rev 5"
-	depends="linux-postmarketos-exynos5"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 mpv_wayland() {
 	# Looks like wayland libs are installed with some x11 UIs too, so match wlroots here
 	install_if="$pkgname=$pkgver-r$pkgrel mpv wlroots"
@@ -120,14 +89,14 @@ sway() {
 }

 sha512sums="
-f7d3b70ee5f19e634cd41294aa4d1287dad6a8324f9223aa9c26de28b46305e3a9d22e340e0121d7a335aee0be49727e1e289d5daa53e7f22faa7d1347c5abd1  deviceinfo
+4be0a2e0ff5d5189b9adbea995b111724cf686eda3c191fac405757facee4621297314bb4d2015e8dc72b29f30d47d2e00253d70d64c51a02a5177cb4d4959cd  deviceinfo
+a1fd6b4964b0bd4c66983430528f5906eea5cc9ddbe8485ba17e97496652240d0a93dbd3af34ecd3c273b7172202b8dcb24e0b5fa372512d01affec3914a023d  modules-initfs
 e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da  90-tap-to-click.conf
 c5fdd5a39a41044343d937a1ad31cc6bb893f19a329beb4ce09249064cac066d643c84ffcbfcd794113c228c5a56e28c82812092751546b49ab31142dc8245b1  mali.conf
-e55e7ccbd038546b70825ed58bdf39bd2780176eacf4fbb36a0bfa3dcfa585a42f891905171ac4e7ce2e98f0c16d41a8586eca870fc53ac8f3adacc7b045777e  uboot-script.cmd
 8a8f593694528a9323ef4a0aff7e9c6ad45608957eb042d425663f682885c2f95eb01db4fe87b7c43a90de48f3e5f8b10cab4b13c547b5b0d31b924fcb083cad  HiFi.conf
 b163535da7626e3866faa45768c3888f69f90c98d694650e16a7594a03eb91391e166931eb487901217d983bb2dc4e49b99a2a5531740a7d87f8f4f5c3d0cf59  Snow-I2S-MAX98090.conf
 8f9dc3c7caeab6c5321dc2bf498f1a03a793f23cb776763316bc356b9d433d7a3337e61154069464dcda200bf390b99f3be8f657a40c6d2f6be3cbc6fb751080  mpv.conf.wayland
 d6bc39df48ba0e985a796426039205335adf1c91b9c150b05a4239339fc78b1748b3a83c699de69e9a5829f29573a323f40788da58ed15b1951de1eab7e31c3d  mpv.conf.xorg
 61c56cf84cf88371a2238845db1f8283c7eb7b417dec8c51d71e51fb96899bb026c0ee22dc94a43537a56477fb0db59de960949add4b0ce90552a1286e6afe69  foot.ini
-78e566bf3a597b9b5f73f686feb93ae61d1bed350366428d74c7735f1f82ab390f47ba9deb9d21e8dfcee251dc6178956838ca1b34838bb0a7d740be0e2c8330  10-no-hardware-cursor.sh
+8ddd237b14e8eea34b8716d155cdf199cf681b1287b482c8e184656d6d0440f018a2d46478c8b45eb790a1e71cfcfefd0f66798cd0b226647f11088549cfae64  10-no-hardware-cursor.sh
 "
@@ -7,9 +7,7 @@ deviceinfo_name="Samsung Chromebook"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="google-snow"
 deviceinfo_year="2011"
-deviceinfo_dtb_rev4="exynos5250-snow"
-deviceinfo_dtb_rev5="exynos5250-snow-rev5"
-deviceinfo_modules_initfs="drm-dp-aux-bus panel-edp drm-kms-helper cros-ec-keyb sbs-battery tps65090-charger"
+deviceinfo_dtb="exynos5250-snow exynos5250-snow-rev5"
 deviceinfo_arch="armv7"

 # Device related
@@ -24,6 +22,10 @@ deviceinfo_gpu_accelerated="true"

 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_cgpt_kpart="/usr/share/u-boot/google-snow/u-boot-dtb.img.kpart"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
-deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_cgpt_kpart_size="16384"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_depthcharge_board="snow"
+deviceinfo_generate_depthcharge_image="true"
+deviceinfo_generate_extlinux_config="true"
@@ -0,0 +1,6 @@
+drm-dp-aux-bus
+panel-edp
+drm-kms-helper
+cros-ec-keyb
+sbs-battery
+tps65090-charger
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh

 # A workaround for missing cursor issue

@@ -3,7 +3,7 @@
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
 pkgver=1
-pkgrel=0
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,12 +14,13 @@ depends="
 	eudev-hwids
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
+	postmarketos-cros-common
 	postmarketos-update-depthcharge-kernel
 	soc-qcom-sc7180
 "
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo"
+source="deviceinfo modules-initfs"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -44,5 +45,6 @@ nonfree_firmware() {


 sha512sums="
-3c8c835274e39fcd76ac21ad551ef8bd171f60ab83f9846d6d96d2a5190e00e07ed9ee5a532b96a8cd09d11b5ed9c389c4b3e5c7862290fa4257f1060c47d6df  deviceinfo
+9c3357ad83bbcb3e3fb5507c35a8eba1ed07c7c054a91f56a9f97cdde7219b624c20ead95da1a4170f3e1889b0d6ed84eecc9eb4f8d28954254b3eaccdd4deb3  deviceinfo
+ef0257928f28aff25e6c625fabfd0942b01d4d86f1b523212ca825cf80f8b7a6c20ff17bfb02cb19f2a5d8787326ba22ad560a957c8d3c38b9ec70f1e16f9117  modules-initfs
 "
@@ -8,7 +8,6 @@ deviceinfo_manufacturer="Google"
 deviceinfo_codename="google-trogdor"
 deviceinfo_year="2021"
 deviceinfo_dtb="qcom/sc7180-trogdor*"
-deviceinfo_modules_initfs="i2c-hid-of i2c-hid-of-goodix elan-i2c elants-i2c cros-ec-keyb sbs-battery"
 deviceinfo_arch="aarch64"

 # Device related
@@ -0,0 +1,6 @@
+i2c-hid-of
+i2c-hid-of-goodix
+elan-i2c
+elants-i2c
+cros-ec-keyb
+sbs-battery
@@ -0,0 +1,59 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-veyron
+pkgdesc="Google Veyron Chromebooks"
+pkgver=5
+pkgrel=3
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf>=1.2.7.1-r0
+	depthcharge-tools
+	linux-google-veyron
+	postmarketos-base
+	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
+"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+makedepends="devicepkg-dev"
+source="deviceinfo modules-initfs"
+
+# provides and replaces to switch old installations to this package
+provides="
+	device-google-veyron-fievel=$pkgver-r$pkgrel
+	device-google-veyron-jaq=$pkgver-r$pkgrel
+	device-google-veyron-jerry=$pkgver-r$pkgrel
+	device-google-veyron-mickey=$pkgver-r$pkgrel
+	device-google-veyron-mighty=$pkgver-r$pkgrel
+	device-google-veyron-minnie=$pkgver-r$pkgrel
+	device-google-veyron-speedy=$pkgver-r$pkgrel
+	device-google-veyron-tiger=$pkgver-r$pkgrel
+"
+replaces="
+	device-google-veyron-fievel
+	device-google-veyron-jaq
+	device-google-veyron-jerry
+	device-google-veyron-mickey
+	device-google-veyron-mighty
+	device-google-veyron-minnie
+	device-google-veyron-speedy
+	device-google-veyron-tiger
+"
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT firmware"
+	depends="linux-firmware-mrvl firmware-google-veyron-brcm"
+	mkdir "$subpkgdir"
+}
+
+
+sha512sums="
+5c63bb90fce9fdbc61eedcd6fe0772e731baf0262ec195bc946f8d24cbea630b1e487e030d0557cea9029ca4abfc0d6724b5e21a0fd9e9f3f22d78baa7eec535  deviceinfo
+be3e804fa538d9d377c637094dcf95e503e8a156fa71676a9e78abc0e290595dfdaa70b5642df721ebcdd3daa04d14e0c61d9bab6f78cb1dbd669404abc3a56d  modules-initfs
+"
@@ -3,20 +3,18 @@
 # scripts.

 deviceinfo_format_version="0"
-deviceinfo_name="ASUS Chromebook Flip C100"
-deviceinfo_manufacturer="ASUS"
-deviceinfo_codename="google-veyron-minnie"
+deviceinfo_name="Google Veyron Chromebook"
+deviceinfo_manufacturer="Google"
+deviceinfo_codename="google-veyron"
 deviceinfo_year="2015"
 deviceinfo_arch="armv7"
-deviceinfo_dtb="rk3288-veyron-minnie"
-deviceinfo_modules_initfs="pwm-bl rockchipdrm dw-mipi-dsi drm-kms-helper gpu-sched phy-rockchip-dp pwm-rockchip dw-wdt videobuf2-dma-sg analogix-dp drm-dp-aux-bus panel-edp gpio-charger sbs-battery cros-ec cros-ec-spi cros-ec-keyb elants-i2c"
+deviceinfo_dtb="rk3288-veyron*"

 # Device related
+# chassis does not make sense here, will probably be removed (pmb#2255)
 deviceinfo_chassis="convertible"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
-deviceinfo_screen_width="1280"
-deviceinfo_screen_height="800"
 deviceinfo_gpu_accelerated="true"

 # Bootloader related
@@ -25,6 +23,6 @@ deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="24576"
 deviceinfo_cgpt_kpart_size="32768"
-deviceinfo_depthcharge_board="minnie"
+deviceinfo_depthcharge_board="veyron"
 deviceinfo_generate_depthcharge_image="true"
 deviceinfo_generate_extlinux_config="true"
@@ -0,0 +1,18 @@
+analogix-dp
+cros-ec
+cros-ec-keyb
+cros-ec-spi
+drm-dp-aux-bus
+drm-kms-helper
+dw-mipi-dsi
+dw-wdt
+elants-i2c
+gpio-charger
+gpu-sched
+panel-edp
+phy-rockchip-dp
+pwm-bl
+pwm-rockchip
+rockchipdrm
+sbs-battery
+videobuf2-dma-sg
@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
 pkgver=7
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo phoc.ini"
+source="deviceinfo modules-initfs phoc.ini"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -46,6 +46,7 @@ phosh() {
 }

 sha512sums="
-a73d36985ea77bf01493e8a4dae0e437a0e944254745d71fe8f6ecd5809497a7a93cbbddcde608d83fc5539def887feb0d9dd1920613acc51ec386f7dbdb0b1d  deviceinfo
+9e9c07835778b92178b8057df5530915a58f8aeb729274e24025a0ba8ee563269836f7790ad40f055fd85564dfa14a812306a6e7caf35369f5ffb522d2004611  deviceinfo
+d433b8376b6e89daf4eac2073cb33627bdcacdcd48b6d4990cc698627dcf3c951bb1874951bc4631ea6b89d22c6002b9d02b77ff24992106061fcecc22fa5f25  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "
@@ -8,7 +8,6 @@ deviceinfo_codename="lenovo-a6000"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-wingtech-wt86518"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="pm8916-lbc pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-qimei-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
 deviceinfo_arch="aarch64"

 # Device related
@@ -0,0 +1,7 @@
+pm8916-lbc
+pm8916-bms-vm
+panel-wingtech-yassy-ili9881
+panel-wingtech-qimei-ili9881
+panel-wingtech-tianma-hx8394d
+msm
+edt-ft5x06
@@ -4,7 +4,7 @@
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
 pkgver=7
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo phoc.ini"
+source="deviceinfo modules-initfs phoc.ini"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -46,6 +46,7 @@ phosh() {
 }

 sha512sums="
-ab4d6460d45793c887b4e632b01e7a16a46b7aa3deee7d8b3c7bbc5d1397db54b492c212e15c49c588c1766a265882373324b3e861ce3e0258056a631220b4b5  deviceinfo
+94429cc24e90642b0110c10098eccff67ac585caf34471d1664a05a1bb55a9428cde35f776ffad64ebe02fce761c74c89d749e4be9ecd127db1e4ee8a2ff2435  deviceinfo
+258464e46872cf221f7ac367766f9b8ead5d5dccbd71f3df5a5555127a42448906247ff2519d1750eec53b3ed37ae96c2409369d7cb8e2fffeb202a8f69bba53  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "
@@ -8,7 +8,6 @@ deviceinfo_codename="lenovo-a6010"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-wingtech-wt86528"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="pm8916-bms-vm panel-wingtech-yassy-ili9881 panel-wingtech-qimei-ili9881 panel-wingtech-tianma-hx8394d msm edt-ft5x06"
 deviceinfo_arch="aarch64"

 # Device related
@@ -0,0 +1,6 @@
+pm8916-bms-vm
+panel-wingtech-yassy-ili9881
+panel-wingtech-qimei-ili9881
+panel-wingtech-tianma-hx8394d
+msm
+edt-ft5x06
@@ -3,7 +3,7 @@
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
 pkgver=8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+source="deviceinfo modules-initfs"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
@@ -41,5 +41,6 @@ nonfree_firmware() {
 }

 sha512sums="
-9cf557543fe876ae42298c2e717298cd03888fadf2d43a2794b1c7b3e13310796a914d59fade9b5421fc3035fd4b69b94b0bb75d30c559386f0cbfee98300bc3  deviceinfo
+53b3a15b67cb81b50afb095172748e6c562a78854b83b59f519bb3915ffdcbc833b494336222f3005f5ac9c8d39afec03097a1ae9003d2f4478f3d0dfdf8d924  deviceinfo
+525a3e20672a7dff26b885b99ee157e0ece33efa10db34c90aed45dc47d7f1c2e90d7082dc84f2724892f199b5adaca04d5864f0aa1d1e4b8ea695f840346d60  modules-initfs
 "
@@ -8,7 +8,6 @@ deviceinfo_codename="motorola-harpia"
 deviceinfo_year="2016"
 deviceinfo_dtb="qcom/msm8916-motorola-harpia"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="panel-motorola-harpia-boe panel-motorola-harpia-tianma msm rmi-i2c"
 deviceinfo_arch="aarch64"

 # Device related
@@ -0,0 +1,4 @@
+panel-motorola-harpia-boe
+panel-motorola-harpia-tianma
+msm
+rmi-i2c
@@ -1,2 +0,0 @@
-%wheel ALL = NOPASSWD: /usr/sbin/pm-suspend
-
@@ -2,7 +2,7 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=9.1
+pkgver=9.1.8
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@@ -20,7 +20,6 @@ subpackages="
 source="
 	10-initfs-keymap.files
 	10-initfs-keymap.sh
-	10-noroot-suspend
 	acpi.map
 	acpi_handler.sh
 	asound.state.headset
@@ -28,7 +27,7 @@ source="
 	backlight-enable.sh
 	device-nokia-n900.start
 	deviceinfo
-	i3wm/conky.conf
+	modules-initfs
 	i3wm/i3blocks.conf
 	i3wm/i3wm.conf
 	i3wm/protip_shell.sh
@@ -42,6 +41,8 @@ source="
 	keymaps/rx51_it.map
 	keymaps/rx51_us.map
 	lock.sh
+	modem-load.conf
+	modem-opts.conf
 	modules.blocklist
 	n900-wlan-data.initd
 	pointercal
@@ -49,6 +50,7 @@ source="
 	udev/10-nokia-modem.rules
 	udev/90-touchscreen-dev.rules
 	x11-keymap
+	xdefaults
 	xorg.conf
 "
 options="!check !archcheck"
@@ -115,7 +117,11 @@ package() {
 	install -D -m644 "$srcdir"/keymaps/rx51_se.bmap.gz \
 		"$pkgdir"/usr/share/bkeymaps/se/rx51_se.bmap.gz

-	# Module blocklist
+	# Kernel module management
+	install -D -m644 "$srcdir"/modem-load.conf \
+		"$pkgdir"/etc/modules-load.d/10-nokia-modem.conf
+	install -D -m644 "$srcdir"/modem-opts.conf \
+		"$pkgdir"/etc/modprobe.d/nokia-modem.conf
 	install -D -m644 "$srcdir"/modules.blocklist \
 		"$pkgdir"/etc/modprobe.d/n900-module-blocklist.conf

@@ -142,7 +148,7 @@ xkeyboard_config() {

 i3wm() {
 	install_if="$pkgname postmarketos-ui-i3wm"
-	depends="unclutter-xfixes conky feh pm-utils i3blocks"
+	depends="unclutter-xfixes feh i3blocks rxvt-unicode"
 	install -D -m644 "$srcdir"/i3wm.conf \
 		"$subpkgdir"/etc/skel/.config/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
@@ -157,10 +163,8 @@ i3wm() {
 		"$subpkgdir"/etc/skel/.config/i3blocks/wifi
 	install -D -m755 "$srcdir"/protip_shell.sh \
 		"$subpkgdir"/etc/skel/.protip_shell.sh
-	install -D -m644 "$srcdir"/conky.conf \
-		"$subpkgdir"/etc/skel/.config/conky/conky.conf
-	install -D -m440 "$srcdir"/10-noroot-suspend \
-		"$subpkgdir"/etc/sudoers.d/10-noroot-suspend
+	install -D -m644 "$srcdir"/xdefaults \
+		"$subpkgdir"/etc/skel/.Xdefaults
 }

 nonfree_firmware() {
@@ -175,17 +179,16 @@ nonfree_firmware() {
 sha512sums="
 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21  10-initfs-keymap.files
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
-38ecdf876b5aa9df2e5ea61c7ebb6f9ca871bdf433029808d028d563dfd740232b3dc21dba098a7622453212af1272e2e782be861b4a96a49fd475a618442d45  10-noroot-suspend
 b3612348af1465c6dc21ce30153fc7e2cce3ae7f9bf9ff34d5a560e173e174275c1701dd7c45337fa56caaadb252b9494bddf997a698d665d3a8c01cde6955c7  acpi.map
 ac2f8a50280f7d5f8c5ce3ab50d00f1a4c8c1415890347542c684b6e24874a23d57a8f48c62451c46466996decc58276d737bdb892f8b284881d3760948b09bb  acpi_handler.sh
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
 e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start
-a4e9196f8ca31fea6f74af078c1e1df1e7be89b63b5d0d292d7f198cfae5f30247dd002536f0f9251ed96518a54aa2b4783870046283e6cd30093115f60cce8e  deviceinfo
-16c31bf28b9dcc256821b153de199bd27decc76e4bde63130c1d1556a63cf2cafb64c4d4df42e00690564fce801c5216e8e97e4262a546440fd4bc2e14eaae1c  conky.conf
+2463008d270ed09342f15b51f24ea455bd884021f95397991b85616b6840a6608d91cd1fc43186094f5c3d1bd25e88c16aa9ead07b018aea3d93cd2359bba0b1  deviceinfo
+f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f  i3blocks.conf
-7e8a92b828a3cb823b8df0c67ff3cb72d220f2fdc4557a613ad051baaf7e6e3d0865cdfb5eadff7f4b04302ac650bc485863e26f4d54485d5a1c2389ac0793e3  i3wm.conf
+e9bc4efc409eb09b3a469e03f0fa6ce56f461b5b8d51792af06050c0499e300090a30dc3fcfc5a16be04bc8eda9ab53554576e48b119c21adfe2e4cc04e50061  i3wm.conf
 0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8  protip_shell.sh
 2ae4771eda9b151de3b47dc4e3081eb86b92fc04c4be4b4fbb98c28016762d24008e935bbba8f95ea0732019f615ee43f5d93dacb21bdc3471e505a07a684e26  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
@@ -197,12 +200,15 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
 caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
-b76958bcba6e704bdf06194998f05bc5c86c0678329438b784bd77eaac9cab352aadc912bda8f3780406ff50fd3e05f6d32d021c49987285d1c0dc05ad5e73c4  modules.blocklist
+157b27feebcfddf800a1ffd8c6e369d2b58e5db25b1a44b4443dada8d9fe74abb91d036b9f0e97769bbafbdc72020b5637313682c6932fe7b0bddb9ebebbad42  modem-load.conf
+695feac7f69a0ec8c5e007cdb651adcc3492f1c6236e7fd183edec2a5e25cb957d3ace630ea5fdb87fd703e35ac368f1d097c2f881ecb52c9cfd433564db2a6c  modem-opts.conf
+72b1554929843990a7665fdf1e45f7ef304fc45d3fa3b1082dcb9dd6cb9d3e9f6799659a8e2fdbd24a809319654543d1c20a0528856002c3de319d5546e2af8b  modules.blocklist
 b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
-9aaae66ae159236346f67818c44da61aed84a63b3bac0c706492f198db82fc67c2378bcabaf260b695b980bf2faf144472f15355bb097b021551db9547f2e1bc  uboot-script.cmd
+239a54ae5c5effb53ccf4d658652c0462da57604b16b77a63627a17caa171caf82e3d1769f9c5afea8756415acbbf3b73db9b57715fce6c70ea3f29e5c6ac84a  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 737d9e57e219a0220c5b1943375f325309323344fdf06973546c7d88ed9aec857657abd6b7861669873574f865e1c99719d411e0564dbfebe028f9e77d308491  x11-keymap
+2b14c74c07f1bf068795845927b4f23eb7e60dab381e1f646db49b88d24eb43ac04a626db87d4467cf95f2e3948908e90f29d3ed834001b3b5f71fd95a79a761  xdefaults
 a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2  xorg.conf
 "
@@ -9,7 +9,6 @@ deviceinfo_year="2009"
 deviceinfo_chassis="handset"
 deviceinfo_dtb="omap3-n900"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="tsc2005 tsc200x-core omap_wdt twl4030_wdt omap-sham"
 deviceinfo_arch="armv7"

 # Device related
@@ -1,31 +0,0 @@
-- vim: ts=4 sw=4 noet ai cindent syntax=lua
-
-conky.config = {
-    alignment = 'middle_left',
-    background = false,
-    default_color = 'white',
-    default_outline_color = 'black',
-    draw_graph_borders = true,
-    draw_outline = true,
-    use_xft = true,
-    font = 'DejaVu Sans Mono:size=20',
-    default_bar_height = 6,
-    gap_x = 30,
-    gap_y = -50,
-    double_buffer = true,
-    out_to_console = false,
-    out_to_stderr = false,
-    extra_newline = false,
-    update_interval = 3.0,
-}
-
-conky.text = [[
-${if_running mpd}${if_mpd_playing}${mpd_title}
-${color gray}${mpd_artist}
-${mpd_bar}
-${else}postmarketOS
-${color gray}Linux ${kernel}
-${endif}${else}postmarketOS
-${color gray}Linux ${kernel}
-${endif}
-]]
@@ -28,12 +28,12 @@ mode "mpd" {
        bindsym Up exec mpc vol +2
        bindsym Down exec mpc vol -2

-        bindsym n exec st -f "Liberation Mono-12" -e ncmpcpp; mode "default"
+        bindsym n exec urxvt -e ncmpcpp; mode "default"
        bindsym q mode "command"
 }

 mode "command" {
-        bindsym t exec st -f "Liberation Mono-12" -e ~/.protip_shell.sh; mode "default"
+        bindsym t exec urxvt -e ~/.protip_shell.sh; mode "default"
        bindsym d exec dmenu_run; mode "default"
        bindsym q mode "default"
        bindsym k kill; mode "default"
@@ -63,8 +63,12 @@ bindsym Shift+space mode "command"
 # This is the slidey button on the side
 bindsym XF86ScreenSaver exec --no-startup-id lock.sh

-# Pressing the power button suspends the device
-bindsym XF86PowerOff exec --no-startup-id sudo pm-suspend
+# Pressing the power button offers reboot, shutdown, or suspend choice
+bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
+        -m 'Choose Power Button Action:' \
+        -B 'Reboot' 'loginctl reboot' \
+        -B 'Suspend' 'loginctl suspend' \
+        -B 'Shutdown' 'loginctl poweroff'

 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
@@ -87,5 +91,3 @@ exec_always --no-startup-id feh --bg-fill /usr/share/wallpapers/postmarketos.jpg
 # Hide mouse cursor
 exec --no-startup-id unclutter-xfixes --fork

-# Display various information on desktop (see conky config)
-exec --no-startup-id conky --daemonize
@@ -0,0 +1 @@
+nokia-modem
@@ -0,0 +1 @@
+options nokia-modem pm=1
@@ -0,0 +1,7 @@
+matrix_keymap
+omap_wdt
+omap-sham
+tsc2005
+tsc200x-core
+twl4030_keypad
+twl4030_wdt
@@ -1,11 +1,3 @@
-# Modem is suspected to be partly responsible for dma crashes.
-# It is probably safe to probe manually later as needed
-blacklist omap_ssi
-blacklist nokia_modem
-blacklist ssi_protocol
-blacklist cmt_speech
-blacklist hsi_char
-blacklist hsi
 # rx51-battery is not absolutely necessary to running system, but can be
 # useful to keep around since it can detect battery design capacity
 blacklist rx51_battery
@@ -2,7 +2,7 @@ setenv mmcnum 0
 setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
-setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
+setenv bootargs init=/init.sh rw console=tty0 console=ttyS2 maxcpus=0 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE
 setenv mmckernfile /uImage
 setenv mmcinitrdfile /uInitrd
 setenv mmcscriptfile
@@ -0,0 +1,4 @@
+URxvt*foreground: White
+URxvt*background: Black
+URxvt*font: xft:DejaVu Sans Mono:style=Book:pixelsize=13:antialias=true:hinting=true
+URxvt*boldFont: xft:DejaVu Sans Mono:style=Bold:pixelsize=13:antialias=true:hinting=true
@@ -4,7 +4,7 @@
 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
 pkgver=0.2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -15,7 +15,7 @@ depends="linux-postmarketos-exynos5
 	"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo"
+source="deviceinfo modules-initfs"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -32,5 +32,6 @@ nonfree_firmware() {
 }

 sha512sums="
-dc89cd7b207b84fa8bdd1d26ffc16f89261123c92b3575e4b998cbdffa0752ebcf7fa130ec742cfb13b2066d7ae1bb9fb55621d67840ebfec17ab9fe5064866c  deviceinfo
+bf14f975ee01f8dbc9109444ab408ac0948ae67af267d8f4101f2ca688750761277e793b2800985277d0e91205c13e89bd66e37bfebe3608ea7d29ecdb20c907  deviceinfo
+9f6c3cc0079e718ef0dfc221fadaf9bc092a8601b62794c2298eab893924af457612bd8a6e852fb2b181bee637e774dd2abea681eb72b1aa9c6672e686454795  modules-initfs
 "
@@ -13,7 +13,6 @@ deviceinfo_arch="armv7"
 deviceinfo_no_framebuffer="true"
 deviceinfo_getty="ttySAC2;115200"
 deviceinfo_disable_dhcpd="true"
-deviceinfo_modules_initfs="uas usb-storage scsi_mod sd_mod t10_pi"

 # Device related
 deviceinfo_gpu_accelerated="true"
@@ -0,0 +1,5 @@
+uas
+usb-storage
+scsi_mod
+sd_mod
+t10_pi
@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=10
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -21,6 +21,7 @@ depends="
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
+	modules-initfs
 	q6voiced.conf
 "
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -43,6 +44,7 @@ nonfree_firmware() {
 }

 sha512sums="
-5a1771d1c2c70ae18e1ae11fe94617c5899995c3848c38f359232d587c076f36fb159bd654cfea0510a343e44c50b39d20148e650b1cbb3629d6fdc371ad8dc5  deviceinfo
+71b4d74cebe22556b2c819fdb6b279366c9a566cb077f6e6e80c0c0b2e7c7fca48ea23ffbacca5cce4c636d8f3e66ad8f66ce36e954644242f6b5a71c89f9ed6  deviceinfo
+ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 "
@@ -40,5 +40,4 @@ deviceinfo_initfs_compression="zstd:fast"
 deviceinfo_rootfs_image_sector_size="4096"

 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"
@@ -0,0 +1,4 @@
+i2c_qcom_geni
+rmi_core
+rmi_i2c
+qcom_spmi_haptics
@@ -0,0 +1,2 @@
+[quirks]
+fbdev_force_refresh=true
@@ -3,7 +3,7 @@

 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=10
+pkgver=11
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,7 +20,9 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="
+	10-unl0kr.conf
 	deviceinfo
+	modules-initfs
 	q6voiced.conf
 "
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -31,6 +33,9 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/10-unl0kr.conf \
+		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
 }

 nonfree_firmware() {
@@ -43,6 +48,8 @@ nonfree_firmware() {
 }

 sha512sums="
-6884b6911cebea9a4ee9926b9af8a5670a298535abb774e935a780d7939a1956dfe23e5f596e442a75d62cba1083b4c85a2d657f16f2fc48b9d68e833af74f71  deviceinfo
+e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
+53f2c5223fd708990b7642c3c83a5a58388e810d179aa24fae4e9fe0f187008a32511c8294819f8933c3377a0c2ebd5512fb03a3900fde78662bd93d034338df  deviceinfo
+ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 "
@@ -40,5 +40,4 @@ deviceinfo_initfs_compression="zstd:fast"
 deviceinfo_rootfs_image_sector_size="4096"

 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"
@@ -0,0 +1,4 @@
+i2c_qcom_geni
+rmi_core
+rmi_i2c
+qcom_spmi_haptics
@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,6 +27,7 @@ install="
 "
 source="
 	deviceinfo
+	modules-initfs
 	nvme-powersave.initd
 	wlan-powersave-off.start
 	enable-s2idle.conf
@@ -58,7 +59,8 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 sha512sums="
-0933548a542098458c0beab4c90ae51a325b284a6c699015ff1179bef607aa9398171e1abc5e851111e0b097ef848577a41ca6b45f2d8349726563f265b8e8f5  deviceinfo
+7ebb7e00ae1566fd4c176839c4cd6501f237b577e8db1180aa9934d70101807f8f9b513e529da3f0e96b73d682708b1f51a94430bc90d655f0d7ac059b076a04  deviceinfo
+6e3d97855a1f898db46b87ae1eb190d23d841fcb72332fcac4d11cd27c8f7d50eb8fd73007ed0447f106d19ff2e0fc1f34da1baf890e1465135dd692d65df2ba  modules-initfs
 2abfa31fa56028339efc6d2b6cb838f310990d7110ac4dd996bc4cfcf90f0a8770e70f28f77f7b6929d110e494bc33731302f16b9717729f991c2732be0731d5  nvme-powersave.initd
 0fd7580e197e409978c219726af627cabe347404ee826e32892b61f3da1775b0fd81f8ed5e9a0f0bfaad87faa434d7a73ddaebf475ed0ad8fdcef6690cd692d3  wlan-powersave-off.start
 811af9c79151f41e25916c0f0bb130e82ebfb7d4d5b63413a3fed6700f829c1c017a12e85da230ed2f47a6bd49ed2bf5da19bbc4576ce485a48a2d3808a3a691  enable-s2idle.conf
@@ -7,7 +7,6 @@ deviceinfo_manufacturer="PINE64"
 deviceinfo_codename="pine64-pinebookpro"
 deviceinfo_year="2019"
 deviceinfo_dtb="rockchip/rk3399-pinebook-pro"
-deviceinfo_modules_initfs="gpu_sched dw_wdt fusb302"
 deviceinfo_arch="aarch64"

 # Device related
@@ -0,0 +1,3 @@
+gpu_sched
+dw_wdt
+fusb302
@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=3.8
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -35,6 +35,7 @@ source="
 	51_keyboard.gschema.override
 	90-modem-eg25.rules
 	deviceinfo
+	modules-initfs
 	modemmanager.conf
 	ppkb.sh
 	setup-modem.sh
@@ -136,13 +137,14 @@ x11() {
 sha512sums="
 2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7  51_keyboard.gschema.override
 98e9dcfb36dd5843ff441b148e3bffb70757c59601c5f01f55a584e8f017c7ca73f2275c1bff46e4236dd8174df36a43d10abf9b8dadee988b962036846dc6ed  90-modem-eg25.rules
-a2fec232778b5ba493c7a8b85b2121cdd19778cce0dac25f51ac3d2f1b48fb55b602ae62ae7d6a1a39af9310e4c05f04faf82c2b3f24698a0bee8cf303a115bb  deviceinfo
+aa33c497b145f0e840ccf646814cc7f53c49e7472c013b3cb951614766d568e70578869305dfd5bbc87490927e2b5b5798437b5cf31efe7baca8089f0b7b7771  deviceinfo
+3ab1a9482d97739b03299f9237d15cb1d1d76ca2298bc6c1b4d1214590464cb13139d1a9c98c3eb7761ef8a5db060d5e365b38efcac57ed9ae34a1d12657e3f5  modules-initfs
 c5006c38828eb519917d57756f7831c4552feffef2d4922a384073f6a551535f615ad397d784e313818e0b943e1f6212bcca0aff9ce37da60b29547b1631f24b  modemmanager.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
 420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515  setup-modem.sh
 1684514a6b814a83473e9da8855fd776cf3f31a2be1f8834c370f710428b4ee305559e275be52894d167ccd1e32f8f1c8586f8a072f19e44b46caec9f504d453  HiFi.conf
 9c6edbe7ea387baf9bfa6c4a46b28c4fe274ab0994e0a1640012048407e6679c437de43cc50e6778c9a852132eaa680de3fd4e0256d36455d1dd57aa729ac8be  PINE64-PinePhonePro-.conf
 e4d721163a844c68c0240be62a4692e7b9983054aee6d717f70687b901f569c6008e0c64a5bddf37e20f41b3936b4ef80909d7cbf09feeb0813303b3b46de80f  VoiceCall.conf
-a7b49a638f664f7682ce6b00eb4d1ae26a429e89354056de05fb49d25fc9555d7f80e6d8f4b0a250878a4e7823860fd156068ed6604ce6cf58badef45c545161  x11-pinephone-keyboard.conf
 bb11151e246d16e071761ebb35ca7f8b8cedbad8366e9bac6aed30554a795877cc9dccbe69ecca4b19b6f72bd87e613705f3ae4f2f40d2f9c2d09cc179999d59  sway-pinephone-keyboard.conf
+a7b49a638f664f7682ce6b00eb4d1ae26a429e89354056de05fb49d25fc9555d7f80e6d8f4b0a250878a4e7823860fd156068ed6604ce6cf58badef45c545161  x11-pinephone-keyboard.conf
 "
@@ -7,7 +7,6 @@ deviceinfo_manufacturer="PINE64"
 deviceinfo_codename="pine64-pinephonepro"
 deviceinfo_year="2021"
 deviceinfo_dtb="rockchip/rk3399-pinephone-pro"
-deviceinfo_modules_initfs="gpu_sched dw_wdt fusb302 panel_himax_hx8394 goodix_ts"
 deviceinfo_arch="aarch64"

 # Device related
				`@@ -1,2 +0,0 @@`
				`%wheel ALL = NOPASSWD: /usr/sbin/pm-suspend`