WIP

cross/binutils-aarch64/APKBUILD

@@ -3,8 +3,8 @@
 # Based on: main/binutils
 
 pkgname=binutils-aarch64
-pkgver=2.38
-pkgrel=0
+pkgver=2.37
+pkgrel=4
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -16,6 +16,8 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
+	bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+	defang-no-split.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -40,6 +42,14 @@ fi
 #   2.28-r1:
 #     - CVE-2017-7614
 
+prepare() {
+	default_prepare
+
+	# Remove existing empty man pages to force them to be regenerated.
+	# Workaround for https://gitlab.alpinelinux.org/alpine/aports/-/issues/13034
+	find "$builddir" -name '[a-z]*\.[0-9]*' -empty -delete
+}
+
 build() {
 	_target="$(arch_to_hostspec aarch64)"
 	"$builddir"/configure \
@@ -71,10 +81,12 @@ package() {
 
 
 sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7  binutils-2.37.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+10a0074583d2cc4598710c7e434ba7088da074b105f4f5e951fc61af7150ad62adf60a7c98f6fd13b1771f169e45a5a1ef618240c6893d3f0f3d93fd768a03c6  bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+4652f092c9376f0cb7fd6c72cb37ff7c15c1c6e3408fac79329b7f41a7925c98eb35989a9a040682130988a36401901d6d95afa44f0ce50caa85ee478db6bf03  defang-no-split.patch
 "

cross/binutils-aarch64/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch

@@ -0,0 +1,234 @@
+Upstream: yes
+URL: https://sourceware.org/bugzilla/show_bug.cgi?id=28138
+From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Mon, 26 Jul 2021 05:59:55 -0700
+Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
+
+Close the file descriptor if there is no archive plugin file descriptor
+to avoid running out of file descriptors on thin archives with many
+archive members.
+
+bfd/
+
+	PR ld/28138
+	* plugin.c (bfd_plugin_close_file_descriptor): Close the file
+	descriptor there is no archive plugin file descriptor.
+
+ld/
+
+	PR ld/28138
+	* testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
+	native build.
+
+	PR ld/28138
+	* testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
+	* testsuite/ld-plugin/pr28138.c: New file.
+	* testsuite/ld-plugin/pr28138-1.c: Likewise.
+	* testsuite/ld-plugin/pr28138-2.c: Likewise.
+	* testsuite/ld-plugin/pr28138-3.c: Likewise.
+	* testsuite/ld-plugin/pr28138-4.c: Likewise.
+	* testsuite/ld-plugin/pr28138-5.c: Likewise.
+	* testsuite/ld-plugin/pr28138-6.c: Likewise.
+	* testsuite/ld-plugin/pr28138-7.c: Likewise.
+
+(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
+(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
+---
+ bfd/plugin.c                       |  8 +++++++
+ ld/testsuite/ld-plugin/lto.exp     | 34 ++++++++++++++++++++++++++++++
+ ld/testsuite/ld-plugin/pr28138-1.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-2.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-3.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-4.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-5.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-6.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-7.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138.c   | 20 ++++++++++++++++++
+ 10 files changed, 104 insertions(+)
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138.c
+
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 6cfa2b66470..3bab8febe88 100644
+--- a/bfd/plugin.c
++++ b/bfd/plugin.c
+@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+ 	     && !bfd_is_thin_archive (abfd->my_archive))
+ 	abfd = abfd->my_archive;
+ 
++      /* Close the file descriptor if there is no archive plugin file
++	 descriptor.  */
++      if (abfd->archive_plugin_fd == -1)
++	{
++	  close (fd);
++	  return;
++	}
++
+       abfd->archive_plugin_fd_open_count--;
+       /* Dup the archive plugin file descriptor for later use, which
+ 	 will be closed by _bfd_archive_close_and_cleanup.  */
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index def69e43ab3..999d911ce6a 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
++++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+     }
+ }
+ 
++run_cc_link_tests [list \
++    [list \
++	"Build pr28138.a" \
++	"-T" "" \
++	{pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
++	 pr28138-6.c pr28138-7.c} {} "pr28138.a" \
++    ] \
++    [list \
++	"Build pr28138.o" \
++	"" "" \
++	{pr28138.c} {} \
++    ] \
++]
++
++set exec_output [run_host_cmd "sh" \
++			      "-c \"ulimit -n 20; \
++			      $CC -Btmpdir/ld -o tmpdir/pr28138 \
++			      tmpdir/pr28138.o tmpdir/pr28138.a\""]
++set exec_output [prune_warnings $exec_output]
++if [string match "" $exec_output] then {
++    if { [isnative] } {
++	set exec_output [run_host_cmd "tmpdir/pr28138" ""]
++	if [string match "PASS" $exec_output] then {
++	    pass "PR ld/28138"
++	} else {
++	    fail "PR ld/28138"
++	}
++    } else {
++	pass "PR ld/28138"
++    }
++} else {
++    fail "PR ld/28138"
++}
++
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+ set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
+new file mode 100644
+index 00000000000..51d119e1642
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-1.c
+@@ -0,0 +1,6 @@
++extern int a0(void);
++int
++a1(void)
++{
++  return 1 + a0();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
+new file mode 100644
+index 00000000000..1120cd797e9
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-2.c
+@@ -0,0 +1,6 @@
++extern int a1(void);
++int
++a2(void)
++{
++  return 1 + a1();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
+new file mode 100644
+index 00000000000..ec464947ee6
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-3.c
+@@ -0,0 +1,6 @@
++extern int a2(void);
++int
++a3(void)
++{
++  return 1 + a2();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
+new file mode 100644
+index 00000000000..475701b2c5c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-4.c
+@@ -0,0 +1,6 @@
++extern int a3(void);
++int
++a4(void)
++{
++  return 1 + a3();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
+new file mode 100644
+index 00000000000..e24f86c363e
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-5.c
+@@ -0,0 +1,6 @@
++extern int a4(void);
++int
++a5(void)
++{
++  return 1 + a4();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
+new file mode 100644
+index 00000000000..b5b938bdb21
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-6.c
+@@ -0,0 +1,6 @@
++extern int a5(void);
++int
++a6(void)
++{
++  return 1 + a5();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
+new file mode 100644
+index 00000000000..4ef75bf0f0c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-7.c
+@@ -0,0 +1,6 @@
++extern int a6(void);
++int
++a7(void)
++{
++  return 1 + a6();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
+new file mode 100644
+index 00000000000..68252c9f382
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++extern int a7(void);
++
++int
++a0(void)
++{
++  return 0;
++}
++
++int
++main()
++{
++  if (a7() == 7)
++    {
++      printf ("PASS\n");
++      return 0;
++    }
++  return 1;
++}
+-- 
+2.27.0
+

cross/binutils-aarch64/defang-no-split.patch

@@ -0,0 +1,38 @@
+From 2dad02b6d46eef438cbd14d8511487b056628a38 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit@google.com>
+Date: Mon, 26 Jul 2021 22:51:18 +0100
+Subject: [PATCH 1/1] texi2pod.pl: add no-op --no-split option support
+ [PR28144]
+
+Change 2faf902da ("generate single html manual page by default")
+added use of --no-split option to makeinfo. binutils reuses
+makeinfo options for texi2pod.pl wrapper. Unsupported option
+led to silent manpage truncation.
+
+The change adds no-op option support.
+
+etc/
+	PR 28144
+	* texi2pod.pl: Handle no-op --no-split option.
+
+(cherry picked from commit 96a7037cd8573cf065aa6b12baca68696f96d9ca)
+---
+ etc/texi2pod.pl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
+index 11f70d156be..dcf2b437640 100644
+--- a/etc/texi2pod.pl
++++ b/etc/texi2pod.pl
+@@ -59,6 +59,8 @@ while ($_ = shift) {
+ 	    $flag = shift;
+ 	}
+         push (@ipath, $flag);
++    } elsif (/^--no-split$/) {
++	# ignore option for makeinfo compatibility
+     } elsif (/^-/) {
+ 	usage();
+     } else {
+-- 
+2.27.0
+

cross/binutils-armhf/APKBUILD

@@ -3,8 +3,8 @@
 # Based on: main/binutils
 
 pkgname=binutils-armhf
-pkgver=2.38
-pkgrel=0
+pkgver=2.37
+pkgrel=4
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -16,6 +16,8 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
+	bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+	defang-no-split.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -40,6 +42,14 @@ fi
 #   2.28-r1:
 #     - CVE-2017-7614
 
+prepare() {
+	default_prepare
+
+	# Remove existing empty man pages to force them to be regenerated.
+	# Workaround for https://gitlab.alpinelinux.org/alpine/aports/-/issues/13034
+	find "$builddir" -name '[a-z]*\.[0-9]*' -empty -delete
+}
+
 build() {
 	_target="$(arch_to_hostspec armhf)"
 	"$builddir"/configure \
@@ -71,10 +81,12 @@ package() {
 
 
 sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7  binutils-2.37.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+10a0074583d2cc4598710c7e434ba7088da074b105f4f5e951fc61af7150ad62adf60a7c98f6fd13b1771f169e45a5a1ef618240c6893d3f0f3d93fd768a03c6  bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+4652f092c9376f0cb7fd6c72cb37ff7c15c1c6e3408fac79329b7f41a7925c98eb35989a9a040682130988a36401901d6d95afa44f0ce50caa85ee478db6bf03  defang-no-split.patch
 "

cross/binutils-armhf/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch

@@ -0,0 +1,234 @@
+Upstream: yes
+URL: https://sourceware.org/bugzilla/show_bug.cgi?id=28138
+From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Mon, 26 Jul 2021 05:59:55 -0700
+Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
+
+Close the file descriptor if there is no archive plugin file descriptor
+to avoid running out of file descriptors on thin archives with many
+archive members.
+
+bfd/
+
+	PR ld/28138
+	* plugin.c (bfd_plugin_close_file_descriptor): Close the file
+	descriptor there is no archive plugin file descriptor.
+
+ld/
+
+	PR ld/28138
+	* testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
+	native build.
+
+	PR ld/28138
+	* testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
+	* testsuite/ld-plugin/pr28138.c: New file.
+	* testsuite/ld-plugin/pr28138-1.c: Likewise.
+	* testsuite/ld-plugin/pr28138-2.c: Likewise.
+	* testsuite/ld-plugin/pr28138-3.c: Likewise.
+	* testsuite/ld-plugin/pr28138-4.c: Likewise.
+	* testsuite/ld-plugin/pr28138-5.c: Likewise.
+	* testsuite/ld-plugin/pr28138-6.c: Likewise.
+	* testsuite/ld-plugin/pr28138-7.c: Likewise.
+
+(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
+(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
+---
+ bfd/plugin.c                       |  8 +++++++
+ ld/testsuite/ld-plugin/lto.exp     | 34 ++++++++++++++++++++++++++++++
+ ld/testsuite/ld-plugin/pr28138-1.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-2.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-3.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-4.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-5.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-6.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-7.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138.c   | 20 ++++++++++++++++++
+ 10 files changed, 104 insertions(+)
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138.c
+
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 6cfa2b66470..3bab8febe88 100644
+--- a/bfd/plugin.c
++++ b/bfd/plugin.c
+@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+ 	     && !bfd_is_thin_archive (abfd->my_archive))
+ 	abfd = abfd->my_archive;
+ 
++      /* Close the file descriptor if there is no archive plugin file
++	 descriptor.  */
++      if (abfd->archive_plugin_fd == -1)
++	{
++	  close (fd);
++	  return;
++	}
++
+       abfd->archive_plugin_fd_open_count--;
+       /* Dup the archive plugin file descriptor for later use, which
+ 	 will be closed by _bfd_archive_close_and_cleanup.  */
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index def69e43ab3..999d911ce6a 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
++++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+     }
+ }
+ 
++run_cc_link_tests [list \
++    [list \
++	"Build pr28138.a" \
++	"-T" "" \
++	{pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
++	 pr28138-6.c pr28138-7.c} {} "pr28138.a" \
++    ] \
++    [list \
++	"Build pr28138.o" \
++	"" "" \
++	{pr28138.c} {} \
++    ] \
++]
++
++set exec_output [run_host_cmd "sh" \
++			      "-c \"ulimit -n 20; \
++			      $CC -Btmpdir/ld -o tmpdir/pr28138 \
++			      tmpdir/pr28138.o tmpdir/pr28138.a\""]
++set exec_output [prune_warnings $exec_output]
++if [string match "" $exec_output] then {
++    if { [isnative] } {
++	set exec_output [run_host_cmd "tmpdir/pr28138" ""]
++	if [string match "PASS" $exec_output] then {
++	    pass "PR ld/28138"
++	} else {
++	    fail "PR ld/28138"
++	}
++    } else {
++	pass "PR ld/28138"
++    }
++} else {
++    fail "PR ld/28138"
++}
++
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+ set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
+new file mode 100644
+index 00000000000..51d119e1642
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-1.c
+@@ -0,0 +1,6 @@
++extern int a0(void);
++int
++a1(void)
++{
++  return 1 + a0();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
+new file mode 100644
+index 00000000000..1120cd797e9
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-2.c
+@@ -0,0 +1,6 @@
++extern int a1(void);
++int
++a2(void)
++{
++  return 1 + a1();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
+new file mode 100644
+index 00000000000..ec464947ee6
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-3.c
+@@ -0,0 +1,6 @@
++extern int a2(void);
++int
++a3(void)
++{
++  return 1 + a2();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
+new file mode 100644
+index 00000000000..475701b2c5c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-4.c
+@@ -0,0 +1,6 @@
++extern int a3(void);
++int
++a4(void)
++{
++  return 1 + a3();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
+new file mode 100644
+index 00000000000..e24f86c363e
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-5.c
+@@ -0,0 +1,6 @@
++extern int a4(void);
++int
++a5(void)
++{
++  return 1 + a4();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
+new file mode 100644
+index 00000000000..b5b938bdb21
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-6.c
+@@ -0,0 +1,6 @@
++extern int a5(void);
++int
++a6(void)
++{
++  return 1 + a5();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
+new file mode 100644
+index 00000000000..4ef75bf0f0c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-7.c
+@@ -0,0 +1,6 @@
++extern int a6(void);
++int
++a7(void)
++{
++  return 1 + a6();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
+new file mode 100644
+index 00000000000..68252c9f382
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++extern int a7(void);
++
++int
++a0(void)
++{
++  return 0;
++}
++
++int
++main()
++{
++  if (a7() == 7)
++    {
++      printf ("PASS\n");
++      return 0;
++    }
++  return 1;
++}
+-- 
+2.27.0
+

cross/binutils-armhf/defang-no-split.patch

@@ -0,0 +1,38 @@
+From 2dad02b6d46eef438cbd14d8511487b056628a38 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit@google.com>
+Date: Mon, 26 Jul 2021 22:51:18 +0100
+Subject: [PATCH 1/1] texi2pod.pl: add no-op --no-split option support
+ [PR28144]
+
+Change 2faf902da ("generate single html manual page by default")
+added use of --no-split option to makeinfo. binutils reuses
+makeinfo options for texi2pod.pl wrapper. Unsupported option
+led to silent manpage truncation.
+
+The change adds no-op option support.
+
+etc/
+	PR 28144
+	* texi2pod.pl: Handle no-op --no-split option.
+
+(cherry picked from commit 96a7037cd8573cf065aa6b12baca68696f96d9ca)
+---
+ etc/texi2pod.pl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
+index 11f70d156be..dcf2b437640 100644
+--- a/etc/texi2pod.pl
++++ b/etc/texi2pod.pl
+@@ -59,6 +59,8 @@ while ($_ = shift) {
+ 	    $flag = shift;
+ 	}
+         push (@ipath, $flag);
++    } elsif (/^--no-split$/) {
++	# ignore option for makeinfo compatibility
+     } elsif (/^-/) {
+ 	usage();
+     } else {
+-- 
+2.27.0
+

cross/binutils-armv7/APKBUILD

@@ -3,8 +3,8 @@
 # Based on: main/binutils
 
 pkgname=binutils-armv7
-pkgver=2.38
-pkgrel=0
+pkgver=2.37
+pkgrel=4
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -16,6 +16,8 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	ld-bfd-mips.patch
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
+	bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+	defang-no-split.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -40,6 +42,14 @@ fi
 #   2.28-r1:
 #     - CVE-2017-7614
 
+prepare() {
+	default_prepare
+
+	# Remove existing empty man pages to force them to be regenerated.
+	# Workaround for https://gitlab.alpinelinux.org/alpine/aports/-/issues/13034
+	find "$builddir" -name '[a-z]*\.[0-9]*' -empty -delete
+}
+
 build() {
 	_target="$(arch_to_hostspec armv7)"
 	"$builddir"/configure \
@@ -71,10 +81,12 @@ package() {
 
 
 sha512sums="
-8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d  binutils-2.38.tar.xz
+5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7  binutils-2.37.tar.xz
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
 f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
 314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
+10a0074583d2cc4598710c7e434ba7088da074b105f4f5e951fc61af7150ad62adf60a7c98f6fd13b1771f169e45a5a1ef618240c6893d3f0f3d93fd768a03c6  bfd-close-file-desriptor-if-there-is-no-archive-fd.patch
+4652f092c9376f0cb7fd6c72cb37ff7c15c1c6e3408fac79329b7f41a7925c98eb35989a9a040682130988a36401901d6d95afa44f0ce50caa85ee478db6bf03  defang-no-split.patch
 "

cross/binutils-armv7/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch

@@ -0,0 +1,234 @@
+Upstream: yes
+URL: https://sourceware.org/bugzilla/show_bug.cgi?id=28138
+From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Mon, 26 Jul 2021 05:59:55 -0700
+Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
+
+Close the file descriptor if there is no archive plugin file descriptor
+to avoid running out of file descriptors on thin archives with many
+archive members.
+
+bfd/
+
+	PR ld/28138
+	* plugin.c (bfd_plugin_close_file_descriptor): Close the file
+	descriptor there is no archive plugin file descriptor.
+
+ld/
+
+	PR ld/28138
+	* testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
+	native build.
+
+	PR ld/28138
+	* testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
+	* testsuite/ld-plugin/pr28138.c: New file.
+	* testsuite/ld-plugin/pr28138-1.c: Likewise.
+	* testsuite/ld-plugin/pr28138-2.c: Likewise.
+	* testsuite/ld-plugin/pr28138-3.c: Likewise.
+	* testsuite/ld-plugin/pr28138-4.c: Likewise.
+	* testsuite/ld-plugin/pr28138-5.c: Likewise.
+	* testsuite/ld-plugin/pr28138-6.c: Likewise.
+	* testsuite/ld-plugin/pr28138-7.c: Likewise.
+
+(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
+(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
+---
+ bfd/plugin.c                       |  8 +++++++
+ ld/testsuite/ld-plugin/lto.exp     | 34 ++++++++++++++++++++++++++++++
+ ld/testsuite/ld-plugin/pr28138-1.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-2.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-3.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-4.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-5.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-6.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138-7.c |  6 ++++++
+ ld/testsuite/ld-plugin/pr28138.c   | 20 ++++++++++++++++++
+ 10 files changed, 104 insertions(+)
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138.c
+
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 6cfa2b66470..3bab8febe88 100644
+--- a/bfd/plugin.c
++++ b/bfd/plugin.c
+@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+ 	     && !bfd_is_thin_archive (abfd->my_archive))
+ 	abfd = abfd->my_archive;
+ 
++      /* Close the file descriptor if there is no archive plugin file
++	 descriptor.  */
++      if (abfd->archive_plugin_fd == -1)
++	{
++	  close (fd);
++	  return;
++	}
++
+       abfd->archive_plugin_fd_open_count--;
+       /* Dup the archive plugin file descriptor for later use, which
+ 	 will be closed by _bfd_archive_close_and_cleanup.  */
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index def69e43ab3..999d911ce6a 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
++++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+     }
+ }
+ 
++run_cc_link_tests [list \
++    [list \
++	"Build pr28138.a" \
++	"-T" "" \
++	{pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
++	 pr28138-6.c pr28138-7.c} {} "pr28138.a" \
++    ] \
++    [list \
++	"Build pr28138.o" \
++	"" "" \
++	{pr28138.c} {} \
++    ] \
++]
++
++set exec_output [run_host_cmd "sh" \
++			      "-c \"ulimit -n 20; \
++			      $CC -Btmpdir/ld -o tmpdir/pr28138 \
++			      tmpdir/pr28138.o tmpdir/pr28138.a\""]
++set exec_output [prune_warnings $exec_output]
++if [string match "" $exec_output] then {
++    if { [isnative] } {
++	set exec_output [run_host_cmd "tmpdir/pr28138" ""]
++	if [string match "PASS" $exec_output] then {
++	    pass "PR ld/28138"
++	} else {
++	    fail "PR ld/28138"
++	}
++    } else {
++	pass "PR ld/28138"
++    }
++} else {
++    fail "PR ld/28138"
++}
++
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+ set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
+new file mode 100644
+index 00000000000..51d119e1642
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-1.c
+@@ -0,0 +1,6 @@
++extern int a0(void);
++int
++a1(void)
++{
++  return 1 + a0();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
+new file mode 100644
+index 00000000000..1120cd797e9
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-2.c
+@@ -0,0 +1,6 @@
++extern int a1(void);
++int
++a2(void)
++{
++  return 1 + a1();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
+new file mode 100644
+index 00000000000..ec464947ee6
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-3.c
+@@ -0,0 +1,6 @@
++extern int a2(void);
++int
++a3(void)
++{
++  return 1 + a2();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
+new file mode 100644
+index 00000000000..475701b2c5c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-4.c
+@@ -0,0 +1,6 @@
++extern int a3(void);
++int
++a4(void)
++{
++  return 1 + a3();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
+new file mode 100644
+index 00000000000..e24f86c363e
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-5.c
+@@ -0,0 +1,6 @@
++extern int a4(void);
++int
++a5(void)
++{
++  return 1 + a4();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
+new file mode 100644
+index 00000000000..b5b938bdb21
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-6.c
+@@ -0,0 +1,6 @@
++extern int a5(void);
++int
++a6(void)
++{
++  return 1 + a5();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
+new file mode 100644
+index 00000000000..4ef75bf0f0c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-7.c
+@@ -0,0 +1,6 @@
++extern int a6(void);
++int
++a7(void)
++{
++  return 1 + a6();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
+new file mode 100644
+index 00000000000..68252c9f382
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++extern int a7(void);
++
++int
++a0(void)
++{
++  return 0;
++}
++
++int
++main()
++{
++  if (a7() == 7)
++    {
++      printf ("PASS\n");
++      return 0;
++    }
++  return 1;
++}
+-- 
+2.27.0
+

cross/binutils-armv7/defang-no-split.patch

@@ -0,0 +1,38 @@
+From 2dad02b6d46eef438cbd14d8511487b056628a38 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <siarheit@google.com>
+Date: Mon, 26 Jul 2021 22:51:18 +0100
+Subject: [PATCH 1/1] texi2pod.pl: add no-op --no-split option support
+ [PR28144]
+
+Change 2faf902da ("generate single html manual page by default")
+added use of --no-split option to makeinfo. binutils reuses
+makeinfo options for texi2pod.pl wrapper. Unsupported option
+led to silent manpage truncation.
+
+The change adds no-op option support.
+
+etc/
+	PR 28144
+	* texi2pod.pl: Handle no-op --no-split option.
+
+(cherry picked from commit 96a7037cd8573cf065aa6b12baca68696f96d9ca)
+---
+ etc/texi2pod.pl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
+index 11f70d156be..dcf2b437640 100644
+--- a/etc/texi2pod.pl
++++ b/etc/texi2pod.pl
+@@ -59,6 +59,8 @@ while ($_ = shift) {
+ 	    $flag = shift;
+ 	}
+         push (@ipath, $flag);
++    } elsif (/^--no-split$/) {
++	# ignore option for makeinfo compatibility
+     } elsif (/^-/) {
+ 	usage();
+     } else {
+-- 
+2.27.0
+

device/community/linux-postmarketos-rockchip/APKBUILD

@@ -10,7 +10,7 @@
 # boot failure
 
 pkgname=linux-postmarketos-rockchip
-pkgver=5.14.9
+pkgver=5.16.8
 pkgrel=2
 pkgdesc="Mainline kernel for rockchip devices"
 arch="aarch64 armv7"
@@ -56,12 +56,7 @@ source="
 	https://cdn.kernel.org/pub/linux/kernel/v${_kernver%%.*}.x/linux-$_kernver.tar.xz
 	0001-phy-rockchip-typec-Set-extcon-capabilities.patch
 	0003-arm64-dts-rockchip-add-typec-extcon-hack.patch
-	0004-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-data-role.patch
 	0010-usb-typec-add-extcon-to-tcpm.patch
-	0007-block-partitions-efi-Add-support-for-IGNOREME-GPT-si.patch
-	0011-stmmac-revert-stmmac-fix.patch
-	36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=36dfdf11af49d3c009c711fb16f5c6e7a274505d
-	6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=6eea4ace62fa6414432692ee44f0c0a3d541d97a
 
 	config-$_flavor.aarch64
 	config-$_flavor.armv7
@@ -101,15 +96,10 @@ package() {
 
 
 sha512sums="
-987ae9ceba83ba12e5e1962118831dbc47eaf26848cfd83b93db58f004dbc3c8d10d62a33cf449abddcfe996023dc705207c43a22aae665461eff9d7365bbc00  linux-5.14.9.tar.xz
+66a0874eed7b2367fc0b69bee8c40a945b9e58d1a820c3e7e741bcb28774c811dea251826b14e2452d9e1fdd7509554ac50229f942c8ba853c308affba94a39a  linux-5.16.8.tar.xz
 10949558a6e3316ea57497f377fd120d6704f3b81725317556e49d10b570a40edb06643b06738116abbe3096be485761d436f1a0d1861bd34fc18ea45068b6b0  0001-phy-rockchip-typec-Set-extcon-capabilities.patch
 b7291eecfddc7ebe9393eea864e0ee28960e8cc2f87dfc42d09426b5619f46ded97c38fb8bf26f4eea1f26bfe21396094505b3efb8676691f8751e2ffabe50ec  0003-arm64-dts-rockchip-add-typec-extcon-hack.patch
-427b81472de2a473344269b2da06ac338af42e68620a281a9cb8543e545e6ed7f719acaf68c688e518b65d2132e0c66676ba5e30376ec980fd6eeaea05c2a8be  0004-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-data-role.patch
 e5cc0852506ea1e73213672f0c3f9144c08156f6d5e8af841bf3f7bffc0e89028507aac4718353eee20edd9069e3f81665caa5ca25e416f25e7e0da10451b67e  0010-usb-typec-add-extcon-to-tcpm.patch
-000ddb9f10545b1231e2b78049d3fda7aed8e931c0c992f84cfe2783dd964443d137e5695775956c5db0fac30d00795adc34453acfb772155163297cc1227b8c  0007-block-partitions-efi-Add-support-for-IGNOREME-GPT-si.patch
-75a738070a42b03b248fd805f60ac506b3d22c775dc0b0365d7f9c15c28349d0e16dde9af301021d56d720d341075335e63a38be0ade89178346518c7b02de53  0011-stmmac-revert-stmmac-fix.patch
-59d480b6379dcfff94d05b08e28c005d507f640dc0147841e7df4827fce8db01dab1d4d50fb45b2b3fff72cdeb219a8cd87a889078a6372aea4469c861c378b1  36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch
-61f862cda24e7b14e55e9a9ce3a537adfc7a1c77e0670255dc485886e2c19156ddaf49fdd88b629ddde3cf25a83fd603678caebb96e18f59245917d3a2e51bb0  6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch
-c7a10a642996db8e0195aab709ac121266084e685ccf1a8f0c1cfd10e18e09008574b3af0b0dbf3e685c6102b3166caf2c3fb7a69292a9c6fe9beb170e31e2b8  config-postmarketos-rockchip.aarch64
+caab6e522b6aef0461810021e8ecce6adca44158e8ae9d800be14bfb4436ae7ec84ea1ad0e08744fb2a380263e5d791a42ad51571ca8a9daabcd87eaf9cc3dc7  config-postmarketos-rockchip.aarch64
 62a05ed0d8f040981454216939b044cc48deb4aa566e952b6bca2881b21e28f7f68e9a5d399ec5a5ec545ac3898757cdf139b1f1554841d73bf8a841ae407e6f  config-postmarketos-rockchip.armv7
 "

device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64

@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.14.9 Kernel Configuration
+# Linux/arm64 5.16.8 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20220117) 11.2.1 20220117"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=110201
 CONFIG_CLANG_VERSION=0
@@ -11,8 +11,6 @@ CONFIG_AS_VERSION=23700
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=23700
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -26,6 +24,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -59,7 +58,6 @@ CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 CONFIG_IRQ_MSI_IOMMU=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -69,6 +67,8 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y
+CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
 
 #
 # Timers subsystem
@@ -93,6 +93,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 # CONFIG_BPF_JIT is not set
 # end of BPF subsystem
 
+CONFIG_PREEMPT_BUILD=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
@@ -137,6 +138,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+# CONFIG_PRINTK_INDEX is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
 
 #
@@ -147,6 +149,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_CC_HAS_INT128=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
@@ -203,7 +206,6 @@ CONFIG_SYSFS_SYSCALL=y
 CONFIG_FHANDLE=y
 CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
@@ -261,7 +263,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
@@ -346,6 +347,9 @@ CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
+CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
+CONFIG_ARM64_ERRATUM_2054223=y
+CONFIG_ARM64_ERRATUM_2067961=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
@@ -372,6 +376,7 @@ CONFIG_ARM64_PA_BITS=48
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SCHED_MC=y
+# CONFIG_SCHED_CLUSTER is not set
 CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=8
 CONFIG_HOTPLUG_CPU=y
@@ -557,32 +562,8 @@ CONFIG_ARM_SCPI_CPUFREQ=m
 # end of CPU Frequency scaling
 # end of CPU Power Management
 
-#
-# Firmware Drivers
-#
-# CONFIG_ARM_SCMI_PROTOCOL is not set
-CONFIG_ARM_SCPI_PROTOCOL=m
-CONFIG_ARM_SCPI_POWER_DOMAIN=m
-# CONFIG_ARM_SDE_INTERFACE is not set
-CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
-# CONFIG_ARM_FFA_TRANSPORT is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
-CONFIG_ARM_SMCCC_SOC_ID=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
 CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
+CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
 CONFIG_HAVE_KVM_IRQ_ROUTING=y
@@ -595,6 +576,10 @@ CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+# CONFIG_NVHE_EL2_DEBUG is not set
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM64=m
@@ -625,8 +610,10 @@ CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
 CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -681,6 +668,7 @@ CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -699,7 +687,6 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
@@ -732,16 +719,14 @@ CONFIG_MODULE_COMPRESS_XZ=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
-CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
@@ -782,6 +767,7 @@ CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
 
 #
 # IO Schedulers
@@ -834,6 +820,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_FAST_GUP=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 # CONFIG_MEMORY_HOTPLUG is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -888,6 +875,12 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_GUP_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_SECRETMEM=y
+
+#
+# Data Access Monitoring
+#
+# CONFIG_DAMON is not set
+# end of Data Access Monitoring
 # end of Memory Management options
 
 CONFIG_NET=y
@@ -904,6 +897,7 @@ CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
 # CONFIG_TLS_DEVICE is not set
@@ -1007,6 +1001,7 @@ CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SEG6_HMAC=y
 CONFIG_IPV6_SEG6_BPF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
 # CONFIG_NETLABEL is not set
 CONFIG_MPTCP=y
 CONFIG_INET_MPTCP_DIAG=m
@@ -1022,6 +1017,8 @@ CONFIG_BRIDGE_NETFILTER=m
 # Core Netfilter Configuration
 #
 CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_EGRESS=y
+CONFIG_NETFILTER_SKIP_EGRESS=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_FAMILY_BRIDGE=y
 CONFIG_NETFILTER_FAMILY_ARP=y
@@ -1690,6 +1687,7 @@ CONFIG_BT_MRVL_SDIO=m
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 CONFIG_STREAM_PARSER=y
+# CONFIG_MCTP is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1800,6 +1798,7 @@ CONFIG_PCIE_DW_HOST=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCI_HISI=y
+# CONFIG_PCIE_ROCKCHIP_DW_HOST is not set
 # CONFIG_PCIE_KIRIN is not set
 # CONFIG_PCI_MESON is not set
 # CONFIG_PCIE_AL is not set
@@ -1877,12 +1876,41 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
-CONFIG_SIMPLE_PM_BUS=m
 # CONFIG_VEXPRESS_CONFIG is not set
 # CONFIG_MHI_BUS is not set
 # end of Bus devices
 
 CONFIG_CONNECTOR=m
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_ARM_SCPI_PROTOCOL=m
+CONFIG_ARM_SCPI_POWER_DOMAIN=m
+# CONFIG_ARM_SDE_INTERFACE is not set
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
+# CONFIG_ARM_FFA_TRANSPORT is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+CONFIG_ARM_SMCCC_SOC_ID=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 # CONFIG_GNSS is not set
 CONFIG_MTD=m
 # CONFIG_MTD_TESTS is not set
@@ -1998,7 +2026,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -2017,7 +2044,6 @@ CONFIG_ZRAM_DEF_COMP="zstd"
 CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
-CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
@@ -2050,6 +2076,7 @@ CONFIG_TIFM_CORE=y
 CONFIG_TIFM_7XX1=m
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HI6421V600_IRQ is not set
 # CONFIG_HP_ILO is not set
 # CONFIG_APDS9802ALS is not set
 # CONFIG_ISL29003 is not set
@@ -2109,6 +2136,7 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 #
 CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI_COMMON=y
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_PROC_FS=y
@@ -2120,6 +2148,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_CHR_DEV_ST is not set
 CONFIG_BLK_DEV_SR=m
 # CONFIG_CHR_DEV_SG is not set
+CONFIG_BLK_DEV_BSG=y
 # CONFIG_CHR_DEV_SCH is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
@@ -2166,6 +2195,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_MPI3MR is not set
 # CONFIG_SCSI_SMARTPQI is not set
 # CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_UFS_HWMON is not set
 # CONFIG_SCSI_HPTIOP is not set
 # CONFIG_SCSI_MYRB is not set
 # CONFIG_SCSI_MYRS is not set
@@ -2347,6 +2377,7 @@ CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
 CONFIG_BAREUDP=m
 CONFIG_GTP=m
+# CONFIG_AMT is not set
 CONFIG_MACSEC=m
 # CONFIG_NETCONSOLE is not set
 CONFIG_TUN=m
@@ -2380,6 +2411,8 @@ CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_AQTION is not set
 CONFIG_NET_VENDOR_ARC=y
 # CONFIG_EMAC_ROCKCHIP is not set
+CONFIG_NET_VENDOR_ASIX=y
+# CONFIG_SPI_AX88796C is not set
 CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL2 is not set
 # CONFIG_ATL1 is not set
@@ -2454,6 +2487,8 @@ CONFIG_NET_VENDOR_INTEL=y
 # CONFIG_IGC is not set
 CONFIG_NET_VENDOR_MICROSOFT=y
 # CONFIG_JME is not set
+CONFIG_NET_VENDOR_LITEX=y
+# CONFIG_LITEX_LITEETH is not set
 CONFIG_NET_VENDOR_MARVELL=y
 # CONFIG_MVMDIO is not set
 # CONFIG_SKGE is not set
@@ -2597,6 +2632,7 @@ CONFIG_AX88796B_PHY=m
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MARVELL_88X2222_PHY is not set
+# CONFIG_MAXLINEAR_GPHY is not set
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MICREL_PHY is not set
 CONFIG_MICROCHIP_PHY=m
@@ -2765,6 +2801,7 @@ CONFIG_RTW88=m
 # CONFIG_RTW88_8822CE is not set
 # CONFIG_RTW88_8723DE is not set
 # CONFIG_RTW88_8821CE is not set
+# CONFIG_RTW89 is not set
 # CONFIG_WLAN_VENDOR_RSI is not set
 # CONFIG_WLAN_VENDOR_ST is not set
 # CONFIG_WLAN_VENDOR_TI is not set
@@ -2785,7 +2822,6 @@ CONFIG_VIRT_WIFI=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -2839,6 +2875,7 @@ CONFIG_KEYBOARD_GPIO=m
 # CONFIG_KEYBOARD_CAP11XX is not set
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_KEYBOARD_MTK_PMIC is not set
+# CONFIG_KEYBOARD_CYPRESS_SF is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
@@ -3146,6 +3183,7 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_CAVIUM=m
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
+CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=m
 # CONFIG_APPLICOM is not set
 CONFIG_DEVMEM=y
 CONFIG_DEVPORT=y
@@ -3163,10 +3201,9 @@ CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
-# end of Character devices
-
 # CONFIG_RANDOM_TRUST_CPU is not set
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
 
 #
 # I2C support
@@ -3249,6 +3286,7 @@ CONFIG_I2C_TINY_USB=m
 # Other I2C/SMBus bus drivers
 #
 CONFIG_I2C_CROS_EC_TUNNEL=y
+# CONFIG_I2C_VIRTIO is not set
 # end of I2C Hardware Bus support
 
 CONFIG_I2C_STUB=m
@@ -3271,6 +3309,7 @@ CONFIG_SPI_MEM=y
 CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
+# CONFIG_SPI_CADENCE_XSPI is not set
 # CONFIG_SPI_DESIGNWARE is not set
 # CONFIG_SPI_NXP_FLEXSPI is not set
 CONFIG_SPI_GPIO=y
@@ -3279,6 +3318,7 @@ CONFIG_SPI_GPIO=y
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX is not set
 CONFIG_SPI_ROCKCHIP=y
+# CONFIG_SPI_ROCKCHIP_SFC is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_SIFIVE is not set
 # CONFIG_SPI_MXIC is not set
@@ -3322,6 +3362,7 @@ CONFIG_PPS=y
 # PTP clock support
 #
 CONFIG_PTP_1588_CLOCK=m
+CONFIG_PTP_1588_CLOCK_OPTIONAL=m
 # CONFIG_DP83640_PHY is not set
 # CONFIG_PTP_1588_CLOCK_INES is not set
 CONFIG_PTP_1588_CLOCK_KVM=m
@@ -3377,6 +3418,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_LOGICVC is not set
 # CONFIG_GPIO_MB86S7X is not set
 CONFIG_GPIO_PL061=y
+CONFIG_GPIO_ROCKCHIP=y
 # CONFIG_GPIO_SAMA5D2_PIOBU is not set
 # CONFIG_GPIO_SIFIVE is not set
 CONFIG_GPIO_SYSCON=y
@@ -3438,6 +3480,7 @@ CONFIG_GPIO_MAX77620=y
 #
 CONFIG_GPIO_AGGREGATOR=m
 # CONFIG_GPIO_MOCKUP is not set
+# CONFIG_GPIO_VIRTIO is not set
 # end of Virtual GPIO drivers
 
 # CONFIG_W1 is not set
@@ -3472,7 +3515,6 @@ CONFIG_CHARGER_SBS=m
 CONFIG_MANAGER_SBS=m
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_AXP20X_POWER is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_CHARGER_ISP1704 is not set
@@ -3498,6 +3540,7 @@ CONFIG_CHARGER_GPIO=y
 # CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_CROS_PCHG=y
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 CONFIG_HWMON=y
@@ -3525,6 +3568,7 @@ CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
 # CONFIG_SENSORS_AHT10 is not set
+# CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set
 # CONFIG_SENSORS_AS370 is not set
 CONFIG_SENSORS_ASC7621=m
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
@@ -3571,6 +3615,7 @@ CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX197=m
 # CONFIG_SENSORS_MAX31722 is not set
 # CONFIG_SENSORS_MAX31730 is not set
+# CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
@@ -3651,6 +3696,7 @@ CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_PWM_FAN=m
 # CONFIG_SENSORS_SBTSI is not set
+# CONFIG_SENSORS_SBRMI is not set
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@@ -3805,11 +3851,11 @@ CONFIG_MFD_CROS_EC_DEV=y
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_MFD_MP2629 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_HI6421_SPMI is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
-# CONFIG_MFD_INTEL_PMT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3866,7 +3912,6 @@ CONFIG_MFD_TPS6586X=y
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS80031 is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_TWL6040_CORE is not set
 # CONFIG_MFD_WL1273_CORE is not set
@@ -3893,6 +3938,8 @@ CONFIG_MFD_VX855=m
 # CONFIG_MFD_QCOM_PM8008 is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC is not set
+# CONFIG_MFD_RSMU_I2C is not set
+# CONFIG_MFD_RSMU_SPI is not set
 # end of Multifunction device drivers
 
 CONFIG_REGULATOR=y
@@ -3955,7 +4002,9 @@ CONFIG_REGULATOR_RK808=y
 # CONFIG_REGULATOR_RT4801 is not set
 # CONFIG_REGULATOR_RT6160 is not set
 # CONFIG_REGULATOR_RT6245 is not set
+# CONFIG_REGULATOR_RTQ2134 is not set
 # CONFIG_REGULATOR_RTMV20 is not set
+# CONFIG_REGULATOR_RTQ6752 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
@@ -3988,17 +4037,22 @@ CONFIG_RC_DEVICES=y
 # CONFIG_RC_LOOPBACK is not set
 CONFIG_IR_GPIO_CIR=m
 # CONFIG_IR_SERIAL is not set
-# CONFIG_IR_SIR is not set
 # CONFIG_RC_XBOX_DVD is not set
 # CONFIG_IR_TOY is not set
 CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
+
+#
+# CEC support
+#
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_CEC_CH7322 is not set
 CONFIG_CEC_CROS_EC=m
 # CONFIG_CEC_GPIO is not set
 # CONFIG_USB_PULSE8_CEC is not set
 # CONFIG_USB_RAINSHADOW_CEC is not set
+# end of CEC support
+
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEDIA_SUPPORT_FILTER=y
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
@@ -4097,6 +4151,7 @@ CONFIG_VIDEO_IR_I2C=m
 # Camera sensor devices
 #
 # CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_HI846 is not set
 # CONFIG_VIDEO_IMX208 is not set
 # CONFIG_VIDEO_IMX214 is not set
 # CONFIG_VIDEO_IMX219 is not set
@@ -4105,7 +4160,9 @@ CONFIG_VIDEO_IR_I2C=m
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX319 is not set
 # CONFIG_VIDEO_IMX334 is not set
+# CONFIG_VIDEO_IMX335 is not set
 # CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_IMX412 is not set
 # CONFIG_VIDEO_OV02A10 is not set
 # CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
@@ -4126,9 +4183,11 @@ CONFIG_VIDEO_IR_I2C=m
 # CONFIG_VIDEO_OV7740 is not set
 # CONFIG_VIDEO_OV8856 is not set
 # CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9282 is not set
 # CONFIG_VIDEO_OV9640 is not set
 # CONFIG_VIDEO_OV9650 is not set
 # CONFIG_VIDEO_OV13858 is not set
+# CONFIG_VIDEO_OV13B10 is not set
 # CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_MT9M001 is not set
 # CONFIG_VIDEO_MT9M032 is not set
@@ -4256,7 +4315,6 @@ CONFIG_DRM_UDL=m
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
 # CONFIG_DRM_QXL is not set
-# CONFIG_DRM_BOCHS is not set
 CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_PANEL=y
 
@@ -4271,11 +4329,14 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
 CONFIG_DRM_PANEL_SIMPLE=y
+# CONFIG_DRM_PANEL_EDP is not set
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+# CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
@@ -4298,7 +4359,10 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
@@ -4309,6 +4373,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS060T1SX01 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
@@ -4320,6 +4385,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
+# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 # end of Display Panels
 
@@ -4378,6 +4444,7 @@ CONFIG_DRM_DW_MIPI_DSI=y
 # CONFIG_DRM_HISI_KIRIN is not set
 # CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
 # CONFIG_DRM_SIMPLEDRM is not set
@@ -4490,6 +4557,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -4653,6 +4721,7 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_MTK_BTCVSD is not set
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP_I2S=m
+# CONFIG_SND_SOC_ROCKCHIP_I2S_TDM is not set
 CONFIG_SND_SOC_ROCKCHIP_PDM=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
@@ -4701,6 +4770,8 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 # CONFIG_SND_SOC_CS35L34 is not set
 # CONFIG_SND_SOC_CS35L35 is not set
 # CONFIG_SND_SOC_CS35L36 is not set
+# CONFIG_SND_SOC_CS35L41_SPI is not set
+# CONFIG_SND_SOC_CS35L41_I2C is not set
 # CONFIG_SND_SOC_CS42L42 is not set
 # CONFIG_SND_SOC_CS42L51_I2C is not set
 # CONFIG_SND_SOC_CS42L52 is not set
@@ -4728,6 +4799,7 @@ CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 CONFIG_SND_SOC_MAX98090=m
@@ -4735,6 +4807,7 @@ CONFIG_SND_SOC_MAX98357A=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9867 is not set
 # CONFIG_SND_SOC_MAX98927 is not set
+# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX98373_I2C is not set
 # CONFIG_SND_SOC_MAX98390 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
@@ -4754,7 +4827,7 @@ CONFIG_SND_SOC_MAX98357A=m
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 CONFIG_SND_SOC_RK3328=m
-# CONFIG_SND_SOC_RK817 is not set
+CONFIG_SND_SOC_RK817=m
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5514_SPI=m
@@ -4763,6 +4836,7 @@ CONFIG_SND_SOC_RT5514_SPI=m
 # CONFIG_SND_SOC_RT5640 is not set
 CONFIG_SND_SOC_RT5645=m
 # CONFIG_SND_SOC_RT5659 is not set
+# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
@@ -4829,6 +4903,7 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
@@ -4841,6 +4916,8 @@ CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
+# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 # CONFIG_SND_VIRTIO is not set
 
 #
@@ -4897,6 +4974,7 @@ CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_VIEWSONIC is not set
+# CONFIG_HID_XIAOMI is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_ICADE is not set
 # CONFIG_HID_ITE is not set
@@ -4920,6 +4998,7 @@ CONFIG_HID_LOGITECH_HIDPP=m
 # CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_MONTEREY is not set
 CONFIG_HID_MULTITOUCH=m
+# CONFIG_HID_NINTENDO is not set
 # CONFIG_HID_NTI is not set
 # CONFIG_HID_NTRIG is not set
 # CONFIG_HID_ORTEK is not set
@@ -5382,9 +5461,7 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
 #
 # LED drivers
 #
-# CONFIG_LEDS_AAT1290 is not set
 # CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_AS3645A is not set
 # CONFIG_LEDS_AW2013 is not set
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
@@ -5394,7 +5471,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m
 # CONFIG_LEDS_LM3532 is not set
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_LM3601X is not set
 # CONFIG_LEDS_MT6323 is not set
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=m
@@ -5413,7 +5489,6 @@ CONFIG_LEDS_REGULATOR=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_KTD2692 is not set
 # CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
 
@@ -5426,13 +5501,17 @@ CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_USER=m
 # CONFIG_LEDS_SPI_BYTE is not set
 # CONFIG_LEDS_TI_LMU_COMMON is not set
-# CONFIG_LEDS_SGM3140 is not set
 
 #
 # Flash and Torch LED drivers
 #
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
+# CONFIG_LEDS_SGM3140 is not set
 
 #
 # LED Triggers
@@ -5632,6 +5711,7 @@ CONFIG_SYNC_FILE=y
 # CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
 # CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
 # end of DMABUF options
 
 # CONFIG_AUXDISPLAY is not set
@@ -5645,21 +5725,24 @@ CONFIG_UIO=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
+CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
 CONFIG_VFIO_NOIOMMU=y
-CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PLATFORM=m
 # CONFIG_VFIO_AMBA is not set
 # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
 # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
 CONFIG_VFIO_MDEV=m
 CONFIG_VIRT_DRIVERS=y
+# CONFIG_NITRO_ENCLAVES is not set
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_PCI_LIB=m
+CONFIG_VIRTIO_PCI_LIB_LEGACY=m
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_PCI_LEGACY=y
@@ -5690,7 +5773,6 @@ CONFIG_STAGING=y
 # CONFIG_RTL8723BS is not set
 # CONFIG_R8712U is not set
 CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -5772,7 +5854,6 @@ CONFIG_ASHMEM=y
 # CONFIG_FIELDBUS_DEV is not set
 # CONFIG_QLGE is not set
 # CONFIG_WFX is not set
-# CONFIG_MFD_HI6421_SPMI is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CROS_EC=y
@@ -5796,7 +5877,7 @@ CONFIG_COMMON_CLK=y
 #
 # Clock driver for ARM Reference designs
 #
-# CONFIG_ICST is not set
+# CONFIG_CLK_ICST is not set
 # CONFIG_CLK_SP810 is not set
 # end of Clock driver for ARM Reference designs
 
@@ -5868,6 +5949,8 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # end of Generic IOMMU Pagetable Support
 
 # CONFIG_IOMMU_DEBUGFS is not set
+CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
@@ -5995,8 +6078,12 @@ CONFIG_IIO_SW_TRIGGER=m
 #
 # CONFIG_ADIS16201 is not set
 # CONFIG_ADIS16209 is not set
+# CONFIG_ADXL313_I2C is not set
+# CONFIG_ADXL313_SPI is not set
 # CONFIG_ADXL345_I2C is not set
 # CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL355_I2C is not set
+# CONFIG_ADXL355_SPI is not set
 # CONFIG_ADXL372_SPI is not set
 # CONFIG_ADXL372_I2C is not set
 # CONFIG_BMA180 is not set
@@ -6130,9 +6217,12 @@ CONFIG_AD8366=m
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
+# CONFIG_SCD4X is not set
 # CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SENSIRION_SGP40 is not set
 # CONFIG_SPS30_I2C is not set
 # CONFIG_SPS30_SERIAL is not set
+# CONFIG_SENSEAIR_SUNRISE_CO2 is not set
 # CONFIG_VZ89X is not set
 # end of Chemical Sensors
 
@@ -6218,6 +6308,7 @@ CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
 #
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
+# CONFIG_ADRF6780 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
 
@@ -6390,6 +6481,7 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 #
 # Digital potentiometers
 #
+# CONFIG_AD5110 is not set
 # CONFIG_AD5272 is not set
 # CONFIG_DS1803 is not set
 # CONFIG_MAX5432 is not set
@@ -6474,6 +6566,7 @@ CONFIG_AD2S1200=m
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 # CONFIG_MAX31856 is not set
+# CONFIG_MAX31865 is not set
 # end of Temperature sensors
 
 # CONFIG_NTB is not set
@@ -6513,7 +6606,13 @@ CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 # CONFIG_PHY_XGENE is not set
 # CONFIG_PHY_CAN_TRANSCEIVER is not set
+
+#
+# PHY drivers for Broadcom platforms
+#
 # CONFIG_BCM_KONA_USB2_PHY is not set
+# end of PHY drivers for Broadcom platforms
+
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
@@ -6651,17 +6750,17 @@ CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_FAULT_INJECTION is not set
 CONFIG_F2FS_FS_COMPRESSION=y
 CONFIG_F2FS_FS_LZO=y
+CONFIG_F2FS_FS_LZORLE=y
 CONFIG_F2FS_FS_LZ4=y
 CONFIG_F2FS_FS_LZ4HC=y
 CONFIG_F2FS_FS_ZSTD=y
-CONFIG_F2FS_FS_LZORLE=y
+CONFIG_F2FS_IOSTAT=y
 # CONFIG_ZONEFS_FS is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_ENCRYPTION_ALGS=y
 CONFIG_FS_VERITY=y
@@ -6694,12 +6793,9 @@ CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
 CONFIG_FSCACHE=m
 # CONFIG_FSCACHE_STATS is not set
-# CONFIG_FSCACHE_HISTOGRAM is not set
 # CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
 # end of Caches
 
 #
@@ -6725,6 +6821,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_RW=y
+# CONFIG_NTFS3_FS is not set
 # end of DOS/FAT/EXFAT/NT Filesystems
 
 #
@@ -6797,6 +6894,7 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_CONSOLE is not set
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_RAM is not set
+# CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_EROFS_FS is not set
@@ -6835,7 +6933,6 @@ CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
@@ -6845,6 +6942,8 @@ CONFIG_CIFS_DEBUG=y
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_SWN_UPCALL=y
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 CONFIG_NLS=y
@@ -6948,6 +7047,8 @@ CONFIG_INIT_STACK_NONE=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
+# CONFIG_ZERO_CALL_USED_REGS is not set
 # end of Memory initialization
 # end of Kernel hardening options
 # end of Security options
@@ -6985,7 +7086,6 @@ CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 # CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_ENGINE=m
 
 #
@@ -7130,6 +7230,7 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
 CONFIG_CRYPTO_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
@@ -7221,6 +7322,7 @@ CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
+# CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
@@ -7245,6 +7347,7 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_SWIOTLB=y
+# CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_REMAP=y

device/main/device-purism-librem5/0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch

@@ -1,32 +1,28 @@
-From 0b1bcc5b931e6c30514ce96b2ce388ddd392052a Mon Sep 17 00:00:00 2001
+From f66139789e57370c6759b805721d31a3af0141cc Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
-Date: Wed, 9 Feb 2022 12:49:19 -0800
+Date: Mon, 15 Nov 2021 09:45:06 -0800
 Subject: [PATCH] udev/cameras: use correct path for modprobe on Alpine Linux
 
 ---
- debian/librem5-base-defaults.librem5-cameras.udev | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ debian/librem5-base-defaults.librem5-cameras.udev | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/debian/librem5-base-defaults.librem5-cameras.udev b/debian/librem5-base-defaults.librem5-cameras.udev
-index b7f96f2..c986e62 100644
+index 6bdf4c0..c5d4701 100644
 --- a/debian/librem5-base-defaults.librem5-cameras.udev
 +++ b/debian/librem5-base-defaults.librem5-cameras.udev
-@@ -1,9 +1,9 @@
- # Load and unload camera modules on camera killswitch changes
--ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe imx7_media_csi", RUN+="/usr/sbin/modprobe imx8mq_mipi_csi2"
--ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/usr/sbin/rmmod imx7_media_csi", RUN+="/usr/sbin/rmmod imx8mq_mipi_csi2"
-+ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe imx7_media_csi", RUN+="/sbin/modprobe imx8mq_mipi_csi2"
-+ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/sbin/rmmod imx7_media_csi", RUN+="/sbin/rmmod imx8mq_mipi_csi2"
- 
--ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe s5k3l6xx"
--ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/usr/sbin/rmmod s5k3l6xx"
-+ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe s5k3l6xx"
-+ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/sbin/rmmod s5k3l6xx"
- 
--ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe hi846"
--ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/usr/sbin/rmmod hi846"
-+ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe hi846"
-+ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}!="1", RUN+="/sbin/rmmod hi846"
+@@ -2,7 +2,7 @@
+ # Then load the module again as the device is on.
+ # If the removal fails, then the device is already properly initiated,
+ # and had claimed its resources, which now prevent the removal.
+-ACTION=="add", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe s5k3l6xx"
+-ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/rmmod s5k3l6xx", RUN+="/usr/sbin/modprobe s5k3l6xx"
+-ACTION=="add", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/modprobe hi846"
+-ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/usr/sbin/rmmod hi846", RUN+="/usr/sbin/modprobe hi846"
++ACTION=="add", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe s5k3l6xx"
++ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/rmmod s5k3l6xx", RUN+="/sbin/modprobe s5k3l6xx"
++ACTION=="add", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/modprobe hi846"
++ACTION=="change", SUBSYSTEM=="rfkill", ENV{RFKILL_NAME}=="camera-hks", ENV{RFKILL_STATE}=="1", RUN+="/sbin/rmmod hi846", RUN+="/sbin/modprobe hi846"
 -- 
-2.35.1
+2.33.1
 

device/main/device-purism-librem5/APKBUILD

@@ -3,9 +3,9 @@
 # Co-Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.29
-pkgrel=0
-_confver=47
+pkgver=1.28
+pkgrel=1
+_confver=41
 _purismrel=1
 # <librem5-base ver>.<purism release>
 _purismver=${_confver}pureos$_purismrel
@@ -135,7 +135,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-e4729fbf111e691179d1aa11970c486315b88563782b46fddcfcb8e4ec02fb9a70a99cd3b74c039f26420d70a79b228f3bd8b0de8f995adfa2e9931e0275cb62  librem5-base-pureos-47pureos1.tar.gz
+239fb3e62ea91106bcfcfdcfd576de1eaed3368d98d0905c38df71ae3c99483fed2756f276e4ff0afeab3f6f0e6cd960aeab7374547f9f28d12f79de9ca575f6  librem5-base-pureos-41pureos1.tar.gz
 2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509  00-mesa.sh
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
@@ -149,5 +149,5 @@ a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f
 5da1e39c36d8d83d159f8f9aa0b77c3de98b5d65054d0c3d376d64d87ef1e21b7570e0039e761b015917d4808e896e102d432dc8229e6189e80104dbd148ae4b  uboot-script.cmd
 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf
 f535b43b8defe75e72049e4eee181bfe821f6304a096413bccf6d08c8bb11b947fa1fee305af85616abd778745fadd52ebd610c2d135a4f907915b99ab2c526a  0001-librem5-pm.udev-disable-PM-for-broadmobi-modem.patch
-b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378  0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
+2639da6a7169ed9ad2eb09efd1d2462fe330554b9cf1d44f803a33699970d56f12ceddccf97574d245cb8858b26a4857e3dfbadb20862ada962619814ad058b4  0002-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
 "

device/main/linux-purism-librem5/0004-CVE-2021-39685-USB-gadget-detect-too-big-endpoint-0-requests.patch

@@ -0,0 +1,111 @@
+From 36dfdf11af49d3c009c711fb16f5c6e7a274505d Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 9 Dec 2021 18:59:27 +0100
+Subject: USB: gadget: detect too-big endpoint 0 requests
+
+commit 153a2d7e3350cc89d406ba2d35be8793a64c2038 upstream.
+
+Sometimes USB hosts can ask for buffers that are too large from endpoint
+0, which should not be allowed.  If this happens for OUT requests, stall
+the endpoint, but for IN requests, trim the request size to the endpoint
+buffer size.
+
+Co-developed-by: Szymon Heidrich <szymon.heidrich@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/gadget/composite.c    | 12 ++++++++++++
+ drivers/usb/gadget/legacy/dbgp.c  | 13 +++++++++++++
+ drivers/usb/gadget/legacy/inode.c | 16 +++++++++++++++-
+ 3 files changed, 40 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
+index 504c1cbc255d1..1ef7922b57b62 100644
+--- a/drivers/usb/gadget/composite.c
++++ b/drivers/usb/gadget/composite.c
+@@ -1679,6 +1679,18 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
+ 	struct usb_function		*f = NULL;
+ 	u8				endp;
+ 
++	if (w_length > USB_COMP_EP0_BUFSIZ) {
++		if (ctrl->bRequestType == USB_DIR_OUT) {
++			goto done;
++		} else {
++			/* Cast away the const, we are going to overwrite on purpose. */
++			__le16 *temp = (__le16 *)&ctrl->wLength;
++
++			*temp = cpu_to_le16(USB_COMP_EP0_BUFSIZ);
++			w_length = USB_COMP_EP0_BUFSIZ;
++		}
++	}
++
+ 	/* partial re-init of the response message; the function or the
+ 	 * gadget might need to intercept e.g. a control-OUT completion
+ 	 * when we delegate to it.
+diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
+index e1d566c9918ae..e567afcb2794c 100644
+--- a/drivers/usb/gadget/legacy/dbgp.c
++++ b/drivers/usb/gadget/legacy/dbgp.c
+@@ -345,6 +345,19 @@ static int dbgp_setup(struct usb_gadget *gadget,
+ 	void *data = NULL;
+ 	u16 len = 0;
+ 
++	if (length > DBGP_REQ_LEN) {
++		if (ctrl->bRequestType == USB_DIR_OUT) {
++			return err;
++		} else {
++			/* Cast away the const, we are going to overwrite on purpose. */
++			__le16 *temp = (__le16 *)&ctrl->wLength;
++
++			*temp = cpu_to_le16(DBGP_REQ_LEN);
++			length = DBGP_REQ_LEN;
++		}
++	}
++
++
+ 	if (request == USB_REQ_GET_DESCRIPTOR) {
+ 		switch (value>>8) {
+ 		case USB_DT_DEVICE:
+diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
+index 539220d7f5b62..0a4041552ed19 100644
+--- a/drivers/usb/gadget/legacy/inode.c
++++ b/drivers/usb/gadget/legacy/inode.c
+@@ -110,6 +110,8 @@ enum ep0_state {
+ /* enough for the whole queue: most events invalidate others */
+ #define	N_EVENT			5
+ 
++#define RBUF_SIZE		256
++
+ struct dev_data {
+ 	spinlock_t			lock;
+ 	refcount_t			count;
+@@ -144,7 +146,7 @@ struct dev_data {
+ 	struct dentry			*dentry;
+ 
+ 	/* except this scratch i/o buffer for ep0 */
+-	u8				rbuf [256];
++	u8				rbuf[RBUF_SIZE];
+ };
+ 
+ static inline void get_dev (struct dev_data *data)
+@@ -1334,6 +1336,18 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
+ 	u16				w_value = le16_to_cpu(ctrl->wValue);
+ 	u16				w_length = le16_to_cpu(ctrl->wLength);
+ 
++	if (w_length > RBUF_SIZE) {
++		if (ctrl->bRequestType == USB_DIR_OUT) {
++			return value;
++		} else {
++			/* Cast away the const, we are going to overwrite on purpose. */
++			__le16 *temp = (__le16 *)&ctrl->wLength;
++
++			*temp = cpu_to_le16(RBUF_SIZE);
++			w_length = RBUF_SIZE;
++		}
++	}
++
+ 	spin_lock (&dev->lock);
+ 	dev->setup_abort = 0;
+ 	if (dev->state == STATE_DEV_UNCONNECTED) {
+-- 
+cgit 1.2.3-1.el7
+

device/main/linux-purism-librem5/0005-CVE-2021-39685-USB-gadget-zero-allocate-endpoint-0-buffers.patch

@@ -0,0 +1,48 @@
+From 6eea4ace62fa6414432692ee44f0c0a3d541d97a Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 9 Dec 2021 19:02:15 +0100
+Subject: USB: gadget: zero allocate endpoint 0 buffers
+
+commit 86ebbc11bb3f60908a51f3e41a17e3f477c2eaa3 upstream.
+
+Under some conditions, USB gadget devices can show allocated buffer
+contents to a host.  Fix this up by zero-allocating them so that any
+extra data will all just be zeros.
+
+Reported-by: Szymon Heidrich <szymon.heidrich@gmail.com>
+Tested-by: Szymon Heidrich <szymon.heidrich@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/gadget/composite.c   | 2 +-
+ drivers/usb/gadget/legacy/dbgp.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
+index 1ef7922b57b62..284eea9f6e4d8 100644
+--- a/drivers/usb/gadget/composite.c
++++ b/drivers/usb/gadget/composite.c
+@@ -2221,7 +2221,7 @@ int composite_dev_prepare(struct usb_composite_driver *composite,
+ 	if (!cdev->req)
+ 		return -ENOMEM;
+ 
+-	cdev->req->buf = kmalloc(USB_COMP_EP0_BUFSIZ, GFP_KERNEL);
++	cdev->req->buf = kzalloc(USB_COMP_EP0_BUFSIZ, GFP_KERNEL);
+ 	if (!cdev->req->buf)
+ 		goto fail;
+ 
+diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c
+index e567afcb2794c..355bc7dab9d5f 100644
+--- a/drivers/usb/gadget/legacy/dbgp.c
++++ b/drivers/usb/gadget/legacy/dbgp.c
+@@ -137,7 +137,7 @@ static int dbgp_enable_ep_req(struct usb_ep *ep)
+ 		goto fail_1;
+ 	}
+ 
+-	req->buf = kmalloc(DBGP_REQ_LEN, GFP_KERNEL);
++	req->buf = kzalloc(DBGP_REQ_LEN, GFP_KERNEL);
+ 	if (!req->buf) {
+ 		err = -ENOMEM;
+ 		stp = 2;
+-- 
+cgit 1.2.3-1.el7
+

device/main/linux-purism-librem5/APKBUILD

@@ -2,9 +2,9 @@
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=linux-purism-librem5
-pkgver=5.16.7
-pkgrel=0
-_purismrel=1
+pkgver=5.13.19
+pkgrel=4
+_purismrel=5
 # <kernel ver>.<purism kernel release>
 _purismver=${pkgver}pureos$_purismrel
 pkgdesc="Purism Librem 5 phone kernel fork"
@@ -40,6 +40,8 @@ source="
 	0001-bq25890_charger-enter-ship-mode-on-power-off.patch
 	0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
 	0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
+	0004-CVE-2021-39685-USB-gadget-detect-too-big-endpoint-0-requests.patch
+	0005-CVE-2021-39685-USB-gadget-zero-allocate-endpoint-0-buffers.patch
 	$_config
 "
 builddir="$srcdir/$_repository-pureos-$_purismver"
@@ -79,9 +81,11 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 sha512sums="
-5bcde0d5c8210f356eea9124674838543be0659d0408366d2345cb837bb3761508c3b587a8fc6f7b8e8f9bf6a353b3d186fba5917c812b0e4a72dd093063d877  linux-purism-librem5-5.16.7pureos1.tar.gz
+2b52c1f832b2df7ac449c6d055d9d7fddc7a7e68c8ee7ea5b3f89b2fb7da0486083386c21e82b0c394760fa4bf3fd3f62183f957dbe922a2403e5249fed0cc2e  linux-purism-librem5-5.13.19pureos5.tar.gz
 0e3caf6275247e31b874b94330dc4f991837a4b62f3c15a1f8ad39a7edd02ae499679bcd7ddc9463bb1c1a5073ea5980fa144a2ece804d72a6b2fc8c76c50766  0001-bq25890_charger-enter-ship-mode-on-power-off.patch
 1dbf2adaf097bcce3ee179cd6b0f10d2ebefdc82191d34fffea8cb336c9dcbc66b717bf97a2e264b8068f178c0254f2b1281a09ae72d4825fd7b4a39916c0461  0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
 c52f9e7e17f876697000a0c3b959a0d571ca506ba55ee5158e30ac00e148372097c88951a354190f669137a955405c87042a925c1bbe3cd91df40721650d45d3  0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
-9f561f74d826bf1cd166f87a22936c744ef9148f3508359d423df75efdf60ec24f18b0938ae3bb16b5aa5eaba4826fcde38b2ad2feae2027378f19e94ff60394  config-purism-librem5.aarch64
+59d480b6379dcfff94d05b08e28c005d507f640dc0147841e7df4827fce8db01dab1d4d50fb45b2b3fff72cdeb219a8cd87a889078a6372aea4469c861c378b1  0004-CVE-2021-39685-USB-gadget-detect-too-big-endpoint-0-requests.patch
+61f862cda24e7b14e55e9a9ce3a537adfc7a1c77e0670255dc485886e2c19156ddaf49fdd88b629ddde3cf25a83fd603678caebb96e18f59245917d3a2e51bb0  0005-CVE-2021-39685-USB-gadget-zero-allocate-endpoint-0-buffers.patch
+e44a2e2032b182b565cc0c329b3eb316b6232dd57fe6bbe79dcf39d891520a5816b3a745087e18c829336d3279535e55ee559ea5e9b17365f2fdcecef17d3f6e  config-purism-librem5.aarch64
 "

device/testing/device-asus-flo/APKBUILD

@@ -1,19 +1,14 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: David Heidelberg <david@ixit.cz>
 pkgname=device-asus-flo
-pkgver=1
-pkgrel=0
-pkgdesc="Google Nexus 7 2013 (flo)"
+pkgver=0
+pkgrel=27
+pkgdesc="Google Nexus 7 2013 flo"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base mkbootimg"
+depends="postmarketos-base linux-asus-flo mkbootimg mesa-dri-freedreno"
 makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-kernel-downstream:kernel_downstream
-	$pkgname-kernel-mainline:kernel_mainline
-	$pkgname-weston
-	$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-android-touch-dev.rules wpa_supplicant.conf pointercal weston.ini"
 
 options="!check !archcheck"
@@ -38,18 +33,6 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
-kernel_downstream() {
-	pkgdesc="GPU works somehow, very old"
-	depends="linux-asus-flo mesa-dri-freedreno"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_mainline() {
-	pkgdesc="linux-next kernel, install only for development!"
-	depends="linux-postmarketos-qcom-apq8064"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="firmware-asus-flo"
@@ -57,7 +40,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-4e8007a001f45860ed9a6d7f5d3d768b90661db148587358dcc2d24a83a9c784114b2559eb3c55cbaa28e695a07a675e4ae668544b9ee4333d03f268266f9aea  deviceinfo
+4e0173dc8dce37fb974a3fd5c5be8b22d8eeee8a431b6b4c830fde1895e355b9dd19079d9b36111acb2dd811c1470c593f1586f5568fe023f2fa0353574abe4b  deviceinfo
 5ac89b627f52d2f1103c3329bd905cdbb906cae5bb332d52e6805d7971fbcc0faabe1fd9d2beb7c6de4e4487c05047eaa17852dbf9e114ee3c5d4b0d57d73859  90-android-touch-dev.rules
 3278921cc1617d10fdd13dfbeaf213cda0078d069e727acd8cfac10bd8ade6f373be1e22fd1e4b50ae71cd2eae09f7d6aad5de42338d9ea9f8c1a34f0b60cb69  wpa_supplicant.conf
 cf913217b41a3dde8bc2a16a5bc82013c85679de0e81db1cfc36f2409ea034fec430082ddcb207c16746453601cf8381300b049cd2fb131f1916dc7dbcc247e3  pointercal

device/testing/device-asus-flo/deviceinfo

@@ -10,8 +10,6 @@ deviceinfo_chassis="tablet"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_flash_method="fastboot"
-deviceinfo_append_dtb="true"
-deviceinfo_dtb="qcom-apq8064-asus-nexus7-flo"
 deviceinfo_arch="armv7"
 deviceinfo_gpu_accelerated="true"
 

device/testing/device-pine64-quartz64a/APKBUILD

@@ -0,0 +1,30 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Timothy Valldeperas <tvall43@gmail.com>
+pkgname=device-pine64-quartz64a
+pkgver=1
+pkgrel=0
+pkgdesc="PINE64 Quartz64 model A"
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="postmarketos-base linux-postmarketos-rockchip u-boot-quartz64 mesa-dri-gallium"
+makedepends="devicepkg-dev"
+source="deviceinfo
+	extlinux.conf
+	"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+	install -D -m644 "$srcdir"/extlinux.conf \
+		"$pkgdir"/boot/extlinux/extlinux.conf
+}
+
+sha512sums="
+22197bde70c59e8294a4dcdb05c71900e20b202f43e5f7ecd10528ba1de3cc88f78a734cccf37f9281afa79e63a6c838c14240b4ca5e0d8fa40c05591ebbc861  deviceinfo
+e6091f92a5d2ac26d9cefda7895dc747a69a43ec1d27388b39f47c1b2ee0ab110029fcc45adb4ae7418ef51be68cb23206dcddcf48a3e0b31c1e66247e0dcc22  extlinux.conf
+"

device/testing/device-pine64-quartz64a/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 Quartz64 model A"
+deviceinfo_manufacturer="PINE64"
+deviceinfo_codename="pine64-quartz64a"
+deviceinfo_year="2021"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="embedded"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1920"
+deviceinfo_screen_height="1080"
+deviceinfo_getty="ttyS2;1500000"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_sd_embed_firmware="u-boot/pine64-quartz64/idbloader.img:32,u-boot/pine64-quartz64/u-boot.itb:8192"
+deviceinfo_boot_part_start="32768"

device/testing/device-pine64-quartz64a/extlinux.conf

@@ -0,0 +1,9 @@
+timeout 10
+default POSTMARKETOS
+menu title boot prev kernel
+
+label POSTMARKETOS
+  kernel /vmlinuz
+  fdt /dtbs-postmarketos-rockchip/rockchip/rk3566-quartz64-a.dtb
+  initrd /initramfs
+  append console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT

device/testing/device-samsung-a7/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a7
 pkgdesc="Samsung Galaxy A7 (2015)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -18,7 +18,6 @@ makedepends="devicepkg-dev"
 source="
 	20-tm2-touchkey-input.rules
 	deviceinfo
-	rootston.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -41,14 +40,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-		"$subpkgdir"/etc/phosh/rootston.ini
-}
-
 sha512sums="
 5a91ca375652bc9d2af90db4f446176a4fd43b5c924362219f6bf35e76de818cb4ecce105ee56b4511c3c0882bd055615f409516fade6dfcd30642cc147c1c5a  20-tm2-touchkey-input.rules
 bc3787eccf092939b272f77a6c2febde13d963eb595147dff492e1dae2dc12b6f24b9efc4fdca3be90780d3ebfe4e1cec1b2023c8efd37774486fa34c70b10f7  deviceinfo
-7883533e105de4f951026f99a7c27e90d290d4760253c56e4f7ddb20acc1f6de294cf6ca9a2259a9f4db7dec106926d7c970a2c94107f5ed60efe08525766f44  rootston.ini
 "

device/testing/device-samsung-a7/rootston.ini

@@ -1,5 +0,0 @@
-[cursor:seat0]
-map-to-output:DSI-1
-
-[output:DSI-1]
-scale = 2.75

device/testing/device-samsung-manta/100-manta-charging.rules

@@ -1,4 +0,0 @@
-SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_REMOTE_TYPE}=="USB_DCP", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/lib/device-samsung-manta/autodetect-charger.sh"
-SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_REMOTE_TYPE}=="USB", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/lib/device-samsung-manta/sink-usb-power.sh"
-SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_STATUS}=="Charging", RUN+="/usr/lib/device-samsung-manta/led-charging-manta.sh"
-SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_STATUS}=="Discharging", RUN+="/usr/lib/device-samsung-manta/led-discharging-manta.sh"

device/testing/device-samsung-manta/APKBUILD

@@ -1,30 +1,15 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-manta
 pkgdesc="Google Nexus 10"
-pkgver=0.5
-pkgrel=0
+pkgver=0.4
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-manta mkbootimg mesa-dri-gallium watchdog-kick alsa-ucm-conf"
+depends="postmarketos-base linux-samsung-manta mkbootimg mesa-dri-swrast watchdog-kick"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="
-	deviceinfo
-	pointercal
-	modules-load.conf
-	100-manta-charging.rules
-	autodetect-charger.sh
-	sink-usb-power.sh
-	led-charging-manta.sh
-	led-discharging-manta.sh
-	networkmanager.conf
-	ucm/Manta-I2S.conf
-	ucm/HiFi.conf
-	ucm/Manta-SPDIF.conf
-	ucm/SPDIF.conf
-"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -32,52 +17,8 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -D -m644 "$srcdir"/networkmanager.conf \
-		"$pkgdir"/etc/NetworkManager/conf.d/10-manta.conf
-
-	install -Dm744 "$srcdir"/autodetect-charger.sh \
-		"$pkgdir"/usr/lib/device-samsung-manta/autodetect-charger.sh
-	install -Dm744 "$srcdir"/sink-usb-power.sh \
-		"$pkgdir"/usr/lib/device-samsung-manta/sink-usb-power.sh
-	install -Dm744 "$srcdir"/led-charging-manta.sh \
-		"$pkgdir"/usr/lib/device-samsung-manta/led-charging-manta.sh
-	install -Dm744 "$srcdir"/led-discharging-manta.sh \
-		"$pkgdir"/usr/lib/device-samsung-manta/led-discharging-manta.sh
-
-	install -Dm644 "$srcdir"/100-manta-charging.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/100-manta-charging.rules
-
-	install -D -m644 "$srcdir"/pointercal \
-		"$pkgdir"/etc/pointercal
-
-	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/conf.d/Manta-I2S \
-		"$srcdir"/Manta-I2S.conf \
-		"$srcdir"/HiFi.conf
-
-	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/conf.d/Manta-SPDIF \
-		"$srcdir"/Manta-SPDIF.conf \
-		"$srcdir"/SPDIF.conf
-}
-
-nonfree_firmware() {
-	pkgdesc="Firmware for Samsung Manta (Nexus 10)"
-	depends="firmware-samsung-manta"
-	mkdir "$subpkgdir"
 }
 
 sha512sums="
-58a40f3ea8942e868d384f185e3bfadb3b1b1d1d3b785425ccc2fd851189595b6c645edda9aad1e158abcd2ead0e169470e43392d2263742e36d7f4fac5cb0e9  deviceinfo
-4a4a1e478131175d628669c45c780db6eace39653d7c331e13042d315a1d04a1feebbf3ab1caea959f84d3203dcf0402da0a51dfd90728bc0a2a52a069069c52  pointercal
-aa65eddbf733af7a8c143f810aa21319ea267bfe473080faba634419146ff14f57e9e07cecdf64aefe0d060bf03564637d606be7b436ccb7de512697097460d5  modules-load.conf
-e479dd64f2c27aeeafcc57ea1ae650b382e07a7ea2addf994406b2f64e9b3eff7df451637ceeef85e484be39a8d5a19e35d35c2643b9538b29abf55c67bcecc3  100-manta-charging.rules
-edb46f0de37835c7c5a55f47f57acd40012817e0a734153d49033d7aa82404192abdd8f100c93df80702a09698e0d13eb3e26f4bcc86dc427322a2b68498bbb4  autodetect-charger.sh
-71a4bf6d25b55acb94fd624625c94cc9c74fe57c4328cddb488f57274443f8c9354c0a5a6f52df40f0ca54ed0713db73f1f90b5fcfd0f8e25ed9cc755b30dea3  sink-usb-power.sh
-797f5dce8e27bb5e1fb77a6fa9a917847067f533f14b7b6339703f0aa2969cd8bee686fcdd83e91d21c2fefb6d44365f6b5b0c7726950febfee8a99f9faf8be7  led-charging-manta.sh
-a6c9ac55b8d343bcef8765498b450d3e17993b7ad72b274c2fe3e9d3b1a94f917f3790a3595394c0a4de5f1debffbcfbfccd1e4eb637604d6a3da54741cf6091  led-discharging-manta.sh
-a6d59c86fc7c47ba25fe125fe57cfbc0b82cb41e3729c3b0387e611386c2e449fa14360b999bc7593527f30a01f3f85bacf2d81762f167a547b37271456343bd  networkmanager.conf
-20bd1a5ced8f816c931353abb939936f3c71c5ae1e7a6736dc7c596e721fd59dff70866dc056ef8732fa3cd68f50f08875698696f75ca15e8d618d7778342da4  Manta-I2S.conf
-684f1dacb031dcbfd17d55c43db08a1da89d1e7c8197e4c9b8200096e74895469cffabeef3233a4ff380eb92e5fd5618819770ade4f86d1aad9e12e9da7ef122  HiFi.conf
-d9e1847f74e46091e2c0bf6cf088cd85ad866fde3e0b8aff8fb02b2dc8869c44977303e40f2be86751ad083838c5a659dd70e434746b92bafd2d0a618f135bcb  Manta-SPDIF.conf
-5e1bae638cbd88a38b10b45f675bc4e5fdb84155923a945168207e49db2053a31ae9e7b5233936b832ed60b3a367e31dee7b2d85b52b2922dcfa5df1a813aaa7  SPDIF.conf
+98c474bd11150036f18701eaedb72f1038e2318caebd2f9d48ec1ab6d1fd47ccb3d49fff002c25a499f97cee59dd09b206c068bfcf642155a224422b233a37f4  deviceinfo
 "

device/testing/device-samsung-manta/autodetect-charger.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-echo 1 > /sys/class/power_supply/smb347-usb/charger_detection

device/testing/device-samsung-manta/deviceinfo

@@ -27,5 +27,5 @@ deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_heimdall_partition_kernel="boot"
+deviceinfo_flash_heimdall_partition_kernel="kernel"
 deviceinfo_flash_heimdall_partition_system="system"

device/testing/device-samsung-manta/led-charging-manta.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-echo 0xFF000000 > /sys/class/leds/as3668/color
-echo 50 > /sys/class/leds/as3668/brightness

device/testing/device-samsung-manta/led-discharging-manta.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-echo 0 > /sys/class/leds/as3668/brightness
-echo 0xFFFFFFFF > /sys/class/leds/as3668/color

device/testing/device-samsung-manta/modules-load.conf

@@ -1,5 +0,0 @@
-# This file contains the names of kernel modules that should be loaded
-# at boot time, one per line. Lines beginning with "#" are ignored.
-
-# touch
-atmel_mxt_ts

device/testing/device-samsung-manta/networkmanager.conf

@@ -1,2 +0,0 @@
-[keyfile]
-unmanaged-devices=interface-name:p2p*

device/testing/device-samsung-manta/pointercal

@@ -1 +0,0 @@
-40845 31 317640 35 25267 538664 65536 2560 1600 0

device/testing/device-samsung-manta/sink-usb-power.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-echo 1 > /sys/class/power_supply/smb347-usb/usb_hc

device/testing/device-samsung-manta/ucm/HiFi.conf

@@ -1,152 +0,0 @@
-SectionVerb {
-        EnableSequence [
-        ]
-
-        DisableSequence [
-        ]
-
-        Value {
-                PlaybackPCM "hw:MantaI2S,0"
-                CapturePCM "hw:MantaI2S,0"
-        }
-}
-
-SectionDevice."Speaker" {
-        ConflictingDevice [
-                "Headphones"
-        ]
-
-        EnableSequence [
-                cset "name='DAC1R Mixer AIF1.1 Switch' 1"
-                cset "name='DAC1L Mixer AIF1.1 Switch' 1"
-                cset "name='DAC1 Switch' 1"
-                cset "name='AIF1DAC1 EQ Switch' 1"
-                cset "name='AIF1DAC1 EQ1 Volume' 3"
-                cset "name='AIF1DAC1 EQ2 Volume' 8"
-                cset "name='AIF1DAC1 EQ3 Volume' 16"
-                cset "name='AIF1DAC1 EQ4 Volume' 10"
-                cset "name='AIF1DAC1 EQ5 Volume' 11"
-                cset "name='Speaker Switch' 1"
-                cset "name='SPKR DAC1 Switch' 1"
-                cset "name='SPKL DAC1 Switch' 1"
-                cset "name='Speaker Mixer Volume' 3"
-                cset "name='Speaker Boost Volume' 5"
-                cset "name='AIF1DRC1 Mode' Speakers Media"
-                cset "name='AIF1DAC1 DRC Switch' 1"
-                cset "name='Speaker Volume' 51"
-                cset "name='Speaker Volume' 52"
-        ]
-
-        DisableSequence [
-                cset "name='DAC1R Mixer AIF1.1 Switch' 0"
-                cset "name='DAC1L Mixer AIF1.1 Switch' 0"
-                cset "name='DAC1 Switch' 0"
-                cset "name='Speaker Switch' 0"
-                cset "name='SPKR DAC1 Switch' 0"
-                cset "name='SPKL DAC1 Switch' 0"
-                cset "name='Speaker Mixer Volume' 0"
-                cset "name='AIF1DRC1 Mode' Default"
-                cset "name='AIF1DAC1 DRC Switch' 0"
-        ]
-
-        Value {
-                PlaybackChannels "2"
-        }
-}
-
-SectionDevice."Headphones" {
-        ConflictingDevice [
-                "Speaker"
-        ]
-
-        EnableSequence [
-                cset "name='DAC1R Mixer AIF1.1 Switch' 1"
-                cset "name='DAC1L Mixer AIF1.1 Switch' 1"
-                cset "name='DAC1 Switch' 1"
-                cset "name='AIF1DAC1 EQ Switch' 0"
-                cset "name='Headphone Switch' 1"
-                cset "name='Headphone Volume' 24"
-        ]
-
-        DisableSequence [
-                cset "name='DAC1R Mixer AIF1.1 Switch' 0"
-                cset "name='DAC1L Mixer AIF1.1 Switch' 0"
-                cset "name='DAC1 Switch' 0"
-                cset "name='Headphone Switch' 0"
-        ]
-
-        Value {
-                PlaybackChannels "2"
-        }
-}
-
-SectionDevice."Mic" {
-        Comment "Microphone"
-
-        ConflictingDevice [
-                "Headset"
-        ]
-
-        EnableSequence [
-                cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 1"
-                cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 1"
-                cset "name='MIXINR IN2R Switch' 1"
-                cset "name='MIXINR IN2R Volume' 1"
-                cset "name='IN2R Switch' 1"
-                cset "name='AIF1ADCL Source' Right"
-                cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 1"
-                cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 1"
-                cset "name='MIXINL IN2L Switch' 1"
-                cset "name='MIXINL IN2L Volume' 1"
-                cset "name='IN2L Switch' 1"
-                cset "name='AIF1ADCR Source' Left"
-                cset "name='IN2R Volume' 16"
-                cset "name='IN2L Volume' 16"
-                cset "name='AIF1ADC1 HPF Switch' 1"
-                cset "name='AIF1ADC1 HPF Mode' HiFi"
-        ]
-
-        DisableSequence [
-                cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 0"
-                cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 0"
-                cset "name='MIXINR IN2R Switch' 0"
-                cset "name='IN2R Switch' 0"
-                cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 0"
-                cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 0"
-                cset "name='MIXINL IN2L Switch' 0"
-                cset "name='IN2L Switch' 0"
-        ]
-
-        Value {
-                CaptureChannels "2"
-        }
-}
-
-SectionDevice."Headset" {
-        ConflictingDevice [
-                "Mic"
-        ]
-
-        EnableSequence [
-                cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 1"
-                cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 1"
-                cset "name='MIXINR IN1R Switch' 1"
-                cset "name='MIXINR IN1R Volume' 1"
-                cset "name='IN1R Switch' 1"
-                cset "name='AIF1ADCL Source' Right"
-                cset "name='IN1R Volume' 16"
-                cset "name='AIF1ADC1 HPF Mode' HiFi"
-        ]
-
-        DisableSequence [
-                cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 0"
-                cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 0"
-                cset "name='MIXINR IN1R Switch' 0"
-                cset "name='IN1R Switch' 0"
-        ]
-
-        Value {
-                CaptureChannels "2"
-        }
-}
-

device/testing/device-samsung-manta/ucm/Manta-I2S.conf

@@ -1,51 +0,0 @@
-Syntax 3
-
-SectionUseCase."HiFi" {
-        File "HiFi.conf"
-}
-
-SectionDefaults [
-        cdev "hw:MantaI2S"
-
-        cset "name='DAC1R Mixer AIF1.1 Switch' 0"
-        cset "name='DAC1L Mixer AIF1.1 Switch' 0"
-        cset "name='DAC1 Switch' 0"
-        cset "name='DAC2 Switch' 0"
-        cset "name='AIF1DRC1 Mode' Default"
-        cset "name='AIF1DAC1 DRC Switch' 0"
-        cset "name='Speaker Switch' 0"
-        cset "name='SPKR DAC1 Switch' 0"
-        cset "name='SPKL DAC1 Switch' 0"
-        cset "name='Speaker Mixer Volume' 0"
-        cset "name='Headphone Switch' 0"
-        cset "name='Right Headphone Mux' DAC"
-        cset "name='Left Headphone Mux' DAC"
-        cset "name='Left Output Mixer DAC Switch' 0"
-        cset "name='Right Output Mixer DAC Switch' 0"
-        cset "name='MIXINL IN1L Switch' 0"
-        cset "name='IN1L Switch' 0"
-        cset "name='IN1L PGA IN1LP Switch' 0"
-        cset "name='IN1L PGA IN1LN Switch' 1"
-        cset "name='MIXINL IN2L Switch' 0"
-        cset "name='IN2L Switch' 0"
-        cset "name='IN2L PGA IN2LP Switch' 0"
-        cset "name='IN2L PGA IN2LN Switch' 1"
-        cset "name='MIXINR IN1R Switch' 0"
-        cset "name='IN1R Switch' 0"
-        cset "name='IN1R PGA IN1RP Switch' 0"
-        cset "name='IN1R PGA IN1RN Switch' 1"
-        cset "name='MIXINR IN2R Switch' 0"
-        cset "name='IN2R Switch' 0"
-        cset "name='IN2R PGA IN2RP Switch' 0"
-        cset "name='IN2R PGA IN2RN Switch' 1"
-        cset "name='AIF2DACL Mux' AIF3"
-        cset "name='AIF2DACR Mux' AIF3"
-        cset "name='AIF2DAC Mux' AIF3DACDAT"
-        cset "name='AIF3ADC Mux' AIF2ADCDAT"
-        cset "name='AIF1ADC1L Mixer AIF2 Switch' 0"
-        cset "name='AIF1ADC1R Mixer AIF2 Switch' 0"
-        cset "name='AIF1ADC2L Mixer AIF2 Switch' 0"
-        cset "name='AIF1ADC2R Mixer AIF2 Switch' 0"
-        cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 0"
-        cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 0"
-]

device/testing/device-samsung-manta/ucm/Manta-SPDIF.conf

@@ -1,5 +0,0 @@
-Syntax 3
-
-SectionUseCase."SPDIF" {
-        File "SPDIF.conf"
-}

device/testing/device-samsung-manta/ucm/SPDIF.conf

@@ -1,2 +0,0 @@
-SectionDevice."SPDIF" {
-}

device/testing/firmware-samsung-manta/APKBUILD

@@ -1,42 +0,0 @@
-pkgname=firmware-samsung-manta
-pkgver=1
-pkgrel=0
-pkgdesc="Firmware for Samsung Manta (Nexus 10)"
-url="https://developers.google.com/android/drivers#mantalmy49j"
-arch="armv7"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-install="$pkgname.post-install"
-_commitfw="5d170b264b593b75734a2c4f10f06fbe42bb5067"
-_commitdev="f654b082d30391218c985cd2e2c9089e1b444e11"
-source="
-	manta-fw_bcmdhd.bin::https://github.com/TheMuppets/proprietary_vendor_samsung/raw/$_commitfw/manta/proprietary/vendor/firmware/fw_bcmdhd.bin
-	maxtouch.fw::https://github.com/TheMuppets/proprietary_vendor_samsung/raw/$_commitfw/manta/proprietary/vendor/firmware/maxtouch.fw
-	es305_fw.bin::https://github.com/TheMuppets/proprietary_vendor_samsung/raw/$_commitfw/manta/proprietary/vendor/firmware/es305_fw.bin
-	brcmfmac43241b0-sdio.samsung,manta.txt::https://raw.githubusercontent.com/LineageOS/android_device_samsung_manta/$_commitdev/bcmdhd.cal
-"
-
-package() {
-	cd "$srcdir"
-
-	# Wifi
-	install -Dm644 "manta-fw_bcmdhd.bin" \
-		"$pkgdir/lib/firmware/postmarketos/brcm/brcmfmac43241b0-sdio.bin"
-	install -Dm644 "brcmfmac43241b0-sdio.samsung,manta.txt" \
-		"$pkgdir/lib/firmware/postmarketos/brcm/brcmfmac43241b0-sdio.samsung,manta.txt"
-
-	# Touchscreen
-	install -Dm644 "maxtouch.fw" \
-		"$pkgdir/lib/firmware/postmarketos/maxtouch.fw"
-
-	# Audience eS305
-	install -Dm644 "es305_fw.bin" \
-		"$pkgdir/lib/firmware/postmarketos/es305_fw.bin"
-}
-
-sha512sums="
-0ad8b6963244e652746429e95e52c00395e38eb873a0632aab2e10a43b11fb1ef53a3c5e4863ac90d11d9c1c65e87f2067e9edda4cf0e7b06c8dc0cd3c74fb6f  manta-fw_bcmdhd.bin
-a7ada29e2d76c48941ae05abb6f972a628f9729ccabbea5d8adfa2fb7f107e652ef290a1770e54387b3ee798382cb4f6519344461c991b5193fdbc465b9c7644  maxtouch.fw
-b16ccf4c733564fc0e7e436915ca3185ebd6bbcd33106328813b1bd8a40ff1e34c818c71c86356596f75e1b739585ab562fa279cfd0d051c0216c64759bc5dc7  es305_fw.bin
-e5317fdd080ff7ea30bf326c48f230a68484e4339739553f537f9b1c0c379b48fd86b857112cf6f293f061b18d0ea82b92026ca79204c28fd2e0d71c2cd42140  brcmfmac43241b0-sdio.samsung,manta.txt
-"

device/testing/firmware-samsung-manta/firmware-samsung-manta.post-install

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Enable autostart of deferred initcalls (needed to bring Wi-Fi online)
-rc-update -q add deferred-initcalls sysinit
-
-# Explicitly specify wlan device. Without this, p2p0 will be
-# selected automatically instead of wlan0, and Wi-Fi will not work.
-if ! grep -q "i wlan0" /etc/conf.d/wpa_supplicant ; then
-	sed -i 's/-Dnl80211,wext/-Dnl80211,wext -i wlan0/' /etc/conf.d/wpa_supplicant
-fi

device/testing/linux-postmarketos-qcom-apq8064/APKBUILD

@@ -1,47 +0,0 @@
-_flavor=postmarketos-qcom-apq8064
-pkgname=linux-$_flavor
-pkgver=5.10.98
-pkgrel=0
-_commit=217c7ff0a7127d28f024f75fd267752ca4180559
-arch="armv7"
-pkgdesc="Upstream unstable kernel with patches for APQ8064 devices"
-url="https://github.com/apq8064-mainline/linux/tree/qcom-apq8064-next"
-makedepends="bison flex openssl-dev xz perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev"
-options="!strip !check !tracedeps pmb:cross-native"
-source="$pkgname-$pkgver.tar.gz::https://github.com/apq8064-mainline/linux/archive/$_commit.tar.gz
-	config-$_flavor.$arch
-	"
-license="GPL2"
-_abi_release=$pkgver
-_carch="arm"
-
-builddir="$srcdir/linux-$_commit"
-
-prepare() {
-	default_prepare
-	cp "$srcdir/config-$_flavor.$arch" .config
-	make ARCH="$_carch" CC="${CC:-gcc}" olddefconfig
-}
-
-build() {
-	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
-		CFLAGS_MODULE=-fno-pic
-}
-
-package() {
-	mkdir -p "$pkgdir"/boot
-	make zinstall modules_install dtbs_install \
-		ARCH="$_carch" \
-		INSTALL_PATH="$pkgdir"/boot \
-		INSTALL_MOD_PATH="$pkgdir" \
-		INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb
-
-	install -D "$builddir"/include/config/kernel.release \
-		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
-
-}
-sha512sums="
-fb936890126b702792c03ec09da633801c25d4b3b9df010dc0171a8fa940137db88bfb19712e49a13b9cf16f9f4a54d0f4eb766a2fec76ff021a51480692200b  linux-postmarketos-qcom-apq8064-5.10.98.tar.gz
-e34250862fb5e5a0fedcd895109ce03aba965fdd2acdb221ca083d2856c67ae8ffec0266d1924abb10315c27c986af425a80db98a5cabb1ab72c34c5abbe211d  config-postmarketos-qcom-apq8064.armv7"

device/testing/linux-samsung-manta/01-fix-video-argb-setting.patch

@@ -1,18 +0,0 @@
-diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
-index ac028c53f..61ef8915f 100644
---- a/drivers/video/s3c-fb.c
-+++ b/drivers/video/s3c-fb.c
-@@ -508,11 +508,11 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
- 	case 24:
- 		/* our 24bpp is unpacked, so 32bpp */
- 		var->bits_per_pixel	= 32;
--		var->red.offset		= 16;
-+		var->red.offset		= 0;
- 		var->red.length		= 8;
- 		var->green.offset	= 8;
- 		var->green.length	= 8;
--		var->blue.offset	= 0;
-+		var->blue.offset	= 16;
- 		var->blue.length	= 8;
- 		break;
- 

device/testing/linux-samsung-manta/APKBUILD

@@ -2,7 +2,7 @@
 
 pkgname=linux-samsung-manta
 pkgver=3.4.113
-pkgrel=7
+pkgrel=6
 pkgdesc="Google Nexus 10 kernel fork"
 arch="armv7"
 _carch="arm"
@@ -10,21 +10,25 @@ _flavor="samsung-manta"
 url="https://github.com/LineageOS/android_kernel_samsung_manta"
 license="GPL2"
 options="!strip !check !tracedeps pmb:cross-native"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev gcc6"
+
+# Compiler: this kernel was only tested with GCC6. Feel free to make a merge
+# request if you find out that it is booting working with newer GCCs as
+# well. See <https://postmarketos.org/vendorkernel> for instructions.
+if [ "${CC:0:5}" != "gcc6-" ]; then
+	CC="gcc6-$CC"
+	HOSTCC="gcc6-gcc"
+	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
+fi
 
 # Source
 _repository="android_kernel_samsung_manta"
-_commit="2eb797e4d1338dcf963a762491790484a5dd0612"
+_commit="21157195150c268c19303513e4e1327dc01ff89e"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
 	$_config
-	gcc7-give-up-on-ilog2-const-optimizations.patch
-	gcc8-fix-put-user.patch
-	gcc10-extern_YYLOC_global_declaration.patch
-	01-fix-video-argb-setting.patch
 "
-
 builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
@@ -36,26 +40,11 @@ build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-	make ARCH="$_carch" CC="${CC:-gcc}" CFLAGS_MODULE="-fno-pic" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" modules
 }
 
 package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
-
-	# Modules
-	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
-		INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 \
-		modules_install
 }
 
-sha512sums="
-36a60bd023016adf6c1e579293d69e03cca6d0eb1efbb62ee698af72f2d19b3cd2e60941965a56702d325dede99481a1f4e09e6644016005bc27798153d48455  linux-samsung-manta-2eb797e4d1338dcf963a762491790484a5dd0612.tar.gz
-3699b8d1b3ced3cbdfe0bab45da0a22ce6f9cbefb72c9c037207b21ed7f2ca5604a80b16cbbe2e2249ff46775a800bad1fab2502275ff5fca22ad6ae80e6e180  config-samsung-manta.armv7
-77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
-197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
-8e91e309fe55c5ef4610d3ce3ec3f08b9570275bd6f8029a1c4098abce9edf25cc89d5fc2e9d1a7f336463fb6583852466bac7c08b79c411e0f0f0a9105f4ecc  01-fix-video-argb-setting.patch
-"
+sha512sums="11f8c197810438082bb103be9f26857e7ec1e1e49a1a8aca3bade12332ed1def62142b58219f4d17d07f0ab076708bef6c709312b784ab1c5339aa2e9db0232f  linux-samsung-manta-21157195150c268c19303513e4e1327dc01ff89e.tar.gz
+903b8cbb7090197b1d203350cb0590e158081719a4b50807c60bc89d25bdfce768adc6097891946be4f5574fc17bb94847f9531a9218d05c32f6ae19457816a1  config-samsung-manta.armv7"

device/testing/linux-samsung-manta/config-samsung-manta.armv7

@@ -103,12 +103,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 # CONFIG_BLK_CGROUP is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-CONFIG_USER_NS=y
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
+# CONFIG_NAMESPACES is not set
 # CONFIG_SCHED_AUTOGROUP is not set
 CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -161,7 +156,6 @@ CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
 # CONFIG_OPROFILE is not set
 CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
 # CONFIG_JUMP_LABEL is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -187,11 +181,7 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-# CONFIG_MODULE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULES is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
@@ -1008,7 +998,6 @@ CONFIG_XPS=y
 # CONFIG_NETPRIO_CGROUP is not set
 CONFIG_BQL=y
 CONFIG_HAVE_BPF_JIT=y
-# CONFIG_BPF_JIT is not set
 
 #
 # Network testing
@@ -1199,7 +1188,6 @@ CONFIG_CHR_DEV_SG=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1315,8 +1303,8 @@ CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_ATH_COMMON is not set
 CONFIG_BCMDHD=y
 # CONFIG_BCM4339 is not set
-CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/brcm/brcmfmac43241b0-sdio.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/postmarketos/brcm/brcmfmac43241b0-sdio.samsung,manta.txt"
+CONFIG_BCMDHD_FW_PATH="/system/vendor/firmware/fw_bcmdhd.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal"
 # CONFIG_DHD_USE_STATIC_BUF is not set
 CONFIG_DHD_USE_SCHED_SCAN=y
 # CONFIG_BRCMFMAC is not set
@@ -1413,7 +1401,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=y
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
@@ -1572,7 +1560,6 @@ CONFIG_I2C_S3C2410=y
 #
 # Other I2C/SMBus bus drivers
 #
-# CONFIG_I2C_STUB is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -1817,7 +1804,6 @@ CONFIG_VIDEO_MEDIA=y
 # Multimedia drivers
 #
 # CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_ATTACH is not set
 CONFIG_MEDIA_TUNER=y
 CONFIG_MEDIA_TUNER_CUSTOMISE=y
 
@@ -2032,7 +2018,8 @@ CONFIG_VIDEO_EXYNOS_GSCALER=y
 CONFIG_VIDEO_EXYNOS_JPEG=y
 CONFIG_VIDEO_EXYNOS_FIMG2D=y
 # CONFIG_VIDEO_FIMG2D_DEBUG is not set
-# CONFIG_VIDEO_EXYNOS_MFC is not set
+CONFIG_EXYNOS_MFC_V6=y
+CONFIG_VIDEO_EXYNOS_MFC=y
 
 #
 # Exynos TV support
@@ -2695,14 +2682,12 @@ CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
 # CONFIG_ASUS_OLED is not set
-# CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
 # CONFIG_RTS5139 is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_USB_SERIAL_QUATECH2 is not set
 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
-# CONFIG_VT6656 is not set
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_SW_RING is not set
@@ -2846,7 +2831,6 @@ CONFIG_ZRAM=y
 # CONFIG_ZRAM_DEBUG is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_FB_SM7XX is not set
-# CONFIG_USB_ENESTORAGE is not set
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_FT1000 is not set
 
@@ -3246,7 +3230,6 @@ CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_CRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_TEST is not set
 
 #
 # Authenticated Encryption with Associated Data

device/testing/linux-samsung-manta/gcc10-extern_YYLOC_global_declaration.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch

device/testing/linux-samsung-manta/gcc7-give-up-on-ilog2-const-optimizations.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/gcc7-give-up-on-ilog2-const-optimizations.patch

device/testing/linux-samsung-manta/gcc8-fix-put-user.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/gcc8-fix-put-user.patch

main/devicepkg-dev/APKBUILD

@@ -1,5 +1,5 @@
 pkgname=devicepkg-dev
-pkgver=0.13.2
+pkgver=0.13.1
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -62,7 +62,7 @@ package() {
 }
 sha512sums="
 d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
-77dcc7bc4f90bc11f99b7bb88be171f706f7d92921b694ce862d31ab858a4b8850c9e0bdb68299ffce9f934a3c8ab16eb307fd09534085e65f0101334bd68a9d  devicepkg_build.sh
+93e6e8b144ed703d05bcf98d8bf1035743a20e8b51b992674cd15b482dc9a977e9c96f1a276653814d1dd77e4f96502b093a731f4ea625d49f8e8b38420bdb27  devicepkg_build.sh
 74c1b9b265a943604d5d538ca66d4b7bcad9adcf40710ab19d795b55aac39669bf1089f7f0ec81aa7a01b537784bef4310e4acc3d7a6ba1f282ab01652bdc4d4  devicepkg_package.sh
 53aa129da5bd52376271bbd37ed7205f2dac971d442c5085260ed1c4a9b014a656cbe28ea45d242be60a2d0f8851611f3b8352c880c017995cda6ae093e5d324  downstreamkernel_prepare.sh
 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe  downstreamkernel_package.sh

main/devicepkg-dev/devicepkg_build.sh

@@ -23,7 +23,7 @@ fi
 # Create splash screens
 generate_splash_screens()
 {
-	splash_config=${SPLASH_CONFIG:-/etc/postmarketos/splash.ini}
+	splash_config="/etc/postmarketos/splash.ini"
 	splash_width=${deviceinfo_screen_width:-720}
 	splash_height=${deviceinfo_screen_height:-1280}
 

main/postmarketos-base-ui/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-base-ui
-pkgver=5
-pkgrel=0
+pkgver=4
+pkgrel=3
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -37,7 +37,6 @@ replaces_priority=100  # leave plenty for alpine
 
 _source644="
 	etc/NetworkManager/conf.d/hostname-mode.conf
-	etc/NetworkManager/conf.d/dns-priority.conf
 	etc/chrony/chrony.conf
 	etc/conf.d/tinydm
 	etc/conf.d/wpa_supplicant
@@ -124,7 +123,6 @@ networkmanager() {
 
 sha512sums="
 3c9ae7415f4891bee8595166ed6a42cb577a837f741c6b5409d193558626348b41516888a01d0c4895282c5f4e9a1ff838c19712888750b2ef68429bb4b42ee3  rootfs-etc-NetworkManager-conf.d-hostname-mode.conf
-2418262c4e9f7459515eec4ba66b2153254814e868dc31605f04c72fec108769f350b5838dc8ec273edaea798a411d0a92be5bd31f7839debd81b6f11cc47193  rootfs-etc-NetworkManager-conf.d-dns-priority.conf
 e5d049db1d82c510bab9246208b51b8ec2711d008d67792fc10d4c0b65ed4dece7b5ae3c3dd28a8539d177b6849c1f921cb9fef3d2c7bee0355451f7b4757ec6  rootfs-etc-chrony-chrony.conf
 44e4283c6f77de83915977dd3bc2d8e2d96b3ed6cc68d3cc156304359ae649b5a8b0bac843e517ec6faa2066dd43ba85e313899b1eda04862f864fb9eb508aa0  rootfs-etc-conf.d-tinydm
 fe0651904c1f40ffa67d83daca190af199f63247e53642a59a1e1147cd06776fcf20b7b2fcc5373783d50b8bd6ce8d1354c8e5f4d582d319727b9ceefd1e8e16  rootfs-etc-conf.d-wpa_supplicant

main/postmarketos-base-ui/rootfs-etc-NetworkManager-conf.d-dns-priority.conf

@@ -1,18 +0,0 @@
-# Set DNS to *only* nameservers from wifi or ethernet if they are connected,
-# ignoring gsm/wwan.
-# A negative priority causes NM to only list nameservers for the connection.
-# also see: https://gitlab.com/postmarketOS/pmaports/-/issues/1430
-
-[connection-preferred]
-match-device=type:wifi,type:ethernet
-ipv4.route-metric=-10
-ipv4.dns-priority=-10
-ipv6.route-metric=-10
-ipv6.dns-priority=-10
-
-[connection-wwan]
-match-device=type:gsm
-ipv4.route-metric=100
-ipv4.dns-priority=100
-ipv6.route-metric=100
-ipv6.dns-priority=100

main/postmarketos-base/APKBUILD

@@ -1,5 +1,5 @@
 pkgname=postmarketos-base
-pkgver=18
+pkgver=17
 pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
@@ -41,7 +41,6 @@ _source644="
 	etc/issue
 	etc/motd
 	etc/os-release
-	etc/sysctl.d/disable-rp-filter.conf
 	lib/udev/rules.d/20-tm2-touchkey-leds.rules
 	lib/udev/rules.d/50-firmware.rules
 	lib/udev/rules.d/95-rt5033-battery-refresh.rules
@@ -110,7 +109,6 @@ e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67
 45bd0742a64a9d3c4a88e152b97edcf3fa1edca28884f9ea69e7c4c365f1e41ef9056dbe204545de7d4b2ba92e1e5872b2a929c2dcc1dd468e627cc3f090b8e6  rootfs-etc-issue
 01403df3b5a2be0dd70387a3c32cf24a77bc097679fbefca585082a0970b7d756723c33687be3809351b5e31c85947db84861118bfeced8f5f865fe2452555ec  rootfs-etc-motd
 093c201f0c7aa203df447f2a8c27e5834520a7016ce2934ddc35fb037d2ec9acf0f7df7c06e07ad24ba7b4d94ef21fe7ff848c58bd62277eeeb08659fbddf1e9  rootfs-etc-os-release
-b70ee1b39b5f33c9a3e6bf4259158519691c82c8cefb700d4df49eb749a2cce208082e00d4905b9eea2c4f75b6da62f73931931c92157b4132adb35dcf0e0a6f  rootfs-etc-sysctl.d-disable-rp-filter.conf
 de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b15d7e18c4b40c3b19db387ee050a3baf03c4bd4293f4721e3  rootfs-lib-udev-rules.d-20-tm2-touchkey-leds.rules
 0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d  rootfs-lib-udev-rules.d-50-firmware.rules
 766aace60f7aea2515e03aec9f6d3215fcabcd81a235acb7b79bac1ae44e75c3087c541370fe1565a05a78f70a071fe20380b91e23e1fb48390b9df19354d008  rootfs-lib-udev-rules.d-95-rt5033-battery-refresh.rules

main/postmarketos-base/rootfs-etc-sysctl.d-disable-rp-filter.conf

@@ -1,5 +0,0 @@
-# Resolves issues with some services (e.g. MMS) that can expect return traffic
-# on the non-default route/iface.
-
-net.ipv4.conf.default.rp_filter=0
-net.ipv4.conf.all.rp_filter=0

main/postmarketos-ondev/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-ondev
 pkgver=0.7.4
-pkgrel=1
+pkgrel=0
 pkgdesc="Calamares based on-device installer"
 url="https://postmarketos.org"
 # armhf blocked by qt5-qtdeclarative
@@ -24,7 +24,6 @@ depends="
 	haveged-openrc
 	i3wm
 	kirigami2
-	losetup
 	mesa-egl
 	qt5-qtvirtualkeyboard
 	qtvirtualkeyboard-plasma

main/postmarketos-ui-gnome/APKBUILD

@@ -20,7 +20,7 @@ depends="
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="000-gschema.override"
-options="!check pmb:gpu-accel"
+options="!check"
 
 package() {
 	install -Dm644 "$srcdir"/000-gschema.override \

main/postmarketos-ui-phosh/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-phosh
-pkgver=16
-pkgrel=0
+pkgver=15
+pkgrel=1
 pkgdesc="(Wayland) Mobile UI developed for the Librem 5"
 url="https://puri.sm"
 arch="noarch !armhf"
@@ -109,7 +109,7 @@ d321d2829da80a61a084b6b2e8ca7d9148fcf2bdf9b160213451de0f8be28aab5172377ba7e94465
 b9fed11dfd51cb54f9523376c965a952c1785c369a8e747868609dcb14787f260d994cb8a60a033a0ad2aa0991eb985dff158850d0f6ff48410f5ae7b789fc36  03-favorites
 e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742eee51d93dc83859a7ead553f4dcbc8b6fcefa33ae344ba178  dconf-profile-postmarketos
 5a450658f94e5064ff233ec0dd1fcc42334d599b07bcc7cf281f73e593f5188c1a23cec0246f28bfb19c70fe4c29709dd4bdc72a7593b79ccaca9f34af37e3d6  firefox.desktop
-253560b28bcb3d7908e07a7656bb1f5dab8d709c0a2e789c461d8d99dadb86f95203d6c66741197eaaa4c62eda52997736da618fc63ef1b9dcc79e4eaa635443  mimeapps.list
+0a376140da36538fd73cbd8305ff97b54d2b82831bab64a3b7167019f1d005752eda4e81ef7c19fd64fcba3a775c9e87fca1a250b55a522a0ee9728ab712f089  mimeapps.list
 4113ef59267e88d205ef1e1aec0ed11ccf817a25c232f2006a538b56fb466fad5025ad445d109e367ca92ee98d9b25f1f9a1a4b9bae2cb80df12a3739d62d10a  osk.sh
 bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1  phosh-qt-mobile-controls.sh
 6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6  phosh-qt-wayland.sh

main/postmarketos-ui-phosh/mimeapps.list

@@ -32,6 +32,3 @@ image/svg+xml=org.gnome.eog.desktop
 image/svg+xml-compressed=org.gnome.eog.desktop
 image/vnd.wap.wbmp=org.gnome.eog.desktop
 image/x-icns=org.gnome.eog.desktop
-
-x-scheme-handler/tel=org.gnome.Calls.desktop
-x-scheme-handler/sms=sm.puri.Chatty.desktop

main/postmarketos-ui-plasma-mobile/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-mobile
-pkgver=3.6
-pkgrel=0
+pkgver=3.4
+pkgrel=1
 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration, allows only numeric passwords!)"
 url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
 arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807
@@ -19,7 +19,7 @@ depends="
 	kwallet-pam
 	kwayland-integration
 	modemmanager
-	plasma-mobile
+	plasma-phone-components
 	polkit-kde-agent-1
 	postmarketos-base-ui
 	powerdevil
@@ -66,37 +66,30 @@ source="
 	000-gschema.override
 	gtk-app-wayland.sh
 	kdeglobals
-	kdewallet.kwl
-	kdewallet.salt
-	kscreenlockerrc
 	kwinrc
 	maliit-plasmamobile.json
 	qtlogging.ini
 	unlock-plasma
+	kdewallet.kwl
+	kdewallet.salt
 	"
 subpackages="$pkgname-extras"
 options="!check pmb:gpu-accel"
 
 package() {
-	install -Dm644 \
-		"$srcdir"/kwinrc \
+	install -Dm644 "$srcdir"/kwinrc \
 		-t "$pkgdir"/etc/xdg/
 
-	install -Dm644 \
-		"$srcdir"/kdeglobals \
-		"$srcdir"/kscreenlockerrc \
-		-t "$pkgdir"/etc/xdg
+	install -Dm644 "$srcdir"/kdeglobals \
+		-t "$pkgdir"/etc/xdg/
 
-	install -Dm644 \
-		"$srcdir"/qtlogging.ini \
+	install -Dm644 "$srcdir"/qtlogging.ini \
 		-t "$pkgdir"/etc/xdg/QtProject/
 
-	install -Dm755 \
-		"$srcdir"/unlock-plasma \
+	install -Dm755 "$srcdir"/unlock-plasma \
 		-t "$pkgdir"/usr/bin/
 
-	install -Dm755 \
-		"$srcdir"/gtk-app-wayland.sh \
+	install -Dm755 "$srcdir"/gtk-app-wayland.sh \
 		-t "$pkgdir"/etc/profile.d/
 
 	install -Dm644 "$srcdir"/000-gschema.override \
@@ -134,15 +127,12 @@ extras() {
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="
-591529f147f161f5e97c979a9ad4b9f3a65e6d3b87a7bdbd020ec928155cfe5fd561cae6582c4b2831b452fe9b0a03168731771b77020fb66e09f81552ba421e  000-gschema.override
+sha512sums="591529f147f161f5e97c979a9ad4b9f3a65e6d3b87a7bdbd020ec928155cfe5fd561cae6582c4b2831b452fe9b0a03168731771b77020fb66e09f81552ba421e  000-gschema.override
 57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179  gtk-app-wayland.sh
-54d197a1e29b9e6cfea50b6ad9728639c5e8951519fd70f066acaff92c94126c88657a104851046a2af955d830fd7831a42adde7f193793a933cead6be18c9aa  kdeglobals
-923309f71ee0840ae49d610ab5c11260432f462709eee7148ee5a4703872b9926a3267b16b524162c1560e0798c63fe392a161a57be5c6000bbb1e3f0c947e25  kdewallet.kwl
-f3fdaaaf13e985166b86158d5a60098aa45195ea078a4cab7fbf12d3aa428000af3e46ec011dbdc38a4c00faeac5f9a3b5bc2765a6afdd0f1ee58616e31e7429  kdewallet.salt
-20cdb856fb46b024d8368d469e9e0a9c45724fb6f27514edca9b733ea84b63644b6d0328780879285b4e649f7a02ea8761f6b607e127fb7b055b753bfd3ee3d2  kscreenlockerrc
+93d6c3e76b6e8d3c8c5424fcb921595ad3569e1aba1b03255b977230b33146dc73a97327e455e8a539018cb02c3bf1a700dd951622f798b50f36c5d381a1b342  kdeglobals
 4ae28ff92e2ae2f78cc4841249941ad02b1ed0447a5be2e7c6d9080fa47e22471ade584a328deb3a1cb22e1a5d7a81f961b9d92fbc9103a092dfeabf2c1ba45c  kwinrc
 70ee87860842057b557a433a9ae7d54653f076a612b3d9de2d413d598806d23ec19390262eaa398cddf39437f1213d14922402a8d978878e5e98f3767ce0b9eb  maliit-plasmamobile.json
 341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb  qtlogging.ini
 e5dcc82c0e58288fd7a8f805e60fa777fab71c68355f085a0e4f25b05526491476fdb6decbc7c0495626d6736a53bfc8e8f34a3231210858998e19cd6fbc89a0  unlock-plasma
-"
+923309f71ee0840ae49d610ab5c11260432f462709eee7148ee5a4703872b9926a3267b16b524162c1560e0798c63fe392a161a57be5c6000bbb1e3f0c947e25  kdewallet.kwl
+f3fdaaaf13e985166b86158d5a60098aa45195ea078a4cab7fbf12d3aa428000af3e46ec011dbdc38a4c00faeac5f9a3b5bc2765a6afdd0f1ee58616e31e7429  kdewallet.salt"

main/postmarketos-ui-plasma-mobile/kdeglobals

@@ -1,5 +1,5 @@
 [KDE]
-StartDragDist=10
+StartDragDist=40
 LookAndFeelPackage=org.kde.plasma.phone
 
 [Icons]

main/postmarketos-ui-plasma-mobile/kscreenlockerrc

@@ -1,2 +0,0 @@
-[Daemon]
-LockOnStart=true

main/postmarketos-ui-weston/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-weston
 pkgver=5
-pkgrel=5
+pkgrel=4
 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)"
 url="https://postmarketos.org"
 arch="noarch"
@@ -17,6 +17,7 @@ depends="
 	weston-clients
 	weston
 	weston-shell-desktop
+	weston-backend-fbdev
 	weston-backend-drm
 	xorg-server
 	"

main/postmarketos-ui-xfce4/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-xfce4
 pkgver=0.5.0
-pkgrel=1
+pkgrel=0
 pkgdesc="(X11) Lightweight desktop (stylus recommended)"
 url="https://gitlab.com/postmarketOS/xfce4-phone"
 arch="noarch"
@@ -62,10 +62,6 @@ package() {
 
 	install -Dm644 "$srcdir"/onboard-autostart.desktop \
 		"$pkgdir"/etc/skel/.config/autostart/onboard-autostart.desktop
-
-	# Issue pmaports#1418, can be removed after v21.12 became unsupported
-	mkdir -p "$pkgdir"/usr/share/icons/postmarketOS
-	ln -s /usr/share/pixmaps/postmarketos-logo.svg "$pkgdir"/usr/share/icons/postmarketOS/logo.svg
 }
 
 sha512sums="

temp/alsa-plugins/APKBUILD

@@ -0,0 +1,111 @@
+# Forked from Alpine aports, latest alsa-* breaks audio on devices
+pkgname=alsa-plugins
+pkgver=9999
+_pkgver=1.2.5
+pkgrel=0
+pkgdesc="Advanced Linux Sound Architecture (ALSA) plugins"
+url="https://alsa-project.org/"
+arch="all"
+license="GPL-2.0-or-later LGPL-2.1-or-later"
+makedepends="
+	alsa-lib-dev
+	ffmpeg-dev
+	jack-dev
+	libsamplerate-dev
+	linux-headers
+	pulseaudio-dev
+	speex-dev
+	"
+subpackages="
+	$pkgname-doc
+	$pkgname-pulse
+	$pkgname-lavrate
+	$pkgname-a52
+	$pkgname-jack
+	"
+source="https://alsa-project.org/files/pub/plugins/alsa-plugins-$_pkgver.tar.bz2"
+builddir="$srcdir/$pkgname-$_pkgver"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+doc() {
+	default_doc
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
+	cat > "$subpkgdir"/usr/share/doc/$pkgname/README.alpine <<EOF
+	==> please note that alsa-plugins-lavcrate has been renamed to lavrate.
+	==> So you need to run: apk add alsa-plugins-lavrate
+EOF
+}
+
+lavrate() {
+	pkgdesc="FFmpeg samplerate conversion plugins for alsa"
+	_mv_lib ./*lavrate*
+	_mv_conf 10-rate-lav.conf
+}
+
+pulse() {
+	pkgdesc="Pulseaudio support plugins for alsa-only applications"
+	# pipewire provides pulseaudio-alsa; when pipewire is used,
+	# alsa-plugins-pulse is not needed.
+	install_if="alsa-lib pulseaudio-alsa !pipewire"
+
+	_mv_lib ./*pulse.so
+	_mv_conf ./*pulseaudio*
+	mv "$subpkgdir"/etc/alsa/conf.d/99-pulseaudio-default.conf.example \
+		"$subpkgdir"/etc/alsa/conf.d/99-pulseaudio-default.conf
+}
+
+a52() {
+	pkgdesc="Converts S16 linear sound format to A52 compressed format and sends it to an SPDIF output"
+	_mv_lib ./*a52.so
+	_mv_conf 60-a52-encoder.conf
+}
+
+jack() {
+	pkgdesc="Allows native ALSA applications to work with jackd"
+	_mv_lib ./*jack.so
+	_mv_conf 50-jack.conf
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find $pkgdir -name "*.la" -type f -exec rm -f {} \;
+}
+
+_mv_lib() {
+	mkdir -p "$subpkgdir"/usr/lib/alsa-lib/
+
+	for i in "$@"; do
+	mv "$pkgdir"/usr/lib/alsa-lib/$i \
+		"$subpkgdir"/usr/lib/alsa-lib/
+	done
+}
+
+_mv_conf() {
+	mkdir -p "$subpkgdir"/etc/alsa/conf.d/ \
+		"$subpkgdir"/usr/share/alsa/alsa.conf.d
+
+	for i in "$@"; do
+	mv "$pkgdir"/usr/share/alsa/alsa.conf.d/$i \
+		"$subpkgdir"/usr/share/alsa/alsa.conf.d/
+	mv "$pkgdir"/etc/alsa/conf.d/$i \
+		"$subpkgdir"/etc/alsa/conf.d/
+	done
+}
+
+sha512sums="
+32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf  alsa-plugins-1.2.5.tar.bz2
+"

temp/alsa-utils/APKBUILD

@@ -0,0 +1,49 @@
+# Forked from Alpine aports, latest alsa-* breaks audio on devices
+pkgname=alsa-utils
+pkgver=9999
+_pkgver=1.2.5
+pkgrel=0
+pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities"
+url="https://alsa-project.org/"
+arch="all"
+options="!check"  # No test suite, applets use ncurses / don't have --version
+license="GPL-2.0-or-later"
+makedepends="alsa-lib-dev fftw-dev ncurses-dev pciutils-dev xmlto"
+depends="dialog"
+subpackages="$pkgname-dbg alsaconf::noarch $pkgname-doc $pkgname-openrc"
+source="https://alsa-project.org/files/pub/utils/alsa-utils-$_pkgver.tar.bz2
+	alsaconf.patch
+	alsa.initd
+	alsa.confd
+	"
+builddir="$srcdir/$pkgname-$_pkgver"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-nls
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	install -D -m755 ../alsa.initd "$pkgdir"/etc/init.d/alsa
+	install -D -m644 ../alsa.confd "$pkgdir"/etc/conf.d/alsa
+}
+
+alsaconf() {
+	depends="alsa-utils bash"
+	cd "$builddir"
+	mkdir -p "$subpkgdir"/usr/sbin
+	mv "$pkgdir"/usr/sbin/alsaconf \
+		"$subpkgdir"/usr/sbin
+}
+
+sha512sums="
+0e319e553c9c209a46f5c83c50007bd82acf1c9cf78649978b3ab6fbb4349f51c1c7c6a975a8c24d25ba07ad5325e74d2c34dc5c89180998a0f63d1326fde8b1  alsa-utils-1.2.5.tar.bz2
+f04155e1e391c7f36d44422c8e769bf9370117f6bbea6c0664e9858f7a676cc958e4260e4b4d226e71d0716f6be4e6fdd60f1d07cb7e9922fff378ceec01c47d  alsaconf.patch
+c66959a4a1a24a727c9c91a455caa5fa093c523d17a563b56ec2449a02ff30c83683db555006954b1fe571446cf4a117cc41de8c8b869a6e875d386595b3cc1f  alsa.initd
+d7e212e9f624b09168117b46c66289204a23915adf0d1b0c9ae258049430397b8f2d86d3b5f7e3087151948a031c4eab863e8195a6c7b1276704e9cba9c2d2a7  alsa.confd
+"

temp/alsa-utils/alsa.confd

@@ -0,0 +1,20 @@
+# RESTORE_ON_START:
+# Do you want to restore your mixer settings?  If not, your cards will be
+# muted.
+# no - Do not restore state
+# yes - Restore state
+
+RESTORE_ON_START="yes"
+
+# SAVE_ON_STOP:
+# Do you want to save changes made to your mixer volumes when alsasound
+# stops?
+# no - Do not save state
+# yes - Save state
+
+SAVE_ON_STOP="yes"
+
+# Additional options which should be passed to alsactl. Most notably,
+# if you get "UCM is not supported" messages on startup, you can pass
+# --no-ucm here.
+#alsactl_opts="--no-ucm"

temp/alsa-utils/alsa.initd

@@ -0,0 +1,90 @@
+#!/sbin/openrc-run
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r6,v 1.1 2014/06/23 21:34:42 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Save/Restore Sound Card State"
+
+alsastatedir=/var/lib/alsa
+alsascrdir=/etc/alsa.d
+alsahomedir=/var/run/alsasound
+
+extra_commands="save restore"
+
+depend() {
+	need localmount
+	after bootmisc modules isapnp coldplug hotplug
+}
+
+restore() {
+	ebegin "Restoring Mixer Levels"
+
+	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
+
+	if [ ! -r "${alsastatedir}/asound.state" ] ; then
+		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
+		eend 0
+		return 0
+	fi
+
+	local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
+	local CARDNUM
+	for cardnum in ${cards}; do
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		alsactl ${alsactl_opts} -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
+			|| ewarn "Errors while restoring defaults, ignoring"
+	done
+
+	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
+		[ -e "${ossfile}" ] || continue
+		# We use cat because I'm not sure if cp works properly on /proc
+		local procfile="${ossfile##${alsastatedir}/oss}"
+		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
+		if [ -e /proc/asound/"${procfile}"/oss ] ; then
+		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss
+		fi
+	done
+
+	eend 0
+}
+
+save() {
+	ebegin "Storing ALSA Mixer Levels"
+
+	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
+
+	mkdir -p "${alsastatedir}"
+	if ! alsactl ${alsactl_opts} -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
+		eerror "Error saving levels."
+		eend 1
+		return 1
+	fi
+
+	for ossfile in /proc/asound/card*/pcm*/oss; do
+		[ -e "${ossfile}" ] || continue
+		local device="${ossfile##/proc/asound/}" ; device="${device%%/oss}"
+		device="$(echo "${device}" | sed -e 's,/,_,g')"
+		mkdir -p "${alsastatedir}/oss/"
+		cp "${ossfile}" "${alsastatedir}/oss/${device}"
+	done
+
+	eend 0
+}
+
+start() {
+	if [ "${RESTORE_ON_START}" = "yes" ]; then
+		restore
+	fi
+
+	return 0
+}
+
+stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ]; then
+		save
+	fi
+	return 0
+}

temp/alsa-utils/alsaconf.patch

@@ -0,0 +1,12 @@
+diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsaconf/alsaconf.in
+--- alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in	2005-03-24 00:24:52.000000000 -0800
++++ alsa-utils-1.0.9a/alsaconf/alsaconf.in	2005-07-18 09:25:02.000000000 -0700
+@@ -65,6 +58,8 @@
+   distribution="redhat"
+ elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then
+   distribution="fedora"
++elif test -f /etc/alpine-release; then
++  distribution="alpine"
+ elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then
+   distribution="slackware"
+ else

temp/dino/APKBUILD

@@ -1,9 +1,9 @@
 # Forked from Alpine Linux
 pkgname=dino
-pkgver=9999_git20211230
-pkgrel=0
+pkgver=9999_git20210616
+pkgrel=2
 # feature/handy branch
-_commit="c848191a034a920266687002045abc5e1f42b070"
+_commit="202d85779241e2088533d88a542bc5d0acfbe9ec"
 pkgdesc="Modern Jabber/XMPP client"
 url="https://dino.im"
 arch="all"
@@ -55,6 +55,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 sha512sums="
-1157c2221b0b127b151b79d6a5b1dd0a4141b9022cd148e2e347be026af950744d8a1030bb02ff27c3410653e3f18b30a5d2659fe2b24620e64004e95343e31d  c848191a034a920266687002045abc5e1f42b070.tar.gz
+1ce2b6c98a38be3736c3832396d12ef7b378b124e6bd8a3a1f12a64f80ba6142cca0c7086449cb3746c39eee0f3875c22eaff167d53842baf0dbf6fffea22db4  202d85779241e2088533d88a542bc5d0acfbe9ec.tar.gz
 838ccba8d97db8bc43de26afd259e4bdaf3afea786bf40a7ed9ae63f4fb7c2190e8bf6de7b41880602113df87831d01467547f8bfd1f88b50d35287822cb5f4c  bump-signal-version.patch
 "

temp/megapixels-purism/10_megapixels.sudoers

@@ -0,0 +1,3 @@
+# HACK for the Librem 5 until focus is supported properly
+# https://source.puri.sm/Librem5/linux-next/-/issues/280
+%wheel    ALL=(root)       NOPASSWD: /usr/sbin/i2ctransfer -f -y 3 w2@0xc *

temp/megapixels-purism/APKBUILD

@@ -1,32 +1,27 @@
 # Purism's fork of megapixels, for the Librem 5
 pkgname=megapixels-purism
-pkgver=0.18.0_git20220131
+pkgver=0.16.0
 pkgrel=0
-_commit=042310be520e021ebf861055af90923164d89136
+_purismrel=3
+# <ver>.<purism kernel release>
+_purismver=${pkgver}-1pureos$_purismrel
 pkgdesc="GTK+3 camera app for mobile devices"
 url="https://source.puri.sm/Librem5/megapixels"
 arch="all"
 license="GPL-3.0-only"
 # Required by postprocess.sh
 # depends="cmd:dcraw_emu cmd:convert cmd:exiftool"
-depends="
-	exiftool
-	graphicsmagick
-	libraw-tools
-	v4l-utils
-	"
-makedepends="
-	glib-dev
-	gtk+3.0-dev
-	libbsd-dev
-	libcamera-dev
-	rust
-	tiff-dev meson zbar-dev
-	"
-source="megapixels-purism-$pkgver.tar.gz::https://source.puri.sm/Librem5/millipixels/-/archive/$_commit/millipixels-$_commit.tar.gz"
+depends="libraw-tools graphicsmagick exiftool i2c-tools"
+makedepends="glib-dev gtk+3.0-dev tiff-dev meson zbar-dev"
+source="
+	$pkgname-$_purismver.tar.gz::https://source.puri.sm/Librem5/debs/megapixels/-/archive/pureos/$_purismver/megapixels-pureos-$_purismver.tar.gz
+	0001-l5-changes.patch::https://source.puri.sm/Librem5/debs/megapixels/-/raw/pureos/0.16.0-1pureos3/debian/patches/0001-l5-changes.diff
+	https://source.puri.sm/Librem5/debs/megapixels/-/raw/pureos/0.16.0-1pureos3/debian/patches/0002-l5-changes-ab5c75d.patch
+	10_megapixels.sudoers
+"
 options="!check" # There's no testsuite
+builddir="$srcdir/megapixels-pureos-$_purismver"
 provides="megapixels=$pkgver"
-builddir="$srcdir/millipixels-$_commit"
 
 build() {
 	abuild-meson . output
@@ -35,8 +30,12 @@ build() {
 
 package() {
 	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+	install -Dm644 "$srcdir"/10_megapixels.sudoers "$pkgdir"/etc/sudoers.d/10_megapixels
 }
 
 sha512sums="
-062607219856bfafddb063a743f643c8f0924a3a1f35af6beb2eee0db626766f680cc2204b3e58bc604bf26bd92b322e3f68227580b97da99b384f919c8450a7  megapixels-purism-0.18.0_git20220131.tar.gz
+19e0a940e73a7051afcdb515ca6a503bf5f025292c837dcd74447c38937f192257b395a33339d0c3bb842936b5069450e00cd51a81fd3d183a579ded0d42a0be  megapixels-purism-0.16.0-1pureos3.tar.gz
+633155fa87dc8739b987e7235bf6e1d07b750038336a3451162abc7de2700a1c89dbf41c6da4a1adfe474b35d9ffd02328fee247da8baac50746d933b0622b06  0001-l5-changes.patch
+c27206e8a823aaa8e8b86b6d1acb626ab80193a8bd2efa939a1cf67c5964a5d3cec1cd44f1d9b33dc4195735b23989267ead0050956b78131dda70cfe2bb7036  0002-l5-changes-ab5c75d.patch
+b7d8f25be0ae1f954c49727476952831019bcc443a66c4b39f7421c257aa5c310ad82390746768c3432727a0688a1174565cab5a48997092f79622cedb703cec  10_megapixels.sudoers
 "

temp/u-boot-quartz64/APKBUILD

@@ -0,0 +1,53 @@
+# U-boot built for rk3328
+
+pkgname=u-boot-quartz64
+pkgver=2022.01_git20220119
+_ref=88b081e461bba1610b2375a6592c6ce321655b77
+pkgrel=1
+pkgdesc="u-boot bootloader for the rk3568"
+url="https://gitlab.com/u-boot/u-boot"
+arch="aarch64"
+license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs
+	ISC LGPL-2.0-only LGPL-2.1-only X11"
+makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev"
+options="!check"
+source="
+	https://gitlab.com/pgwipeout/u-boot-quartz64/-/archive/$_ref/u-boot-quartz64-$_ref.tar.gz
+	rk3568_ddr_1560MHz_v1.11.bin::https://github.com/JeffyCN/rockchip_mirrors/blob/47404a141a1acb7555906b5e3b097b5f1045cc21/bin/rk35/rk3568_ddr_1560MHz_v1.11.bin?raw=true
+	rk3568_bl31_v1.28.elf::https://github.com/JeffyCN/rockchip_mirrors/blob/6186debcac95553f6b311cee10669e12c9c9963d/bin/rk35/rk3568_bl31_v1.28.elf?raw=true
+	fix-combined-var.patch
+	compressed-kernel.patch
+	update-u-boot
+	"
+builddir="$srcdir"/u-boot-quartz64-$_ref
+
+build() {
+	touch include/config.h
+	LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > include/timestamp_autogenerated.h
+	LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> include/timestamp_autogenerated.h
+
+	export BL31="$srcdir"/rk3568_bl31_v1.28.elf
+	export COMBINED_FILE="$srcdir"/rk3568_ddr_1560MHz_v1.11.bin
+	export BUILD_DIR="$builddir"/build
+	mkdir -p "$BUILD_DIR"
+	make O="$BUILD_DIR" HOSTCC=gcc ARCH=arm quartz64-a-rk3566_defconfig
+	make O="$BUILD_DIR" HOSTCC=gcc ARCH=arm all
+}
+
+package() {
+	install -D -m644 build/idbloader.img \
+		"$pkgdir"/usr/share/u-boot/pine64-quartz64/idbloader.img
+	install -D -m644 build/u-boot.itb \
+		"$pkgdir"/usr/share/u-boot/pine64-quartz64/u-boot.itb
+	install -D -m755 "$srcdir"/update-u-boot "$pkgdir"/usr/sbin/update-u-boot
+}
+
+
+sha512sums="
+24fcad63d9c6783188b5d564535a24c3feb257d286885f98ff3ea77dd104823220a277d38617bffc7466a3877f1970d9399d7ccf2fda199cf8b10929621266fe  u-boot-quartz64-88b081e461bba1610b2375a6592c6ce321655b77.tar.gz
+5d2e07af68c7e8cd92b087ddacdde53b4dee16052db089416d4e84da18a4ec0fe21331862654886e6aef0a07070a8982e32cf1755db4769937cfe4a691e80ff7  rk3568_ddr_1560MHz_v1.11.bin
+0460358578434ea683dbe84fe820d5d6e5350c99be4db376099b9bf15a05b45af25316eb08d6d3fe5752b721b51b487bb1f6e87d7f20614ffa3a61b542a034c8  rk3568_bl31_v1.28.elf
+604624759c091b8394be500e6ecd3e62f3732a5d6c7f9e1a2009cb0cd79268fd790a1f308bfce13e03d5f5b4417f5aaa941e748ae9f879685d8298c036f8b992  fix-combined-var.patch
+55ae82e328d8e8fa7c740b3cbd2ba890fb1f25fa44df9e98573b0599045683ce4eca698018c6da99b738b5f44e1d7dd462bd22b1f3c947ad0a982ec62b2fe984  compressed-kernel.patch
+5ffa497122f3fd23b0b1c055229d650895fd03ca415ba6fb6df2ba848023d523fc14caaaf13d5409cc4b03e73cb92493eac1d8952738376c46395de827cad509  update-u-boot
+"

temp/u-boot-quartz64/compressed-kernel.patch

@@ -0,0 +1,15 @@
+diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
+index 8dd1b03301..f3c4b02d81 100644
+--- a/include/configs/rk3568_common.h
++++ b/include/configs/rk3568_common.h
+@@ -38,7 +38,9 @@
+ 	"pxefile_addr_r=0x00e00000\0"	\
+ 	"fdt_addr_r=0x0a100000\0"	\
+ 	"kernel_addr_r=0x02080000\0"	\
+-	"ramdisk_addr_r=0x0a200000\0"
++	"ramdisk_addr_r=0x0a200000\0"	\
++	"kernel_comp_addr_r=0x20000000\0"\
++	"kernel_comp_size=0x2000000\0"
+ 
+ #include <config_distro_bootcmd.h>
+ #define CONFIG_EXTRA_ENV_SETTINGS		\

temp/u-boot-quartz64/fix-combined-var.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 5f681ca805..0cc6d5394d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1473,7 +1473,7 @@ idbloader.img: spl/u-boot-spl.bin FORCE
+ endif
+ else
+ MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T rksd
+-COMBINED_FILE = ram_init.bin
++COMBINED_FILE ?= ram_init.bin
+ idbloader.img: spl/u-boot-spl.bin FORCE
+ 	$(call if_changed,mkimage_combined)
+ endif

temp/u-boot-quartz64/kernel_comp-defaults.patch

@@ -0,0 +1,23 @@
+commit 6a02ed22f5da13a77cafa0da541248eee317c39d
+Author: tim <tvall43@gmail.com>
+Date:   Sat Jul 10 09:37:23 2021 -0500
+
+    rockchip: rk3328: Add default env to support compressed kernel Image
+    
+    defaults copied from rk3399 to boot compressed kernel Image
+
+diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
+index 0538da751f..07be75e8d8 100644
+--- a/include/configs/rk3328_common.h
++++ b/include/configs/rk3328_common.h
+@@ -36,7 +36,9 @@
+ 	"pxefile_addr_r=0x00600000\0" \
+ 	"fdt_addr_r=0x01f00000\0" \
+ 	"kernel_addr_r=0x02080000\0" \
+-	"ramdisk_addr_r=0x06000000\0"
++	"ramdisk_addr_r=0x06000000\0" \
++	"kernel_comp_addr_r=0x08000000\0" \
++	"kernel_comp_size=0x2000000\0"
+ 
+ #include <config_distro_bootcmd.h>
+ #define CONFIG_EXTRA_ENV_SETTINGS \

temp/u-boot-quartz64/update-u-boot

@@ -0,0 +1,109 @@
+#!/bin/sh
+
+verbose=
+board=
+device=
+dryrun=
+imagedir=
+
+get_defaults() {
+	if [ -z "$board" -a -e /sys/firmware/devicetree/base/compatible ]; then
+		case "$(cat /sys/firmware/devicetree/base/compatible 2>/dev/null)" in
+		pine64,rock64*) board=rock64 ;;
+		esac
+	fi
+
+	if [ -z "$device" ]; then
+		case "$board" in
+		rockpro64) device=/dev/mmcblk2 ;;
+		esac
+	fi
+
+	if [ -z "$imagedir" ]; then
+		imagedir="$(realpath $(dirname $0))"
+		[ -f "$imagedir/README.txt" ] || imagedir="/usr/share/u-boot"
+	fi
+}
+
+die() {
+	echo "ERROR: $@"
+	exit 1
+}
+
+usage() {
+	get_defaults
+
+	cat <<EOF
+usage: $0 [-n,--dry-run] [-i,--imagedir <imagedir>] [-b|--board <board-type>] [-d|--device <device>]
+
+options:
+
+ -b,--board <board>       Specify the board type: rock64
+                          (current default: ${board:-none})
+
+ -d,--device <device>     Specify the device where to install u-boot
+                          (current default: ${device:-none})
+
+ -i,--imagedir <imagedir> Specify u-boot image directory
+                          (current default: ${imagedir:-none})
+
+ -n,--dry-run             Print commands but don't execute them
+
+EOF
+}
+
+while [ $# -gt 0 ]; do
+	opt="$1"
+	shift
+	case "$opt" in
+	-b|--board)
+		case "$1" in
+		rock64) board="rock64" ;;
+		*) usage; exit 1;;
+		esac
+		shift
+		;;
+	-d|--device)
+		device="$1"
+		shift
+		;;
+	-i|--imagedir)
+		imagedir="$1"
+		shift
+		;;
+	-n|--dry-run)
+		dryrun="echo"
+		;;
+        --)
+                break
+                ;;
+        -*)
+                usage
+                exit 1
+                ;;
+        esac
+done
+
+get_defaults
+if [ -z "$board" -o -z "$device" -o -z "$imagedir" -o  ! -e "$imagedir" ]; then
+	usage
+	exit 1
+fi
+
+if [ -z "$dryrun" ]; then
+	echo "Updating $board u-boot in $device in 3 seconds..."
+	sleep 3
+fi
+
+(
+set -e
+case "$board" in
+rock64)
+	[ -e "$imagedir/pine64-rock64/" ] || die "rock64 images not installed, apk add u-boot-rock64"
+	$dryrun dd if=$imagedir/pine64-rock64/u-boot-rockchip.bin of=$device bs=1024 seek=32 status=none
+	;;
+esac
+$dryrun sync
+) || die "U-Boot installation in $device failed"
+
+[ -z "$dryrun" ] && echo "Completed successfully."