.ci/shellcheck.sh

@@ -26,6 +26,7 @@ sh_files="
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.post-install
+	./device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')

.ci/testcases/test_deviceinfo.py

@@ -17,12 +17,15 @@ def deviceinfo_obsolete(info):
     Test for obsolete options used in the deviceinfo file. They must still be
     defined in pmbootstrap's config/__init__.py.
     """
-    obsolete_options = ["weston_pixman_type"]
+    obsolete_options = [
+        "usb_rndis_function",
+        "weston_pixman_type",
+    ]
     for option in obsolete_options:
-        if info[option]:
-            raise RuntimeError("option '" + option + "' is obsolete, please"
-                               " remove it (reasons for removal are at"
-                               " <https://postmarketos.org/deviceinfo>)")
+        if option in info and info[option]:
+            raise RuntimeError(f"option {option} is obsolete, please rename"
+                               " or remove it (see reasons for removal of at"
+                               " https://postmarketos.org/deviceinfo)")
 
 
 def test_deviceinfo(args):

CODEOWNERS

@@ -29,7 +29,7 @@ device/*/linux-google-veyron/			@jenneron
 device/*/u-boot-peach-pi/			@jenneron
 device/*/device-google-cozmo/			@jenneron
 device/*/u-boot-veyron-speedy/			@jenneron
-device/*/device-google-juniper/			@jenneron
+device/*/device-google-juniper/			@jenneron @binarycraft
 device/*/u-boot-peach-pit/			@jenneron
 device/*/device-google-damu/			@jenneron
 device/*/u-boot-nyan-4gb/			@jenneron
@@ -37,7 +37,7 @@ device/*/device-google-kenzo/			@jenneron
 device/*/device-google-kodama/			@jenneron
 device/*/u-boot-snow/				@jenneron
 device/*/device-google-kevin/			@jenneron
-device/*/linux-postmarketos-exynos5/		@jenneron
+device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/device-google-krane/			@jenneron
 device/*/soc-mediatek-mt8183/			@jenneron
 device/*/u-boot-veyron-minnie/			@jenneron
@@ -45,6 +45,7 @@ device/*/device-google-fennel14/		@jenneron
 device/*/linux-google-nyan/			@jenneron
 device/*/device-google-willow/			@jenneron
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron
+device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/device-google-nyan-blaze/		@jenneron
 device/*/firmware-powervr-gx6250/		@jenneron
 device/*/device-google-hana/			@jenneron
@@ -56,13 +57,27 @@ device/*/device-google-kakadu/			@jenneron
 device/*/firmware-google-veyron-brcm/		@jenneron
 device/*/device-google-peach-pit/		@jenneron
 device/*/device-lg-judyp/			@jenneron
+device/*/device-asus-tf201/			@clamor95
+device/*/device-asus-tf300t/			@clamor95
+device/*/device-asus-tf300tg/			@clamor95
+device/*/device-asus-tf700t/			@clamor95
+device/*/device-lg-p895/			@clamor95
+device/*/firmware-asus-transformer/		@clamor95 @jenneron
+device/*/firmware-lg-x3/			@clamor95
+device/*/linux-postmarketos-grate/		@clamor95 @jenneron
+device/*/device-samsung-chagallwifi		@Grimler
+device/*/device-odroid-xu4			@Grimler
+device/*/device-samsung-klimtlte		@Grimler
+device/*/linux-samsung-klimtlte			@Grimler
+device/*/firmware-odroid-xu4			@Grimler
+device/*/linux-samsung-chagallwifi		@Grimler
 
 main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/osk-sdl/					@craftyguy
 main/postmarketos-ui-plasma-mobile/ 		@bshah
 main/ttyescape					@calebccff
 temp/u-boot-librem5/				@craftyguy @bshah
-temp/alsa-ucm-conf-google-kukui/		@jenneron
+temp/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
 temp/alsa-ucm-conf-google-gru/			@jenneron
 
 # vim: ts=8 sw=4 et

channels.cfg

@@ -8,6 +8,12 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
+[v22.12]
+description=Upcoming stable release (DO NOT USE)
+branch_pmaports=v22.12
+branch_aports=3.17-stable
+mirrordir_alpine=v3.17
+
 [v22.06]
 description=Latest release / Recommended for best stability
 branch_pmaports=v22.06

device/community/device-oneplus-enchilada/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,5 +51,5 @@ phosh() {
 sha512sums="
 9b0603ceef02ec632ff333167b252743cc5461ae371b656a6468addf22d43ec10010d9348caebc9c21e2cdafb95af7bf6266ad405ac245779a325154d404bfde  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
-7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
+fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 "

device/community/device-oneplus-enchilada/q6voiced.conf

 q6voice_card=0
-q6voice_device=3
+q6voice_device=6

device/community/device-oneplus-fajita/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,7 +19,11 @@ depends="
 	soc-qcom-sdm845-qbootctl
 "
 makedepends="devicepkg-dev"
-source="deviceinfo phoc.ini"
+source="
+	deviceinfo
+	phoc.ini
+	q6voiced.conf
+"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
 
 build() {
@@ -34,6 +38,8 @@ nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
 	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware"
 	mkdir "$subpkgdir"
+
+	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }
 
 phosh() {
@@ -45,4 +51,5 @@ phosh() {
 sha512sums="
 8561a33c0e7d5085186258a71d2fc44daa01b24d05781d53be87222b462059fee26baa2e004e799404606429629e56baad3778d74d1f725cec389f572c92155e  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
+fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 "

device/community/device-oneplus-fajita/q6voiced.conf

+q6voice_card=0
+q6voice_device=6

device/community/linux-postmarketos-qcom-sdm845/APKBUILD

@@ -5,7 +5,7 @@
 
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=6.1.0_rc3
+pkgver=6.1.0_rc4
 pkgrel=0
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
@@ -18,7 +18,7 @@ options="!strip !check !tracedeps
 makedepends="bash bison findutils flex installkernel openssl-dev perl"
 
 _config="config-$_flavor.$arch"
-_tag="sdm845-6.1.0_rc3"
+_tag="sdm845-6.1.0_rc4"
 
 # Source
 source="
@@ -55,6 +55,6 @@ package() {
 }
 
 sha512sums="
-a4096863f06d00edba6af76f89ea24047badba5d1d1363ba31701dd1088aab34c470a5552b8b3db4cb5d21065496ccac9aa59c05e4d15561d4cfb03706d8962e  linux-sdm845-6.1.0_rc3.tar.gz
-b2bcef118e3468187a26aa7ca4a79eea84292f69d7f9fecd943d752bb6d8fee44e1d504732f506350e37c9553881b051d4859e49c2e4f836242f43d881c37abe  config-postmarketos-qcom-sdm845.aarch64
+f120f2214143b19ded041d1412c4926cdcbda138343bdc59fe515726cff5a2fe2c29a9754071ebde909aad440abdc581c23606fd235d4ab1f2f56bb6ee9aa6ad  linux-sdm845-6.1.0_rc4.tar.gz
+36276338fbc5f8e4a691a3fcbbfdf547e0f2e47d94343a5a1a61ae1fe73f392e90ed2e08a693ed180270af2e6d02ea90b4a5a9e2269813d60b990d68bfca3b4d  config-postmarketos-qcom-sdm845.aarch64
 "

device/community/linux-postmarketos-qcom-sdm845/config-postmarketos-qcom-sdm845.aarch64

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.0-rc3 Kernel Configuration
+# Linux/arm64 6.1.0-rc4 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r3) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0

device/community/soc-qcom-sdm845/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=12
+pkgver=13
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -19,12 +19,14 @@ subpackages="
 	$pkgname-vulkan
 "
 
-_ucm_commit="f2a9fad117c2c86d693623fd47dee5b6f7385fe2"
+_ucm_commit="3cece34e28f0a04daec2cf39a7830dd8043f614b"
 source="
 	alsa-ucm-conf-$_ucm_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_ucm_commit/alsa-ucm-conf-$_ucm_commit.tar.gz
 	90-feedbackd-pmi8998.rules
 	modemmanager.conf
 	UPower.conf
+	call_audio_idle_suspend_workaround.sh
+	call_audio_idle_suspend_workaround.initd
 "
 
 package() {
@@ -49,12 +51,21 @@ nonfree_firmware() {
 	msm-modem
 	msm-modem-uim-selection
 	bootmac
+	alsa-utils
 "
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 
 	install -Dm644 "$srcdir"/modemmanager.conf \
 		"$subpkgdir"/etc/conf.d/modemmanager
+
+	# Call Audio idle suspend workaround code
+	install -Dm755 "$srcdir"/call_audio_idle_suspend_workaround.sh \
+		"$subpkgdir"/usr/sbin/call_audio_idle_suspend_workaround
+
+	# Call Audio idle suspend workaround init script
+	install -Dm755 "$srcdir"/call_audio_idle_suspend_workaround.initd \
+		"$subpkgdir"/etc/init.d/call_audio_idle_suspend_workaround
 }
 
 ucm() {
@@ -81,8 +92,10 @@ vulkan() {
 }
 
 sha512sums="
-92fa44327488d8deca17be50c3e37538e7e25875b7da8d921058a732ce2dbe8bf6a4d88b2052eea56ffd9a54212babbae10e94fe5e8eed04cce7ce3a37c03833  alsa-ucm-conf-f2a9fad117c2c86d693623fd47dee5b6f7385fe2.tar.gz
+22daa3477890d24b0410216cf483204dd6b35875bdc954c5092f8492ce389255d54aee4dbafe0cf1a2f7d08fd153364e18097391b3d8ceecd59ef2ef525bef02  alsa-ucm-conf-3cece34e28f0a04daec2cf39a7830dd8043f614b.tar.gz
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 e33f41360ccc4900bb76a26cc7b46bde1fb90facdf45c4fbcebc80499386939948401cacd6df9f779eafab10f4ee77ee1fef3e7bd06f483f8c2a4a644c84f327  modemmanager.conf
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
+aa5cdb138a3cdd0b15d2bbb60c7f67ae0280ddc7d0488cfe2fc44680095a43c1cdacc54d70a689f2117538e9bf1e42758d8c3ac542c9cb8e8dc6d6f3161b7577  call_audio_idle_suspend_workaround.sh
+1111d28b6e23163fb47fcfadc2ed3f83543ce0435c6be187a38d418cfe7821fe7905ac103969f3f7c115bd522d99c43efd52409835e292270a6ac9c34b5bee75  call_audio_idle_suspend_workaround.initd
 "

device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.initd

+#!/sbin/openrc-run
+
+name="call_audio_idle_suspend_workaround"
+description="Disable pulseaudio suspend-on-idle module during call"
+pid="/run/call_audio_idle_suspend_workaround.pid"
+
+depend() {
+	need dbus
+}
+
+start() {
+	ebegin "Starting call audio idle suspend workaround"
+
+	userid=10000 # Default User ID in pmOS
+	user=$(getent passwd $userid | cut -d: -f1)
+	env_var="XDG_RUNTIME_DIR=/run/user/$userid"
+	cmd="/usr/sbin/call_audio_idle_suspend_workaround"
+
+	start-stop-daemon --start --exec "$cmd" --env "$env_var" --background --user $user --pidfile "$pid" --make-pidfile
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping call audio idle suspend workaround"
+
+	start-stop-daemon --stop --pidfile "$pid"
+	eend $?
+}

device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh

+#!/bin/sh
+
+# dbus-monitor is run as a child process to this script. Kill child process too when the script terminates.
+trap 'pkill -9 -P $$ && exit 0' INT TERM
+
+interface=org.freedesktop.ModemManager1.Call
+member=StateChanged
+
+dbus-monitor --system "type='signal',interface='$interface',member='$member'" |
+	while read -r line; do
+		state=$(echo "$line" | awk '/\<int32\>/ {print $2}')
+		if [ -n "$state" ]; then
+			# Call State is based on https://www.freedesktop.org/software/ModemManager/doc/latest/ModemManager/ModemManager-Flags-and-Enumerations.html#MMCallState
+			if [ "$state" -eq '0' ] || [ "$state" -eq '3' ]; then
+				echo "Call Started"
+
+				# Unload module-suspend-on-idle when call begins
+				pactl unload-module module-suspend-on-idle
+			fi
+
+			if [ "$state" -eq '7' ]; then
+				echo "Call Ended"
+
+				# Reload module-suspend-on-idle after call ends
+				pactl load-module module-suspend-on-idle
+			fi
+		fi
+	done &
+
+wait

device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-install

@@ -2,3 +2,4 @@
 rc-update add tqftpserv boot
 rc-update add pd-mapper boot
 rc-update add q6voiced default
+rc-update add call_audio_idle_suspend_workaround default

device/main/linux-postmarketos-allwinner/0013-revert-kbuild-fix-Wimplicit-function-declaration-in-.patch

+From acfc63f6f42ccc8917652def2fcd330256f6e2fd Mon Sep 17 00:00:00 2001
+From: Jan Jasper de Kroon <jajadekroon@gmail.com>
+Date: Sat, 26 Nov 2022 20:33:28 +0100
+Subject: [PATCH] revert:  kbuild: fix -Wimplicit-function-declaration in
+ license_is_gpl_compatible
+
+This commit introduces the include <linux/string.h> into licences.h,
+which seems to have been introduced for building with Clang,
+but breaks building with gcc. Reverting this will fix the build proces.
+---
+ include/linux/license.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/include/linux/license.h b/include/linux/license.h
+index ad937f57f..7cce390f1 100644
+--- a/include/linux/license.h
++++ b/include/linux/license.h
+@@ -2,8 +2,6 @@
+ #ifndef __LICENSE_H
+ #define __LICENSE_H
+ 
+-#include <linux/string.h>
+-
+ static inline int license_is_gpl_compatible(const char *license)
+ {
+ 	return (strcmp(license, "GPL") == 0
+-- 
+2.34.3
+

device/main/linux-postmarketos-allwinner/APKBUILD

@@ -7,9 +7,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.0.7_git20221105
-pkgrel=1
-_tag="orange-pi-6.0-20221105-1830"
+pkgver=6.1.0_rc6_git20221126
+pkgrel=0
+_tag="orange-pi-6.1-20221126-1540"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -48,6 +48,7 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
 	0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
 	0011-sunxi-mmc-h6-fix.patch
 	0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+	0013-revert-kbuild-fix-Wimplicit-function-declaration-in-.patch
 	"
 builddir="$srcdir/linux-$_tag"
 
@@ -83,9 +84,9 @@ package() {
 }
 
 sha512sums="
-c36aec0f3e807d9631811b0f77fed75e961e9617a8d3f5e4ae21e87d39c64623dc201626d49a3f292298369ee18d99de66577adcf9347af192a651a3cc2545b3  linux-postmarketos-allwinner-orange-pi-6.0-20221105-1830.tar.gz
-46bdcb9307dd7593dabdda9d046f2166a18086d7ea9374ea4d119645bcb91d2b0c32993b4076178265c7f259e1ad62f66b7ad3ea3b265aa5314794c8cac14edd  config-postmarketos-allwinner.aarch64
-04364e9b741e06efdf171e73bf7733ffb920f369a9e0748b5df2737eb86f7b7c4cfbac6fc72484505379b808e5896beee81599f850c0804fbb0ffecf09ca2a5b  config-postmarketos-allwinner.armv7
+8586ccd1f3922c848f6ff773e781581c53df8573a1fa018e4b687125f50313499d09504c65b10f74d4b0c30459fb1b6ee8c384a4fae6eae03a4f30cc966da231  linux-postmarketos-allwinner-orange-pi-6.1-20221126-1540.tar.gz
+08a5b47ce9c5d1d69ab79af936a55cb7e5f445c6176cfc8da50c28670e238083bace2b5fafc117a46858ddeb3d2a506ba582f68fd0d7767d248d33bd610cbe0d  config-postmarketos-allwinner.aarch64
+585b5da7d69b2411950ae89681ef85155a6e5c2fd0d2c74f5a767c9ba2b41b25cd3ad6b335f61604b968bd889ba62a95467b79b12a5a029c58d39724cbcd5a5e  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04  0002-dts-add-pinetab-dev-old-display-panel.patch
 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa  0003-dts-pinetab-add-missing-bma223-ohci1.patch
@@ -98,4 +99,5 @@ c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e
 902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682  0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
 2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf  0011-sunxi-mmc-h6-fix.patch
 22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694  0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+0758e4b03370475cd3c053083926c7ceb1cf5fb4bfcf107920eebdf18724e77ba6d7ed4280049ac88585da4c4e8d721fde380596939210d1dfd54123505ca1ba  0013-revert-kbuild-fix-Wimplicit-function-declaration-in-.patch
 "

device/main/u-boot-pinephone/APKBUILD

@@ -6,7 +6,7 @@
 # U-boot with patches to make the PinePhone boot faster and have control over the ddr clock speed
 pkgname=u-boot-pinephone
 pkgver=2022.07
-pkgrel=0
+pkgrel=1
 pkgdesc="U-Boot bootloader for the PINE64 PinePhone"
 url="https://source.denx.de/u-boot"
 arch="aarch64"
@@ -32,8 +32,7 @@ source="https://source.denx.de/u-boot/u-boot/-/archive/v$pkgver/u-boot-v$pkgver.
 	0002-disable-bootdelay.patch
 	"
 builddir="$srcdir/u-boot-v$pkgver"
-install="$pkgname.post-upgrade"
-frequencies='528 552 624'
+_frequencies='528 552 624'
 
 build() {
 	touch include/config.h
@@ -44,7 +43,7 @@ build() {
 	export SCP="/usr/share/crust/pinephone/scp.bin"
 	export BUILD_DIR="$builddir"/build
 
-	for freq in $frequencies; do
+	for freq in $_frequencies; do
 		mkdir -p "$BUILD_DIR-$freq"
 		sed -rie "s/^(CONFIG_DRAM_CLK=).*$/CONFIG_DRAM_CLK=$freq/" configs/pinephone_defconfig
 		cat configs/pinephone_defconfig | grep CONFIG_DRAM_CLK
@@ -55,7 +54,7 @@ build() {
 }
 
 package() {
-	for freq in $frequencies; do
+	for freq in $_frequencies; do
 		install -D -m644 "build-$freq/u-boot-sunxi-with-spl.bin" \
 			"$pkgdir/usr/share/u-boot/pine64-pinephone/u-boot-sunxi-with-spl-$freq.bin"
 		install -D -m644 "build-$freq/u-boot-sunxi-with-spl.bin.sha512" \
@@ -66,7 +65,7 @@ package() {
 
 sha512sums="
 7cd524d5c4b692c99d61fae4e7d99287ce4bca06884dc02b62bd69dfdf594cc9232c13c5b8dbb3aeac125bf7907591dbc6a40e2ea3e39f024bd5a5d42aeaa4cd  u-boot-v2022.07.tar.gz
-d6e1ca6100fdc0ecd9559d556bb8f6699ff807a180d097808417cdacc07fc22b58f8bf33f1f104fcbb28201bd873e469f251176605bec123870ff49bde50024c  update-u-boot
+8dc0a8847ed26d91d3acc9b7b9dd300f95a68049207b09c3cfca1ec485f6f976aa65e0d101a4b46ecc4e85e943cbdec35e81ab0da07b1d5d0b68b4b10858b44b  update-u-boot
 86d9587cb2b0ca99fb4090bd0daacd47c0043858654f6f7114c8d0ed6c660eb2b8bc0b37de6723e738df9b1137d62482f00764c284f4aa0a6054db9efe754db9  0001-common-expose-DRAM-clock-speed.patch
 9b9a5bd2cb5c04715a5bb2d34bfc06e63817dba7ec40fa2b09000a0827590623e85ed5877d6b6bb39f2bb917e5e9d8e1379e3df9128e3304be06abc487c68df2  0002-disable-bootdelay.patch
 "

device/main/u-boot-pinephone/u-boot-pinephone.post-upgrade

-#!/bin/sh
-
-update-u-boot -s