pine64-pinephone: set lima.sched_timeout_ms=2000

Bump the default timeout of 500 ms to 2000 ms, so lima does not lock up
even under heavy load on the pinephone.

Related: pmaports issue 805

.ci/check_devices_in_wiki.py

@@ -121,10 +121,6 @@ def main():
         print("it more easily. Many times one person did a port with basic")
         print("functionality, and then someone else jumped in and")
         print("contributed major new features.")
-        print("")
-        print("NOTE: if you renamed a device in pmaports, rename it in the")
-        print("wiki as well and make sure to add it here:")
-        print("https://postmarketos.org/renamed")
         return 1
     else:
         print("*** Wiki check successful!")

.ci/shellcheck.sh

@@ -28,6 +28,7 @@ sh_files="
 	./main/swclock-offset/swclock-offset-shutdown.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
+	./main/msm-firmware-loader/*.sh
 	./main/msm-firmware-loader/*.post-install
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')

.ci/testcases/test_ui.py

@@ -15,9 +15,7 @@ def test_aports_ui(args):
     """
     Raise an error if package in _pmb_recommends is not found
     """
-    pmaports_cfg = pmb.config.pmaports.read_config(args)
-
-    for arch in pmaports_cfg["supported_arches"].split(","):
+    for arch in pmb.config.build_device_architectures:
         for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
             apkbuild = pmb.parse.apkbuild(path)
             # Skip if arch isn't enabled

CODEOWNERS

@@ -3,6 +3,7 @@
 device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
 device/*/*-purism-librem5/          @craftyguy @bshah
 main/osk-sdl/                       @craftyguy
+main/mesa-pvr-dri-classic/          @xc-racer99
 main/postmarketos-ui-plasma-mobile/ @bshah
 temp/u-boot-librem5/                @craftyguy @bshah
 device/community/*-qcom-sdm845      @calebccff @joelselvaraj

channels.cfg

@@ -8,14 +8,8 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
-[v22.06]
-description=Latest release / Recommended for best stability
-branch_pmaports=v22.06
-branch_aports=3.16-stable
-mirrordir_alpine=v3.16
-
 [v21.12]
-description=Old release (unsupported)
+description=Latest release / Recommended for best stability
 branch_pmaports=v21.12
 branch_aports=3.15-stable
 mirrordir_alpine=v3.15

cross/binutils-aarch64/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=binutils-aarch64
 pkgver=2.38
-pkgrel=3
+pkgrel=1
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -17,9 +17,6 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
 	binutils-ppc-fix-machine-options.patch
-	binutils-s390x-1.patch
-	binutils-s390x-2.patch
-	binutils-ppc64le-assertion.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -82,7 +79,4 @@ f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
 27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
-0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
-63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8  binutils-ppc64le-assertion.patch
 "

cross/binutils-aarch64/binutils-ppc64le-assertion.patch

@@ -1,32 +0,0 @@
-From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Thu, 23 Jun 2022 17:50:30 +0930
-Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
-
-save_res stubs aren't written in ppc_build_one_stub, their offsets
-(which are zero) should not be checked.
-
-	* elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
-
-(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
----
- bfd/elf64-ppc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
-index cb12ed476d8..df503341fe9 100644
---- a/bfd/elf64-ppc.c
-+++ b/bfd/elf64-ppc.c
-@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
-   if (htab == NULL)
-     return false;
- 
--  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
-+  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
-+	      || stub_entry->type.main == ppc_stub_save_res);
-   loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
- 
-   htab->stub_count[stub_entry->type.main - 1] += 1;
--- 
-2.31.1
-

cross/binutils-aarch64/binutils-s390x-1.patch

@@ -1,147 +0,0 @@
-From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:29:58 +0200
-Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
-
-No dynamic relocs are needed for TLS defined in an executable, the
-TP relative offset is known at link time.
-
-Fixes
-FAIL: Build pr22263-1
-
-bfd/
-	PR ld/22263
-	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
-	instead of bfd_link_pic for TLS.
-	(elf_s390_check_relocs): Likewise.
-	(allocate_dynrelocs): Likewise.
-	(elf_s390_relocate_section): Likewise.
-
-(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
----
- bfd/elf64-s390.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index e780efa7181..00ee386baab 100644
---- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
- 			 int r_type,
- 			 int is_local)
- {
--  if (bfd_link_pic (info))
-+  if (bfd_link_dll (info))
-     return r_type;
- 
-   switch (r_type)
-@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	case R_390_TLS_GOTIE20:
- 	case R_390_TLS_GOTIE64:
- 	case R_390_TLS_IEENT:
--	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
- 
-@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
- 	    break;
- 
--	  if (!bfd_link_pic (info))
-+	  if (!bfd_link_dll (info))
- 	    break;
- 	  info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
-@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
-      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
-      we can save the dynamic TLS relocation.  */
-   if (h->got.refcount > 0
--      && !bfd_link_pic (info)
-+      && !bfd_link_dll (info)
-       && h->dynindx == -1
-       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
-     {
-@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  /* Relocations for tls literal pool entries.  */
- 	case R_390_TLS_IE64:
--	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    {
- 	      Elf_Internal_Rela outrel;
- 	      asection *sreloc;
-@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  else if (h != NULL)
- 	    {
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
--	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
-+	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
- 		r_type = R_390_TLS_LE64;
- 	    }
- 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
-@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	      if (local_got_offsets == NULL)
- 		abort();
- 	      off = local_got_offsets[r_symndx];
--	      if (bfd_link_pic (info))
-+	      if (bfd_link_dll (info))
- 		goto emit_tls_relocs;
- 	    }
- 	  else
- 	    {
- 	      off = h->got.offset;
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
--	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
-+	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
- 		goto emit_tls_relocs;
- 	    }
- 
-@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  break;
- 
- 	case R_390_TLS_LDM64:
--	  if (! bfd_link_pic (info))
-+	  if (! bfd_link_dll (info))
- 	    /* The literal pool entry this relocation refers to gets ignored
- 	       by the optimized code of the local exec model. Do nothing
- 	       and the value will turn out zero.  */
-@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  continue;
- 
- 	case R_390_TLS_LDO64:
--	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
-+	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
- 	    relocation -= dtpoff_base (info);
- 	  else
- 	    /* When converting LDO to LE, we must negate.  */
-@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  if (r_type == R_390_TLS_LOAD)
- 	    {
--	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* IE->LE transition. Four valid cases:
- 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
-@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 		  invalid_tls_insn (input_bfd, input_section, rel);
- 		  return false;
- 		}
--	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* GD->LE transition.
- 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
-@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	    }
- 	  else if (r_type == R_390_TLS_LDCALL)
- 	    {
--	      if (!bfd_link_pic (info))
-+	      if (!bfd_link_dll (info))
- 		{
- 		  unsigned int insn0, insn1;
- 
--- 
-2.27.0
-

cross/binutils-aarch64/binutils-s390x-2.patch

@@ -1,51 +0,0 @@
-From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:30:55 +0200
-Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
-
-In static-pie case, there are IRELATIVE-relocs in
-.rela.iplt (htab->irelplt), which will later be grouped
-to .rela.plt.  On s390, the IRELATIVE relocations are
-always located in .rela.iplt - even for non-static case.
-Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-to the dynamic section even if htab->srelplt->size == 0.
-See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
-
-bfd/
-	elf64-s390.c (elf_s390_size_dynamic_sections):
-	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
-
-(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
----
- bfd/elf64-s390.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index 00ee386baab..0b851f7ac0e 100644
---- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-       else if (startswith (bfd_section_name (s), ".rela"))
- 	{
- 	  if (s->size != 0 && s != htab->elf.srelplt)
--	    relocs = true;
-+	    {
-+	      relocs = true;
-+	      if (s == htab->elf.irelplt)
-+		{
-+		  /* In static-pie case, there are IRELATIVE-relocs in
-+		     .rela.iplt (htab->irelplt), which will later be grouped
-+		     to .rela.plt.  On s390, the IRELATIVE relocations are
-+		     always located in .rela.iplt - even for non-static case.
-+		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-+		     to the dynamic section even if htab->srelplt->size == 0.
-+		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
-+		  htab->elf.dt_jmprel_required = true;
-+		}
-+	    }
- 
- 	  /* We use the reloc_count field as a counter if we need
- 	     to copy relocs into the output file.  */
--- 
-2.27.0
-

cross/binutils-armhf/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=binutils-armhf
 pkgver=2.38
-pkgrel=3
+pkgrel=1
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -17,9 +17,6 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
 	binutils-ppc-fix-machine-options.patch
-	binutils-s390x-1.patch
-	binutils-s390x-2.patch
-	binutils-ppc64le-assertion.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -82,7 +79,4 @@ f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
 27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
-0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
-63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8  binutils-ppc64le-assertion.patch
 "

cross/binutils-armhf/binutils-ppc64le-assertion.patch

@@ -1,32 +0,0 @@
-From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Thu, 23 Jun 2022 17:50:30 +0930
-Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
-
-save_res stubs aren't written in ppc_build_one_stub, their offsets
-(which are zero) should not be checked.
-
-	* elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
-
-(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
----
- bfd/elf64-ppc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
-index cb12ed476d8..df503341fe9 100644
---- a/bfd/elf64-ppc.c
-+++ b/bfd/elf64-ppc.c
-@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
-   if (htab == NULL)
-     return false;
- 
--  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
-+  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
-+	      || stub_entry->type.main == ppc_stub_save_res);
-   loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
- 
-   htab->stub_count[stub_entry->type.main - 1] += 1;
--- 
-2.31.1
-

cross/binutils-armhf/binutils-s390x-1.patch

@@ -1,147 +0,0 @@
-From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:29:58 +0200
-Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
-
-No dynamic relocs are needed for TLS defined in an executable, the
-TP relative offset is known at link time.
-
-Fixes
-FAIL: Build pr22263-1
-
-bfd/
-	PR ld/22263
-	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
-	instead of bfd_link_pic for TLS.
-	(elf_s390_check_relocs): Likewise.
-	(allocate_dynrelocs): Likewise.
-	(elf_s390_relocate_section): Likewise.
-
-(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
----
- bfd/elf64-s390.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index e780efa7181..00ee386baab 100644
---- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
- 			 int r_type,
- 			 int is_local)
- {
--  if (bfd_link_pic (info))
-+  if (bfd_link_dll (info))
-     return r_type;
- 
-   switch (r_type)
-@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	case R_390_TLS_GOTIE20:
- 	case R_390_TLS_GOTIE64:
- 	case R_390_TLS_IEENT:
--	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
- 
-@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
- 	    break;
- 
--	  if (!bfd_link_pic (info))
-+	  if (!bfd_link_dll (info))
- 	    break;
- 	  info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
-@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
-      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
-      we can save the dynamic TLS relocation.  */
-   if (h->got.refcount > 0
--      && !bfd_link_pic (info)
-+      && !bfd_link_dll (info)
-       && h->dynindx == -1
-       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
-     {
-@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  /* Relocations for tls literal pool entries.  */
- 	case R_390_TLS_IE64:
--	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    {
- 	      Elf_Internal_Rela outrel;
- 	      asection *sreloc;
-@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  else if (h != NULL)
- 	    {
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
--	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
-+	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
- 		r_type = R_390_TLS_LE64;
- 	    }
- 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
-@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	      if (local_got_offsets == NULL)
- 		abort();
- 	      off = local_got_offsets[r_symndx];
--	      if (bfd_link_pic (info))
-+	      if (bfd_link_dll (info))
- 		goto emit_tls_relocs;
- 	    }
- 	  else
- 	    {
- 	      off = h->got.offset;
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
--	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
-+	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
- 		goto emit_tls_relocs;
- 	    }
- 
-@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  break;
- 
- 	case R_390_TLS_LDM64:
--	  if (! bfd_link_pic (info))
-+	  if (! bfd_link_dll (info))
- 	    /* The literal pool entry this relocation refers to gets ignored
- 	       by the optimized code of the local exec model. Do nothing
- 	       and the value will turn out zero.  */
-@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  continue;
- 
- 	case R_390_TLS_LDO64:
--	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
-+	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
- 	    relocation -= dtpoff_base (info);
- 	  else
- 	    /* When converting LDO to LE, we must negate.  */
-@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  if (r_type == R_390_TLS_LOAD)
- 	    {
--	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* IE->LE transition. Four valid cases:
- 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
-@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 		  invalid_tls_insn (input_bfd, input_section, rel);
- 		  return false;
- 		}
--	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* GD->LE transition.
- 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
-@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	    }
- 	  else if (r_type == R_390_TLS_LDCALL)
- 	    {
--	      if (!bfd_link_pic (info))
-+	      if (!bfd_link_dll (info))
- 		{
- 		  unsigned int insn0, insn1;
- 
--- 
-2.27.0
-

cross/binutils-armhf/binutils-s390x-2.patch

@@ -1,51 +0,0 @@
-From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:30:55 +0200
-Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
-
-In static-pie case, there are IRELATIVE-relocs in
-.rela.iplt (htab->irelplt), which will later be grouped
-to .rela.plt.  On s390, the IRELATIVE relocations are
-always located in .rela.iplt - even for non-static case.
-Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-to the dynamic section even if htab->srelplt->size == 0.
-See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
-
-bfd/
-	elf64-s390.c (elf_s390_size_dynamic_sections):
-	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
-
-(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
----
- bfd/elf64-s390.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index 00ee386baab..0b851f7ac0e 100644
---- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-       else if (startswith (bfd_section_name (s), ".rela"))
- 	{
- 	  if (s->size != 0 && s != htab->elf.srelplt)
--	    relocs = true;
-+	    {
-+	      relocs = true;
-+	      if (s == htab->elf.irelplt)
-+		{
-+		  /* In static-pie case, there are IRELATIVE-relocs in
-+		     .rela.iplt (htab->irelplt), which will later be grouped
-+		     to .rela.plt.  On s390, the IRELATIVE relocations are
-+		     always located in .rela.iplt - even for non-static case.
-+		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-+		     to the dynamic section even if htab->srelplt->size == 0.
-+		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
-+		  htab->elf.dt_jmprel_required = true;
-+		}
-+	    }
- 
- 	  /* We use the reloc_count field as a counter if we need
- 	     to copy relocs into the output file.  */
--- 
-2.27.0
-

cross/binutils-armv7/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=binutils-armv7
 pkgver=2.38
-pkgrel=3
+pkgrel=1
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -17,9 +17,6 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
 	binutils-ppc-fix-machine-options.patch
-	binutils-s390x-1.patch
-	binutils-s390x-2.patch
-	binutils-ppc64le-assertion.patch
 	"
 builddir="$srcdir/binutils-$pkgver"
 
@@ -82,7 +79,4 @@ f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
 27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
-0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
-63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8  binutils-ppc64le-assertion.patch
 "

cross/binutils-armv7/binutils-ppc64le-assertion.patch

@@ -1,32 +0,0 @@
-From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Thu, 23 Jun 2022 17:50:30 +0930
-Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
-
-save_res stubs aren't written in ppc_build_one_stub, their offsets
-(which are zero) should not be checked.
-
-	* elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
-
-(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
----
- bfd/elf64-ppc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
-index cb12ed476d8..df503341fe9 100644
---- a/bfd/elf64-ppc.c
-+++ b/bfd/elf64-ppc.c
-@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
-   if (htab == NULL)
-     return false;
- 
--  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
-+  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
-+	      || stub_entry->type.main == ppc_stub_save_res);
-   loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
- 
-   htab->stub_count[stub_entry->type.main - 1] += 1;
--- 
-2.31.1
-

cross/binutils-armv7/binutils-s390x-1.patch

@@ -1,147 +0,0 @@
-From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:29:58 +0200
-Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
-
-No dynamic relocs are needed for TLS defined in an executable, the
-TP relative offset is known at link time.
-
-Fixes
-FAIL: Build pr22263-1
-
-bfd/
-	PR ld/22263
-	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
-	instead of bfd_link_pic for TLS.
-	(elf_s390_check_relocs): Likewise.
-	(allocate_dynrelocs): Likewise.
-	(elf_s390_relocate_section): Likewise.
-
-(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
----
- bfd/elf64-s390.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index e780efa7181..00ee386baab 100644
---- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
- 			 int r_type,
- 			 int is_local)
- {
--  if (bfd_link_pic (info))
-+  if (bfd_link_dll (info))
-     return r_type;
- 
-   switch (r_type)
-@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	case R_390_TLS_GOTIE20:
- 	case R_390_TLS_GOTIE64:
- 	case R_390_TLS_IEENT:
--	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
- 
-@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
- 	    break;
- 
--	  if (!bfd_link_pic (info))
-+	  if (!bfd_link_dll (info))
- 	    break;
- 	  info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
-@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
-      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
-      we can save the dynamic TLS relocation.  */
-   if (h->got.refcount > 0
--      && !bfd_link_pic (info)
-+      && !bfd_link_dll (info)
-       && h->dynindx == -1
-       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
-     {
-@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  /* Relocations for tls literal pool entries.  */
- 	case R_390_TLS_IE64:
--	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    {
- 	      Elf_Internal_Rela outrel;
- 	      asection *sreloc;
-@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  else if (h != NULL)
- 	    {
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
--	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
-+	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
- 		r_type = R_390_TLS_LE64;
- 	    }
- 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
-@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	      if (local_got_offsets == NULL)
- 		abort();
- 	      off = local_got_offsets[r_symndx];
--	      if (bfd_link_pic (info))
-+	      if (bfd_link_dll (info))
- 		goto emit_tls_relocs;
- 	    }
- 	  else
- 	    {
- 	      off = h->got.offset;
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
--	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
-+	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
- 		goto emit_tls_relocs;
- 	    }
- 
-@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  break;
- 
- 	case R_390_TLS_LDM64:
--	  if (! bfd_link_pic (info))
-+	  if (! bfd_link_dll (info))
- 	    /* The literal pool entry this relocation refers to gets ignored
- 	       by the optimized code of the local exec model. Do nothing
- 	       and the value will turn out zero.  */
-@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  continue;
- 
- 	case R_390_TLS_LDO64:
--	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
-+	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
- 	    relocation -= dtpoff_base (info);
- 	  else
- 	    /* When converting LDO to LE, we must negate.  */
-@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  if (r_type == R_390_TLS_LOAD)
- 	    {
--	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* IE->LE transition. Four valid cases:
- 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
-@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 		  invalid_tls_insn (input_bfd, input_section, rel);
- 		  return false;
- 		}
--	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* GD->LE transition.
- 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
-@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	    }
- 	  else if (r_type == R_390_TLS_LDCALL)
- 	    {
--	      if (!bfd_link_pic (info))
-+	      if (!bfd_link_dll (info))
- 		{
- 		  unsigned int insn0, insn1;
- 
--- 
-2.27.0
-

cross/binutils-armv7/binutils-s390x-2.patch

@@ -1,51 +0,0 @@
-From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:30:55 +0200
-Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
-
-In static-pie case, there are IRELATIVE-relocs in
-.rela.iplt (htab->irelplt), which will later be grouped
-to .rela.plt.  On s390, the IRELATIVE relocations are
-always located in .rela.iplt - even for non-static case.
-Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-to the dynamic section even if htab->srelplt->size == 0.
-See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
-
-bfd/
-	elf64-s390.c (elf_s390_size_dynamic_sections):
-	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
-
-(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
----
- bfd/elf64-s390.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index 00ee386baab..0b851f7ac0e 100644
---- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-       else if (startswith (bfd_section_name (s), ".rela"))
- 	{
- 	  if (s->size != 0 && s != htab->elf.srelplt)
--	    relocs = true;
-+	    {
-+	      relocs = true;
-+	      if (s == htab->elf.irelplt)
-+		{
-+		  /* In static-pie case, there are IRELATIVE-relocs in
-+		     .rela.iplt (htab->irelplt), which will later be grouped
-+		     to .rela.plt.  On s390, the IRELATIVE relocations are
-+		     always located in .rela.iplt - even for non-static case.
-+		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-+		     to the dynamic section even if htab->srelplt->size == 0.
-+		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
-+		  htab->elf.dt_jmprel_required = true;
-+		}
-+	    }
- 
- 	  /* We use the reloc_count field as a counter if we need
- 	     to copy relocs into the output file.  */
--- 
-2.27.0
-

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.35.0
-pkgrel=18
+pkgrel=8
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-2dd9617a1e0938a692acdb5c0ed943197f100a87274df96bc3ed7f77e0a5713d4e8c9642a666bb0391c5ceebc50960cf4ef9a467c813d6f5a149c6bd89b2dc3a  busybox-static-1.35.0-r18-aarch64-edge.apk
+9a5c02e591d71c06e3f9fb5a8ef50ceaf18f3183164b9aa80683c0979abcf90844d19b2781d8a2828d866a9a1d87a6fb3b7ca95c21104a20f880535c1c5e5bcc  busybox-static-1.35.0-r8-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.35.0
-pkgrel=18
+pkgrel=8
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-35461f4429030b5841c6cb071aac692f42f4935c5b94f80b848c8a9ce217b25370f9bb0df167f6d597535708d3c1d25b8e12d6d9b57588c4291facbc7681dd03  busybox-static-1.35.0-r18-armhf-edge.apk
+0a5ee42c6c45252693685255760e16dcbfa0f5f747f2b9ddffdc0474bff27e4f353675bac208aba6880dd67eaa11de9f27ffb8b073f1daab4f07789a1acf8aa5  busybox-static-1.35.0-r8-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.35.0
-pkgrel=18
+pkgrel=8
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-e91b9f5bd8e21525c471aeaf83a4fdc86098e8245b2d4119a3e6717d3402e9e134cf8cae6df8b076f0020eaf8a4eda68cfa417d4319ba5be4b32daf480133dd4  busybox-static-1.35.0-r18-armv7-edge.apk
+25adf68cc83bdcb2f0c00fbdc7f64efac699144cb0a61e11a2876d9dbeead46c51ea21b258dcbfaf21fb30400a4172b44ce98872d4d110f245e6f8285c28e578  busybox-static-1.35.0-r8-armv7-edge.apk
 "

cross/gcc-aarch64/APKBUILD

@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=4
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,15 +182,10 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
-	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
-		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-	fi
+	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -440,12 +435,10 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+			mv "$i" "$pkgdir"/usr/lib/
+			ln -s ../../../../${i##*/} $i
+		done
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
@@ -600,7 +593,6 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
-	provides="gcc-gdc-bootstrap=$_gccrel"
 
 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -712,7 +704,7 @@ libgnatstatic() {
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap=$_gccrel"
+	provides="$pkgname-gnat-bootstrap"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
 	mkdir -p "$subpkgdir"/$_gcclibexec \

cross/gcc-armhf/APKBUILD

@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=4
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,15 +182,10 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
-	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
-		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-	fi
+	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -440,12 +435,10 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+			mv "$i" "$pkgdir"/usr/lib/
+			ln -s ../../../../${i##*/} $i
+		done
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
@@ -600,7 +593,6 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
-	provides="gcc-gdc-bootstrap=$_gccrel"
 
 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -712,7 +704,7 @@ libgnatstatic() {
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap=$_gccrel"
+	provides="$pkgname-gnat-bootstrap"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
 	mkdir -p "$subpkgdir"/$_gcclibexec \

cross/gcc-armv7/APKBUILD

@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=4
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,15 +182,10 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
-	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
-		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-	fi
+	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -440,12 +435,10 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+			mv "$i" "$pkgdir"/usr/lib/
+			ln -s ../../../../${i##*/} $i
+		done
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
@@ -600,7 +593,6 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
-	provides="gcc-gdc-bootstrap=$_gccrel"
 
 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -712,7 +704,7 @@ libgnatstatic() {
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap=$_gccrel"
+	provides="$pkgname-gnat-bootstrap"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
 	mkdir -p "$subpkgdir"/$_gcclibexec \

cross/gcc4-aarch64/1001-fix-reload1-compile-error.patch

@@ -1,17 +0,0 @@
-Avoid gcc/reload1.c compile error when building with newer gcc (e.g. gcc 11.2 on Ubuntu 21.10).
-
-The error was:
-
-.../esp-open-sdk/crosstool-NG/.build/src/gcc-4.8.5/gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
-
---- gcc-4.8.5/gcc/reload1.c~	2013-01-21 06:55:05.000000000 -0800
-+++ gcc-4.8.5/gcc/reload1.c	2022-01-05 17:18:10.148547719 -0800
-@@ -440,7 +440,7 @@
- 
-   while (memory_address_p (QImode, tem))
-     {
--      spill_indirect_levels++;
-+      spill_indirect_levels = 1;
-       tem = gen_rtx_MEM (Pmode, tem);
-     }
- 

cross/gcc4-aarch64/APKBUILD

@@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc4-aarch64
 pkgver=9999
 _pkgver=4.9.2
-pkgrel=4
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="http://gcc.gnu.org"
 arch="x86_64"
@@ -215,8 +215,6 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg
 	hardenednossp.specs
 	hardenednopie.specs
 	hardenednopiessp.specs
-
-	1001-fix-reload1-compile-error.patch
 	"
 
 # we build out-of-tree
@@ -434,8 +432,7 @@ package() {
 	done
 }
 
-sha512sums="
-35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
+sha512sums="35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
 618a8d037ccad15e60182acc9c85ba844cb9b5800a22ece0b814e43541b01b4e390a2847f86debb351f4b05580241747fde87e86a17060744e7bb2b9a3dc5bd4  01_all_gcc49_configure.patch
 21770259c7916e55568027926e4a543eea468b04436cc61c28f749be5a6635c48e68b7924a8eb19a76733a9d2f00921ba06faddaedbf14b1cdad5ab1810cc6c6  02_all_gcc48_config.in.patch
@@ -483,6 +480,4 @@ b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc2
 83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb  vanilla.specs
 e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12  hardenednossp.specs
 b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168  hardenednopie.specs
-f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs
-6f3d708269cc3f1d28ad9af8cd1206753b7d4ddde6589c303ce201d34b531f1abb73a14032a7f8e16c5ec3041e0c227b3451c09b1952a58893a64a2765d12a00  1001-fix-reload1-compile-error.patch
-"
+f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs"

cross/gcc4-armv7/1001-fix-reload1-compile-error.patch

@@ -1,17 +0,0 @@
-Avoid gcc/reload1.c compile error when building with newer gcc (e.g. gcc 11.2 on Ubuntu 21.10).
-
-The error was:
-
-.../esp-open-sdk/crosstool-NG/.build/src/gcc-4.8.5/gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
-
---- gcc-4.8.5/gcc/reload1.c~	2013-01-21 06:55:05.000000000 -0800
-+++ gcc-4.8.5/gcc/reload1.c	2022-01-05 17:18:10.148547719 -0800
-@@ -440,7 +440,7 @@
- 
-   while (memory_address_p (QImode, tem))
-     {
--      spill_indirect_levels++;
-+      spill_indirect_levels = 1;
-       tem = gen_rtx_MEM (Pmode, tem);
-     }
- 

cross/gcc4-armv7/APKBUILD

@@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc4-armv7
 pkgver=9999
 _pkgver=4.9.2
-pkgrel=4
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armv7"
 url="http://gcc.gnu.org"
 arch="x86_64"
@@ -215,8 +215,6 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg
 	hardenednossp.specs
 	hardenednopie.specs
 	hardenednopiessp.specs
-
-	1001-fix-reload1-compile-error.patch
 	"
 
 # we build out-of-tree
@@ -434,8 +432,7 @@ package() {
 	done
 }
 
-sha512sums="
-35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
+sha512sums="35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
 618a8d037ccad15e60182acc9c85ba844cb9b5800a22ece0b814e43541b01b4e390a2847f86debb351f4b05580241747fde87e86a17060744e7bb2b9a3dc5bd4  01_all_gcc49_configure.patch
 21770259c7916e55568027926e4a543eea468b04436cc61c28f749be5a6635c48e68b7924a8eb19a76733a9d2f00921ba06faddaedbf14b1cdad5ab1810cc6c6  02_all_gcc48_config.in.patch
@@ -483,6 +480,4 @@ b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc2
 83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb  vanilla.specs
 e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12  hardenednossp.specs
 b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168  hardenednopie.specs
-f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs
-6f3d708269cc3f1d28ad9af8cd1206753b7d4ddde6589c303ce201d34b531f1abb73a14032a7f8e16c5ec3041e0c227b3451c09b1952a58893a64a2765d12a00  1001-fix-reload1-compile-error.patch
-"
+f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs"

cross/grub-efi-x86/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=grub-efi-x86
 pkgver=2.06
-pkgrel=5
+pkgrel=2
 
 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }
 
 sha512sums="
-4470549744730a4911c2e6f9b38012057391cea40de2ee46375aaf826786acdf9e22f33df19b3f7c1fe7ee5cbc5ab2e412f0f6f85ea5513dc63e7f59be22bd5b  grub-efi-2.06-r5-x86-edge.apk
+ccdc2735380b7af8bc8cc6f4a143f2fa15037488184589fde1b4880883ebda6a722ce49c79e0da1cc4e0b316a4dcbc2b6f79ffa4f2333b826bddbfa4aadf76f1  grub-efi-2.06-r2-x86-edge.apk
 "

cross/musl-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-aarch64
 pkgver=1.2.3
-pkgrel=1
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-5e64669b00a77b19bb5e2a6a801950fff73a0c394734590ed2c3840905ac45faa9af9a21f186380d848ce713a000e93ef516f47fb5da54704e9313c9b62ed06d  musl-1.2.3-r1-aarch64-edge.apk
-51a515fab0e244373b62b572c67460f31e20d4b22db125dabc17b24e9bfbd1c87901f8d44a55d36d208a9a8650ebbb59995f8715e2c8ca90b531e0d74852ff8b  musl-dev-1.2.3-r1-aarch64-edge.apk
+a21d0c879f36c42da82c384403bb31a9562521a7a68b965d3fab6fcf133734ee93fccc6dc5131b99c54c7eb6fbe4329829b915bb801e6ac602d4091617ac03ed  musl-1.2.3-r0-aarch64-edge.apk
+a5742520f5a8aaf3fea931697126b777fed7a58d08be64e30e5ea2dfde571d7b317e40f4fea31979325d9c1d407c18a46cb354483aa906dae08301e563db5f4f  musl-dev-1.2.3-r0-aarch64-edge.apk
 "

cross/musl-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-armhf
 pkgver=1.2.3
-pkgrel=1
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-ca5c7fc6c32375066b2be07474fafc06b6e975e8f9ecef9945ae32e5560a19e10be52643536a769db001c357d890d50888a3ec58336d659f5a328e35ef46e15d  musl-1.2.3-r1-armhf-edge.apk
-ae04dd543ff95e90915c9bb857b30a4f6ec9472fcbd679b047aeab6f62a10d79b8ae0bf6bd640d1ce5ebfe56dea5256889fcf6ae8727820358490120e1abddb5  musl-dev-1.2.3-r1-armhf-edge.apk
+20724b1bad5b986e5644799b2b9c0ae2699c25506be72fc28a68fbe9215054b752a9972a556a0f93356452ab12cece77e89b4cfa63310d08cb2f749b35e1acfc  musl-1.2.3-r0-armhf-edge.apk
+fb05d24e7c90b41c04bbdb6499d35e376931b4e13491031631bade0c1b3b596f678c813e872438fda33ff7300c40bc1235f0145bff1b5a32ee2aba0f8c575925  musl-dev-1.2.3-r0-armhf-edge.apk
 "

cross/musl-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-armv7
 pkgver=1.2.3
-pkgrel=1
+pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -57,6 +57,6 @@ package_dev() {
 }
 
 sha512sums="
-040d2317fbd50d5285d6bcff405f0bc628c4f2420c4d6c593deedc4aea9154bdb031bff50c2cae29af3bb557bff927970ab111efd51b420b599bdde52bb94241  musl-1.2.3-r1-armv7-edge.apk
-69dff18d36e35ce245c672bd7212d881eaed457f70a6424f1637315181b7d6b832b140a6f469018c947a9bcee1b2e632305ac8ec0facf595dfdf7009790c6646  musl-dev-1.2.3-r1-armv7-edge.apk
+88b034bc37d800e0f279437a1a1a5973e994873ab0e44d372ac6cd49c999d6c1f834266d646fb17777d9a018a9bfd0cc9346d7525d1726ffe96cc56096d70281  musl-1.2.3-r0-armv7-edge.apk
+c865bde907a17accf33a4cd7b8caad496c510b3227d8cf5e12a597613df7a629778eb08a32692e67bfead3422a2add2833e4e49df1e970d2067c2f65a372dc46  musl-dev-1.2.3-r0-armv7-edge.apk
 "

device/.shared-patches/linux/cve-2022-0847-dirty-pipe.patch

@@ -1,44 +0,0 @@
-From 9d2231c5d74e13b2a0546fee6737ee4446017903 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann@ionos.com>
-Date: Mon, 21 Feb 2022 11:03:13 +0100
-Subject: lib/iov_iter: initialize "flags" in new pipe_buffer
-
-The functions copy_page_to_iter_pipe() and push_pipe() can both
-allocate a new pipe_buffer, but the "flags" member initializer is
-missing.
-
-Fixes: 241699cd72a8 ("new iov_iter flavour: pipe-backed")
-To: Alexander Viro <viro@zeniv.linux.org.uk>
-To: linux-fsdevel@vger.kernel.org
-To: linux-kernel@vger.kernel.org
-Cc: stable@vger.kernel.org
-Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
----
- lib/iov_iter.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/iov_iter.c b/lib/iov_iter.c
-index b0e0acdf96c15..6dd5330f7a995 100644
---- a/lib/iov_iter.c
-+++ b/lib/iov_iter.c
-@@ -414,6 +414,7 @@ static size_t copy_page_to_iter_pipe(struct page *page, size_t offset, size_t by
- 		return 0;
- 
- 	buf->ops = &page_cache_pipe_buf_ops;
-+	buf->flags = 0;
- 	get_page(page);
- 	buf->page = page;
- 	buf->offset = offset;
-@@ -577,6 +578,7 @@ static size_t push_pipe(struct iov_iter *i, size_t size,
- 			break;
- 
- 		buf->ops = &default_pipe_buf_ops;
-+		buf->flags = 0;
- 		buf->page = page;
- 		buf->offset = 0;
- 		buf->len = min_t(ssize_t, left, PAGE_SIZE);
--- 
-cgit 
-
-

device/.shared-patches/linux/sprd/sprdfb-check-for-buffering.patch

@@ -1,24 +0,0 @@
-sprdfb_check_var() has two problems:
-I) it is not buffering-aware, which all Spreadtrum devices use;
-II) it checks values that are already in yres_virtual, not those that we
-are trying to overwrite.
-Those problems stop X11 and charging-sdl from working properly.
-X11 error:
-(EE) FBDEV(0): FBIOPUT_VSCREENINFO: Invalid argument
-This patch fixes first problem, however, the correct way is fixing
-the second one, as this might have less side effects.
-
-diff --git a/drivers/video/sprdfb/sprdfb_main.c b/drivers/video/sprdfb/sprdfb_main.c
-index 43876285..751616a1 100644
---- a/drivers/video/sprdfb/sprdfb_main.c
-+++ b/drivers/video/sprdfb/sprdfb_main.c
-@@ -531,7 +531,8 @@ static int sprdfb_check_var(struct fb_var_screeninfo *var, struct fb_info *fb)
- 	if ((var->xres != fb->var.xres) ||
- 		(var->yres != fb->var.yres) ||
- 		(var->xres_virtual != fb->var.xres_virtual) ||
--		(var->yres_virtual != fb->var.yres_virtual) ||
-+		// (var->yres_virtual != fb->var.yres_virtual) ||
-+	    	(fb->var.yres_virtual % var->yres_virtual != 0) ||
- 		(var->xoffset != fb->var.xoffset) ||
- #ifndef BIT_PER_PIXEL_SURPPORT
- 		(var->bits_per_pixel != fb->var.bits_per_pixel) ||

device/.shared-patches/linux/sprd/sprdfb-fix-swapped-colors.patch

@@ -1,15 +0,0 @@
-By default, color channels on Spreadtrum devices are swapped. This patch makes kernel use BGR565, which has normal color channels.
-
-diff --git a/drivers/video/sprdfb/sprdfb_main.c b/drivers/video/sprdfb/sprdfb_main.c
-index 3e6c70d..80fceb9 100644
---- a/drivers/video/sprdfb/sprdfb_main.c
-+++ b/drivers/video/sprdfb/sprdfb_main.c
-@@ -51,7 +51,7 @@ enum{
- 	SPRD_IN_DATA_TYPE_LIMIT
- };
- 
--#define SPRDFB_IN_DATA_TYPE SPRD_IN_DATA_TYPE_ABGR888
-+#define SPRDFB_IN_DATA_TYPE SPRD_IN_DATA_TYPE_BGR565
- 
- #ifdef CONFIG_FB_TRIPLE_FRAMEBUFFER
- #define FRAMEBUFFER_NR		(3)

device/community/device-asus-me176c/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
-pkgver=5
-pkgrel=0
+pkgver=3
+pkgrel=4
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"
@@ -16,6 +16,7 @@ depends="
 	intel-ucode
 	linux-asus-me176c
 	mesa-dri-classic
+	mesa-vulkan-intel
 	postmarketos-base
 	"
 makedepends="devicepkg-dev meson eudev-dev"
@@ -23,13 +24,7 @@ source="https://github.com/me176c-dev/linux-me176c/archive/$_commit.tar.gz
 	deviceinfo
 	phoc.ini
 	"
-subpackages="
-	$pkgname-factory
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
-	$pkgname-vulkan
-	$pkgname-libva
-	"
+subpackages="$pkgname-factory $pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
 builddir="$srcdir/linux-me176c-$_commit"
 
 build() {
@@ -65,20 +60,8 @@ phosh() {
 		"$subpkgdir"/etc/phosh/phoc.ini
 }
 
-vulkan() {
-	install_if="$pkgname vulkan-loader"
-	depends="mesa-vulkan-intel"
-	mkdir "$subpkgdir"
-}
-
-libva() {
-	install_if="$pkgname libva"
-	depends="libva-intel-driver"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 75243e3d0bc9a352465683ec8cf8b83566e4131bb7fae0f388267a62bdbf4691c955ed034b30df550f921b771080688123ae8db144b72f786bf1677ef1d83f57  3155254999ac36c3051a2118c415de25a072c0f6.tar.gz
-c8bb189b08035e647e07dec120a6e166d871c17a227987387228c8bf6ff264e029f950c69bb560d3062cee0e27e4fb93449523592558108690a82c6d40931de1  deviceinfo
-3823556d741a352fc7f43567d7218255a27c45c2c5d4d4bdf23f4d26ce2828c5a1c642519b84fef7f59756c990e6a199d72e6ba0c277939b08a40526c3ff3714  phoc.ini
+8dfeb1d928aa3ac94e9015d4b98713ec4d56eab68a7aee8cb7ce6a877b3d015670800bae456190ae57bcb35047738de5559460f2f7b785987f1394b605119ae5  deviceinfo
+a60d1785f0163d4a4eb63ea5e3017631aab7dd6683baad6a74b09809d33888d581ca8b14526c19d18234dcf727d1fdb4ff0489ed4bd5523905d0e4da7d93bc56  phoc.ini
 "

device/community/device-asus-me176c/deviceinfo

@@ -6,7 +6,7 @@ deviceinfo_name="ASUS MeMO Pad 7 (ME176C(X))"
 deviceinfo_codename="asus-me176c"
 deviceinfo_manufacturer="ASUS"
 deviceinfo_year="2014"
-deviceinfo_modules_initfs="goodix"
+deviceinfo_modules_initfs="vfat nls_cp437 nls_iso8859_1 nls_utf8 goodix"
 deviceinfo_arch="x86_64"
 
 # Device related

device/community/device-asus-me176c/phoc.ini

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

device/community/device-bq-paella/APKBUILD

@@ -1,9 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Minecrell <minecrell@minecrell.net>
+# Maintainer: Jonathan Albrieux <jonathan.albrieux@gmail.com>
+# Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
 pkgver=6
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"

device/community/device-lenovo-a6000/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
-pkgver=6
-pkgrel=0
+pkgver=5
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -47,5 +47,5 @@ phosh() {
 
 sha512sums="
 c860b43edd7dcc2b10a7ee1dc8b2b7e225c469db6f7d45231b78e4e8a76bbe242b65e40488dcae2503ecdc407844eee50964db7b8d3a392a8f3f064afe690b99  deviceinfo
-10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
+cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  phoc.ini
 "

device/community/device-lenovo-a6000/phoc.ini

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

device/community/device-lenovo-a6010/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
-pkgver=6
-pkgrel=0
+pkgver=5
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -47,5 +47,5 @@ phosh() {
 
 sha512sums="
 f5971257def301439b3786dada60333ad34b15b2221a296698cff7a0a8f7c5c6a54547c91bb024a883fe8f4f5f0b2926c044acc24e240ce1caeaf77697caad75  deviceinfo
-10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
+cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  phoc.ini
 "

device/community/device-lenovo-a6010/phoc.ini

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

device/community/device-nokia-n900/APKBUILD

@@ -1,9 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Sicelo <absicsz@gmail.com>
+# Co-Maintainer: Martijn Braam <martijn@brixit.nl>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
 pkgver=8
-pkgrel=4
+pkgrel=3
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -12,6 +13,7 @@ depends="postmarketos-base linux-nokia-n900 u-boot-tools kbd kbd-bkeymaps ofono
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.post-install"
 subpackages="
+	$pkgname-weston
 	$pkgname-x11
 	$pkgname-i3wm
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -32,6 +34,7 @@ source="
 	pointercal
 	asound.state.speakers
 	asound.state.headset
+	weston.ini
 	i3wm/scripts/battery-bq27200
 	i3wm/scripts/ofono
 	i3wm/scripts/calendar
@@ -111,6 +114,12 @@ package() {
 		"$pkgdir"/usr/share/bkeymaps/se/rx51_se.bmap.gz
 }
 
+weston() {
+	install_if="$pkgname weston"
+	install -Dm644 "$srcdir"/weston.ini \
+		"$subpkgdir"/etc/xdg/weston/weston.ini
+}
+
 x11() {
 	install_if="$pkgname xorg-server"
 	install -D -m644 "$srcdir"/40-xkb.conf \
@@ -164,6 +173,7 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
+7f48d1a044f8c02f7b1d11487ec1f83978d9b0ea12529156e7418f82be556d9baee32b70c4d911174e388bb4941dc19519e93e7551d00ffcd825c848665ff096  weston.ini
 2ae4771eda9b151de3b47dc4e3081eb86b92fc04c4be4b4fbb98c28016762d24008e935bbba8f95ea0732019f615ee43f5d93dacb21bdc3471e505a07a684e26  battery-bq27200
 82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac  ofono
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar

device/community/device-nokia-n900/weston.ini

@@ -0,0 +1,8 @@
+[core]
+xwayland=true
+backend=fbdev-backend.so
+[Keyboard]
+keymap_rules=evdev
+keymap_model=nokiarx51
+[shell]
+background-image=/usr/share/wallpapers/postmarketos.jpg

device/community/device-odroid-hc2/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-odroid-hc2
 pkgdesc="ODROID HC2"
-pkgver=0.6
+pkgver=0.5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -40,8 +40,8 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="U-Boot, Samsung JPEG encoder, and Realtek firmware, required for a bootable system"
-	depends="firmware-odroid-hc2 linux-firmware-rtl_nic linux-firmware-other"
+	pkgdesc="U-Boot and Realtek firmware, required for a bootable system"
+	depends="firmware-odroid-hc2 linux-firmware-rtl_nic"
 	mkdir "$subpkgdir"
 }
 

device/community/device-oneplus-enchilada/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=7
+pkgver=5
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -16,7 +16,6 @@ depends="
 	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
 "
 makedepends="devicepkg-dev"
 source="
@@ -49,7 +48,7 @@ phosh() {
 }
 
 sha512sums="
-9b0603ceef02ec632ff333167b252743cc5461ae371b656a6468addf22d43ec10010d9348caebc9c21e2cdafb95af7bf6266ad405ac245779a325154d404bfde  deviceinfo
+009e1cfc0ae2823bb82dbc39a1b9c1199e0e7691f0e95a6423bbfe941e07486297e0aad295f2ea44d43ed51b1440bf8e6a67867d0c1a6aad653399afbd006c1d  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
 "

device/community/device-oneplus-enchilada/deviceinfo

@@ -39,5 +39,5 @@ deviceinfo_flash_kernel_on_update="true"
 deviceinfo_rootfs_image_sector_size="4096"
 
 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_pmi8998_charger bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_fg qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"

device/community/device-oneplus-fajita/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=7
+pkgver=5
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -16,7 +16,6 @@ depends="
 	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
 "
 makedepends="devicepkg-dev"
 source="deviceinfo phoc.ini"
@@ -43,6 +42,6 @@ phosh() {
 }
 
 sha512sums="
-8561a33c0e7d5085186258a71d2fc44daa01b24d05781d53be87222b462059fee26baa2e004e799404606429629e56baad3778d74d1f725cec389f572c92155e  deviceinfo
+cd8b94751890fd8891e5eafbc4f668a068885d184ad9b93366c882cfafa798e4bc77fa548532796a278b5acdf15dbf1110a1a581823567deaa00b90a72796959  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "

device/community/device-oneplus-fajita/deviceinfo

@@ -39,5 +39,5 @@ deviceinfo_flash_kernel_on_update="true"
 deviceinfo_rootfs_image_sector_size="4096"
 
 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_pmi8998_charger bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_fg qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"

device/community/device-pine64-pinebookpro/APKBUILD

@@ -2,14 +2,14 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
-pkgver=10
-pkgrel=0
+pkgver=9
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf>=1.2.7
+	alsa-ucm-conf
 	linux-postmarketos-rockchip>=5.14
 	mesa-dri-gallium
 	nvme-cli
@@ -27,6 +27,8 @@ source="
 	70-edp-backlight.rules
 	mem_sleep.conf
 	nvme-powersave.initd
+	ucm/rockchip,es8316-codec.conf
+	ucm/HiFi
 	wlan-powersave-off.start
 "
 
@@ -47,6 +49,11 @@ package() {
 	install -D -m644 "$srcdir"/mem_sleep.conf \
 		"$pkgdir"/etc/sysfs.d/mem_sleep.conf
 
+	# Alsa usecase manager config
+	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card \
+		"$srcdir"/rockchip,es8316-codec.conf \
+		"$srcdir"/HiFi
+
 	install -D -m755 "$srcdir"/nvme-powersave.initd \
 		"$pkgdir"/etc/init.d/nvme-powersave
 
@@ -69,5 +76,7 @@ d3988fe83c54228d743f4a8c190e9530404a436a7fbc0b004bf20d3986b502d864717d8cc9c76812
 6e9e9ef54ee9aa9491be6dc30451fdcd9038b0efeb959509f48626d97a1696ee81711a46510049557b73269ff48acc85fad6496c65451e2e24908241b7655444  70-edp-backlight.rules
 bcae155e24a151d3c098833680b83b6004a329962f115480d560ebe19257eab87286b8a4c194e456c067ca54fb53e59a5a16b022cea13c11135b0855145db563  mem_sleep.conf
 2abfa31fa56028339efc6d2b6cb838f310990d7110ac4dd996bc4cfcf90f0a8770e70f28f77f7b6929d110e494bc33731302f16b9717729f991c2732be0731d5  nvme-powersave.initd
+71a3ea790eedd02df2bcf2ba24cc41b376ad0a8a7d72b1ee2dd7a0f9d618243d214157046649583f790b388d8faef5a03fcd4306ff4a3319e418bb895be831bc  rockchip,es8316-codec.conf
+558f08b56425e0ceeea8d4815eeb862a2b801ba1b26b4dc28f4d0ec991ed9dfef14113172a224191eb2de5d0b57a741e4c48f1307bda2a69595944bd58731be1  HiFi
 0fd7580e197e409978c219726af627cabe347404ee826e32892b61f3da1775b0fd81f8ed5e9a0f0bfaad87faa434d7a73ddaebf475ed0ad8fdcef6690cd692d3  wlan-powersave-off.start
 "

device/community/device-pine64-pinebookpro/ucm/HiFi

@@ -0,0 +1,61 @@
+SectionVerb {
+	EnableSequence [
+		cset "name='Headphone Playback Volume' 0"
+		cset "name='Headphone Mixer Volume' 100%"
+		cset "name='DAC Playback Volume' 100%"
+		cset "name='DAC Source Mux' LDATA TO LDAT, RDATA TO RDAC"
+		cset "name='Left Headphone Mixer Left DAC Switch' on"
+		cset "name='Left Headphone Mixer LLIN Switch' off"
+		cset "name='Right Headphone Mixer Right DAC Switch' on"
+		cset "name='Right Headphone Mixer RLIN Switch' off"
+	]
+	DisableSequence [
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+		CapturePCM "hw:${CardId},0"
+	}
+}
+
+SectionDevice."Speaker" {
+	Comment "Internal speaker"
+	EnableSequence [
+		cset "name='Headphone Playback Volume' 0"
+		cset "name='Headphone Mixer Volume' 100%"
+		cset "name='Speaker Switch' on"
+	]
+	DisableSequence [
+		cset "name='Speaker Switch' off"
+	]
+	Value {
+		PlaybackVolume "DAC Playback Volume"
+		PlaybackSwitch "Speaker Switch"
+		PlaybackChannels 2
+		PlaybackPriority 300
+		PlaybackPCM "hw:${CardId},0"
+	}
+	ConflictingDevice [
+		"Headphones"
+	]
+}
+SectionDevice."Headphones" {
+	Comment "Headset"
+	EnableSequence [
+		cset "name='Headphone Playback Volume' 50%"
+		cset "name='Headphone Mixer Volume' 100%"
+		cset "name='Speaker Switch' off"
+	]
+	DisableSequence [
+	]
+	Value {
+		PlaybackVolume "DAC Playback Volume"
+		PlaybackChannels 2
+		PlaybackPriority 500
+		PlaybackPCM "hw:${CardId},0"
+		JackControl "Headphones Jack"
+	}
+	ConflictingDevice [
+		"Speaker"
+	]
+}

device/community/device-pine64-pinebookpro/ucm/rockchip,es8316-codec.conf

@@ -1,6 +1,6 @@
 Syntax 2
 
 SectionUseCase."HiFi" {
-	File "HiFi.conf"
+	File "/rockchip_es8316/HiFi"
 	Comment "Play high quality music"
 }

device/community/device-pine64-pinephonepro/90-modem-eg25.rules

@@ -1,12 +0,0 @@
-SUBSYSTEMS=="usb", ENV{.LOCAL_ifNum}="$attr{bInterfaceNumber}"
-
-SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="01", SYMLINK+="EG25.NMEA", MODE="0660"
-SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", SYMLINK+="EG25.AT", MODE="0660"
-SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="03", SYMLINK+="EG25.MODEM", MODE="0660"
-
-ACTION=="add", SUBSYSTEM=="tty", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", RUN+="/usr/bin/pinephone_setup-modem '%E{DEVNAME}'"
-
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTRS{serial}=="0123456789ABCDEF", ATTR{power/persist}="1", ATTR{power/control}="on"
-
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTRS{serial}=="community_fw", ATTR{power/persist}="1", ATTR{power/control}="on"
-

device/community/device-pine64-pinephonepro/APKBUILD

@@ -1,123 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Martijn Braam <martijn@brixit.nl>
-pkgname=device-pine64-pinephonepro
-pkgdesc="PINE64 PinePhone Pro"
-pkgver=3.2
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-# pmb:strict is required for grub
-options="!check !archcheck pmb:strict"
-depends="
-	alsa-ucm-conf>=1.2.6.2
-	eg25-manager>=0.4.2
-	linux-pine64-pinephonepro
-	mesa-dri-gallium
-	postmarketos-base
-	fwupd
-	fwupd-plugin-modem_manager
-	fwupd-plugin-fastboot
-	"
-makedepends="
-	devicepkg-dev
-	grub
-	grub-efi
-	"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-install="
-	$pkgname.post-install
-	$pkgname.post-upgrade
-	"
-source="
-	90-modem-eg25.rules
-	deviceinfo
-	grub.cfg
-	grub_early.cfg
-	ucm/HiFi.conf
-	ucm/PINE64-PinePhonePro-.conf
-	ucm/VoiceCall.conf
-	ppkb.sh
-	setup-modem.sh
-	"
-
-build() {
-	devicepkg_build $startdir $pkgname
-
-	grub-mkimage \
-		--config="$srcdir/grub_early.cfg" \
-		--prefix="" \
-		--output="bootaa64.efi" \
-		--format="arm64-efi" \
-		--compression="xz" \
-		\
-		all_video \
-		cat \
-		configfile \
-		disk \
-		echo \
-		efi_gop \
-		fat \
-		gzio \
-		help \
-		iso9660 \
-		linux \
-		ls \
-		normal \
-		part_gpt \
-		part_msdos \
-		search \
-		search_label \
-		test \
-		true
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-
-	# Grub / bootloader
-	install -Dm644 -t "$pkgdir"/boot/grub \
-		"$srcdir"/grub.cfg
-	install -Dm644 -t "$pkgdir"/boot/EFI/Boot \
-		"$srcdir"/bootaa64.efi
-
-	# Alsa usecase manager config
-	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/PinePhonePro \
-		"$srcdir"/HiFi.conf \
-		"$srcdir"/PINE64-PinePhonePro-.conf \
-		"$srcdir"/VoiceCall.conf
-	mkdir -p "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card
-	ln -s /usr/share/alsa/ucm2/PinePhonePro/PINE64-PinePhonePro-.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card/PINE64-PinePhonePro-.conf
-
-	# Modem
-	install -Dm755 "$srcdir"/setup-modem.sh \
-		"$pkgdir"/usr/bin/pinephone_setup-modem
-	install -Dm644 "$srcdir"/90-modem-eg25.rules -t \
-		"$pkgdir"/usr/lib/udev/rules.d/
-
-	# Keyboard config
-	install -Dm755 "$srcdir"/ppkb.sh "$pkgdir"/etc/profile.d/ppkb.sh
-}
-
-nonfree_firmware() {
-	pkgdesc="Wifi, Bluetooth and video-out firmware"
-	depends="
-		firmware-pine64-pinebookpro
-		linux-firmware-brcm
-		linux-firmware-rockchip
-		"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-fdfa807c0de33aee3deb09ee25c37a58fa970ce71483e52f21793717cb89adeb74f251ff1a2c2086361e3e58877f8b2e5643f24186b1a537acf9c16e3419313c  90-modem-eg25.rules
-e591572d0bfc4d7d990fcc15bc82e78e60404becf62a38283b4ceee6f49a812b63eebbc5c304907330e33dce5f023edba26c9b86f1375affa3cf6b49fbd06539  deviceinfo
-eeddbd3712c7385ef8daea252d71f9f91f8be03be43dea4ce036ae7d7b8a38d199a709ae87b9aa8fe8a63f0201224dbda704fd4b95c8c7d3b4f9852ae4e95c11  grub.cfg
-0f9357d4eea089628fbceb1e3e96d21a3f4329aeb6743158a6f877f967ef274506404eba949d5f01b7e1adea149f9a3aef992a5e8cd4181f93ab00909b1c5ecd  grub_early.cfg
-1684514a6b814a83473e9da8855fd776cf3f31a2be1f8834c370f710428b4ee305559e275be52894d167ccd1e32f8f1c8586f8a072f19e44b46caec9f504d453  HiFi.conf
-9c6edbe7ea387baf9bfa6c4a46b28c4fe274ab0994e0a1640012048407e6679c437de43cc50e6778c9a852132eaa680de3fd4e0256d36455d1dd57aa729ac8be  PINE64-PinePhonePro-.conf
-deb360baf914e1c917403d5e26291b9e9d27426876232ab753e4ebfe367423206f1fc01b85d195aa69fb4b51bcaed023423d0fcc0d73fa1bedd5fbe7b17f0fb5  VoiceCall.conf
-43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
-420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515  setup-modem.sh
-"

device/community/device-pine64-pinephonepro/ppkb.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-export XKB_DEFAULT_MODEL=ppkb

device/community/device-pine64-pinephonepro/setup-modem.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-log() {
-	echo "$@" | logger -t "postmarketOS:modem-setup"
-}
-
-QMBNCFG_CONFIG="1"
-
-if [ -z "$1" ]
-then
-	DEV="/dev/EG25.AT"
-else
-	DEV="$1"
-fi
-
-# Read current config
-QMBNCFG_ACTUAL_CONFIG=$(echo 'AT+QMBNCFG="AutoSel"' | atinout - $DEV -)
-
-if echo $QMBNCFG_ACTUAL_CONFIG | grep -q $QMBNCFG_CONFIG
-then
-	log "Modem already configured"
-	exit 0
-fi
-
-
-# Configure VoLTE auto selecting profile
-RET=$(echo "AT+QMBNCFG=\"AutoSel\",$QMBNCFG_CONFIG" | atinout - $DEV -)
-if ! echo $RET | grep -q OK
-then
-	log "Failed to enable VoLTE profile auto selecting: $RET"
-	exit 1
-fi

device/community/device-pine64-pinetab/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Dylan Van Assche <me@dylanvanassche.be>
 pkgname=device-pine64-pinetab
 pkgdesc="PINE64 PineTab"
-pkgver=0.13
-pkgrel=2
+pkgver=0.12
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -120,12 +120,9 @@ package() {
 	devicepkg_package $startdir $pkgname
 
 	# Alsa usecase manager config
-	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/PineTab \
-		"$srcdir"/HiFi.conf \
-		"$srcdir"/PineTab.conf
-	mkdir -p "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card
-	ln -s /usr/share/alsa/ucm2/PineTab/PineTab.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card/PineTab.conf
+	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card \
+		"$srcdir"/PineTab.conf \
+		"$srcdir"/HiFi.conf
 
 	# Pulseaudio config
 	install -Dm644 "$srcdir"/pulse-pinetab.conf \
@@ -165,7 +162,7 @@ sha512sums="
 6274b664ad42456ff51ec4ec2dea9749bff59e0eee0c2d1f7e8950934ee92e410e554df246f81bd01813ddfae5e6a9001a8fcad05815beab536d1547251d5aeb  deviceinfo
 9244687bfea20c78120f7c48388d141eff3e23a421e48504eac1479ec7f51197d9ca72468c9cc33c6e3d3fa32ee3514711545816e607d49870226e4a41a60a85  gsk-renderer-gl.sh
 6bc22b369b2d9058b702ac7a7862abaefaf8179b43491868bdb008d181b59104f1ded89db1da51a810e1ccdc803a579b924a438674283a65afc3a9c4d2894caf  kirigami-lowpower.sh
-5c683f2cf27b2f982c8581251688834634957143334011861400d3eed27b6590f37055fe61c8af632552435dba581fa990a44c1e5689a3c8fe642fd095b740ce  phoc.ini
+38827d9636c48b133eb333764a6799a6e93454e01ecb0cfde1ecad3ee149606ba59eb1a5e6c8366e3b3891e54bd664a0a5acdd89d38ac3a3551260e9b9a6d3fc  phoc.ini
 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2  sway.conf
 181438ed8723c29bf201a5d4ad1ae588afcd03763deadb267b23d96ad40c8956e08b2e3b800f4ee5d77774625d0b0e6a70c4068f98fbfad50d31e71b30a24164  uboot-script.cmd
 a2fd8037c9a1af000f31c7005436d791525317f818c553d1e2f472b4df76c71d769ecbf67b369a478bea720a6215eaa9fb6a26ba218ac9410513e2345ebe7b4c  HiFi.conf

device/community/device-pine64-pinetab/phoc.ini

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

device/community/device-samsung-a3/APKBUILD

@@ -4,8 +4,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
-pkgver=11
-pkgrel=0
+pkgver=10
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -57,5 +57,5 @@ phosh() {
 
 sha512sums="
 dac014f2ebc1c461e43917fcfc020675c10ac39e17b83b0e0e2246b159db1f61ce024df21624f2635729f29521b30b4cce29b4451931cb27cf4d0f34b19ec509  deviceinfo
-e8f734a2f8d154813dbb493f0d58af50a7f624ffed41967a81493b975a6211efc6d30743b23825562cfd126791cbdd3348bfbed32eeece9b8acec0a37c3c51b6  phoc.ini
+f3667b914bb955be9e97db31dc7ed4a7c5d0c369be9549d587bb7208e270590c0c3fa36a0dd997d6f8305c5c9afb3b906423af6ca8724e806f995e61226cfc83  phoc.ini
 "

device/community/device-samsung-a3/phoc.ini

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

device/community/device-samsung-gt510/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -52,5 +52,5 @@ phosh() {
 sha512sums="
 5acddf5145a0ec2cbe056bd120b1413fd6efee441f15127ce6f132ab470f326ba729f71afc70ba4d8dc9dab62e49fa20217632f08f9ed6d5b2ddda033ed32009  deviceinfo
 6aedd5eeac4d21356678f5399f3f0946392c9a7477ac21d39b8e761133dc8ed67adb4966647314f71d5263483ab68cad92847dacff95ffa45eabfc33c9f405b5  pointercal
-ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
+bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  phoc.ini
 "

device/community/device-samsung-gt510/phoc.ini

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

device/community/device-samsung-gt58/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -47,5 +47,5 @@ phosh() {
 
 sha512sums="
 b374fc9b75b0693a27c94116f652410a0b026077beba91527104fd0e3e720ddec0c1e48b54714af810b514571d5f2021f8facf34a9ea8de35b92aa060af64d19  deviceinfo
-ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
+bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  phoc.ini
 "

device/community/device-samsung-gt58/phoc.ini

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

device/community/device-samsung-serranove/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=12
-pkgrel=0
+pkgver=11
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -53,5 +53,5 @@ phosh() {
 
 sha512sums="
 d666cf805d292d13d9e15a350b203580f016f455dad16cbc4a94471edb145fd464c5ad92a50077995234a9db1322e605e0294a6c5d7342fa6675b1bfec4eb69e  deviceinfo
-1bc90a1a67309b43435039332b2a1d7e606408c6429b3cb8991a57f53dd4de36fbe471481b6481fbdb098c3819344e8093dd8eab0d34eb3c091ab6d8abd5c087  phoc.ini
+94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea  phoc.ini
 "

device/community/device-samsung-serranove/phoc.ini

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

device/community/device-xiaomi-beryllium/APKBUILD

@@ -4,8 +4,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=7
-pkgrel=0
+pkgver=5
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -66,7 +66,7 @@ phosh() {
 }
 
 sha512sums="
-399e430a7340755c39680e436141dc141b38669791664bfb6d902bf4994516305fdf3e0e088717f60dc24faf64e0993c8695572f1afb7875a46548f494fdb54d  deviceinfo
+29090e3d3fc16a752b33910abcfd8719af34bd257a7ca3cf25e9f1afc49e20582a7505bd7cd2ea2eb274c834eead277f31e5fb9384de8b444500518275e5a711  deviceinfo
 e2e417169345c86a5dd34ac0afac4b2b983a755f4c7ba5698c385a01f96b9bd2c3ace1ce5a0569c121675e8b87e88e1cf5c648e995d9c50cba66e52bbc83753c  phoc.ini
 7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
 "

device/community/device-xiaomi-beryllium/deviceinfo

@@ -37,5 +37,5 @@ deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 
 # osk-sdl
-deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni qcom_pmi8998_charger qcom_fg nt36xxx"
-deviceinfo_modules_initfs_ebbg="gpi i2c_qcom_geni qcom_pmi8998_charger qcom_fg focaltech_fts"
+deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni nt36xxx"
+deviceinfo_modules_initfs_ebbg="gpi i2c_qcom_geni focaltech_ft8719"

device/community/device-xiaomi-scorpio/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=4
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -22,11 +22,10 @@ makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
 
 source="
-	30-gpu-firmware.files
 	deviceinfo
-	gpu-nobin.sh
 	pointercal
 	phoc.ini
+	30-gpu-firmware.files
 	"
 
 build() {
@@ -38,9 +37,6 @@ package() {
 
 	install -D -m644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
-
-	install -D -m644 "$srcdir"/gpu-nobin.sh \
-		"$pkgdir"/etc/profile.d/gpu-nobin.sh
 }
 
 nonfree_firmware() {
@@ -66,9 +62,8 @@ phosh() {
 
 
 sha512sums="
-a1ca623314e80045ea8d64be06d12ffc091a5585ca40f9713039883e20889ba47f4a3f9c3bd92bd3b616bb6bb621e87409b6b6fa43bfe566a2a46468609c16f4  30-gpu-firmware.files
-52ba13a75f14c8d75a719f463a870df34eb59765bd43f29a49fb0dff201410fa388a04f73ec8e6e86d634547bf6ef0164466333b24da36d882b0d7254bfbe213  deviceinfo
-ecd40b8f9bc17f383c52aa96ad23ceec41be75a4500d5e7a67f2f59875bf9f72eb35686a0b6e4949b45fd589c5da409d1212c52172fef94de2d1655b28c339b4  gpu-nobin.sh
+f0f2f6598947e8261607f259bb869e2845b08a5c1df28126bc705f8e7a11547e5702395741da5a7f50a41e17e6840b9ef01a4e3248b387b4d00510aef54118ee  deviceinfo
 e9ee9c1404b41ba15eafff3f728ff6e0e78dc17e9a88483fca92db1aa3efe0e4d5bf26142e533c4ff12b1bf8ce04ccabb7ca0f93aaea586d5b30910282aad237  pointercal
 38409d4ce48db4624539dbfd695d3c6e1596a29fd7c3004a41368b28cba646495d05360420ad728f82c63d6ddeeca71d09944df06ebaca120aedd9cc2b436eb3  phoc.ini
+a1ca623314e80045ea8d64be06d12ffc091a5585ca40f9713039883e20889ba47f4a3f9c3bd92bd3b616bb6bb621e87409b6b6fa43bfe566a2a46468609c16f4  30-gpu-firmware.files
 "

device/community/device-xiaomi-scorpio/deviceinfo

@@ -6,7 +6,7 @@ deviceinfo_name="Xiaomi Mi Note 2"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-scorpio"
 deviceinfo_year="2016"
-deviceinfo_dtb="qcom/msm8996pro-xiaomi-scorpio"
+deviceinfo_dtb="qcom/msm8996-xiaomi-scorpio"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs="atmel_mxt_ts msm panel-lgphilips-sw43101 qcom_fg"
 deviceinfo_arch="aarch64"

device/community/device-xiaomi-scorpio/gpu-nobin.sh

@@ -1,2 +0,0 @@
-export FD_MESA_DEBUG=nobin
-

device/community/firmware-qcom-adreno/APKBUILD

@@ -1,5 +1,5 @@
 pkgname=firmware-qcom-adreno
-pkgver=20220509
+pkgver=20210919
 pkgrel=0
 pkgdesc="Qualcomm Adreno GPU firmware from linux-firmware"
 url="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
@@ -15,7 +15,7 @@ builddir="$srcdir/linux-firmware-$pkgver"
 replaces="linux-firmware-qcom"
 _fwdir="/lib/firmware/qcom"
 
-_gpus="a300 a330 a420 a530 a630 a650 a660"
+_gpus="a300 a530 a630 a650 a660"
 for gpu in $_gpus; do
 	subpackages="$subpackages $pkgname-$gpu:_gpu"
 done
@@ -37,5 +37,5 @@ _gpu() {
 }
 
 sha512sums="
-0591a35a14a6994ac60571a8e47c00ec013afbfedd4b3326cfe1971b9bd9a07ca7622b17177b3fb57a6c244d2caae12318fcbfac5da5f78a2c085285c9d85cf6  linux-firmware-20220509.tar.gz
+94628158011e65dd65225e687823fc3611b2b2d431b3484a66108959c7fafbcdc0a7be73b7b9e1d1a2d62d40cb7bd81e33d96d822a7b159adc15894607a76a31  linux-firmware-20210919.tar.gz
 "

device/community/firmware-qcom-db410c-wcnss/APKBUILD

@@ -1,46 +0,0 @@
-pkgname=firmware-qcom-db410c-wcnss
-pkgver=1034.2.1
-pkgrel=3
-pkgdesc="DragonBoard 410c WiFi/BT firmware"
-url="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/"
-subpackages="$pkgname-doc"
-arch="aarch64 armv7"
-license="custom"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-makedepends="mtools pil-squasher"
-source="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/linux-board-support-package-r$pkgver.zip"
-builddir="$srcdir/linux-board-support-package-r$pkgver"
-
-# This package is a replacement for linux-firmware-qcom (packaging only necessary
-# firmware plus some missing ones), so it's packaged in /qcom, not /postmarketos.
-replaces="linux-firmware-qcom"
-_fwdir="/lib/firmware/qcom"
-
-unpack() {
-	default_unpack
-
-	# Extract firmware files from FAT file system image
-	mcopy -i "$builddir"/bootloaders-linux/NON-HLOS.bin -p -m -v \
-		::image/wcnss.* "$builddir"
-}
-
-build() {
-	pil-squasher wcnss.mbn wcnss.mdt
-}
-
-package() {
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-	install -Dm644 NOTICE.txt "$pkgdir"/usr/share/licenses/$pkgname/NOTICE
-
-	# Use this firmware by default for devices that can use unsigned firmware
-	provides="firmware-qcom-msm8916-wcnss"
-	provider_priority=100
-
-	install -Dm644 "$builddir"/wcnss.mbn -t "$pkgdir/$_fwdir"/apq8016/
-
-	# Still link to old location in case this is installed on other devices
-	mkdir -p "$pkgdir"/lib/firmware/postmarketos
-	ln -s "$_fwdir"/apq8016/wcnss.mbn "$pkgdir"/lib/firmware/postmarketos/wcnss.mdt
-}
-
-sha512sums="4b5d0250552ff3b0a55af9395e62064299a1240f22a5f50383de95723db964351412fa2b38f24fe73fdeb613366e0eb6b3c335600c238546db783ca84647e2d2  linux-board-support-package-r1034.2.1.zip"

device/community/firmware-qcom-db410c/APKBUILD

@@ -1,11 +1,11 @@
 pkgname=firmware-qcom-db410c
-pkgver=1036.1
-pkgrel=0
+pkgver=1034.2.1
+pkgrel=2
 pkgdesc="Firmware for DragonBoard 410c"
 url="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/"
 subpackages="
 	$pkgname-doc
-	$pkgname-wcnss-nv:wcnss_nv
+	$pkgname-wcnss $pkgname-wcnss-nv:wcnss_nv
 	$pkgname-modem
 	$pkgname-venus
 "
@@ -26,10 +26,11 @@ unpack() {
 
 	# Extract firmware files from FAT file system image
 	mcopy -i "$builddir"/bootloaders-linux/NON-HLOS.bin -p -m -v \
-		::image/mba.mbn ::image/modem.* "$builddir"
+		::image/mba.mbn ::image/modem.* ::image/wcnss.* "$builddir"
 }
 
 build() {
+	pil-squasher wcnss.mbn wcnss.mdt
 	pil-squasher modem.mbn modem.mdt
 	pil-squasher venus.mbn proprietary-linux/venus.mdt
 }
@@ -45,8 +46,19 @@ modem() {
 	install -Dm644 "$builddir"/modem.mbn -t "$subpkgdir/$_fwdir"/apq8016/
 }
 
-# For some reason the wcnss firmware in r1036.1 is actually older than the one
-# in r1034.2.1, so firmware-qcom-db410c-wcnss is packaged separately.
+wcnss() {
+	pkgdesc="DragonBoard 410c WiFi/BT firmware"
+
+	# Use this firmware by default for devices that can use unsigned firmware
+	provides="firmware-qcom-msm8916-wcnss"
+	provider_priority=100
+
+	install -Dm644 "$builddir"/wcnss.mbn -t "$subpkgdir/$_fwdir"/apq8016/
+
+	# Still link to old location in case this is installed on other devices
+	mkdir -p "$subpkgdir"/lib/firmware/postmarketos
+	ln -s "$_fwdir"/apq8016/wcnss.mbn "$subpkgdir"/lib/firmware/postmarketos/wcnss.mdt
+}
 
 wcnss_nv() {
 	pkgdesc="DragonBoard 410c WiFi/BT firmware configuration"
@@ -66,6 +78,4 @@ venus() {
 	install -Dm644 "$builddir"/venus.mbn "$subpkgdir/$_fwdir"/venus-1.8/venus.mdt
 }
 
-sha512sums="
-99316352669c488b26d93353e0408c0b761809f41b9e13630fdf4de393e36f72477847bd2f8e893e8c98bb94c82a615d3fc4a615db1055df7314269c514bae0e  linux-board-support-package-r1036.1.zip
-"
+sha512sums="4b5d0250552ff3b0a55af9395e62064299a1240f22a5f50383de95723db964351412fa2b38f24fe73fdeb613366e0eb6b3c335600c238546db783ca84647e2d2  linux-board-support-package-r1034.2.1.zip"

device/community/firmware-xiaomi-beryllium/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Joel Selvaraj <jo@jsfamily.in>
 
 pkgname=firmware-xiaomi-beryllium
-pkgver=6
+pkgver=5
 pkgrel=0
 pkgdesc="Firmware for Xiaomi Poco F1"
 url="https://gitlab.com/sdm845-mainline/firmware-xiaomi-beryllium"
@@ -27,5 +27,5 @@ package() {
 
 sha512sums="
 41fdd771fe73e31bdce6088fdeb7686205f61b9888612fa83ac914e4bb524d22bba63894376a671d3acb19e90316a3d2eafdfb5425360ba53e41a38b9fd753ae  firmware-xiaomi-beryllium.tar.gz
-db32c8df77632e763c1ca3e80cee1ee2528c4986c944511c726add6e13fca6552ae63f6d436800439b7e615fd0c09f234888a68e4a6ff6663afe3dc593d6a7b0  firmware.files
+aa320245e6e6827cd23153729d52072a41c91ed12dc2bc5e3648df700561321dfd1ca51cc699945f57a1e36028a1e99adb4007889a2f91b9c0d445c251b2f51c  firmware.files
 "

device/community/firmware-xiaomi-beryllium/firmware.files

@@ -1,3 +1,4 @@
+./lib/firmware/ath10k/WCN3990/hw1.0/board-2.bin
 ./lib/firmware/tas2559_uCDSP.bin
 ./lib/firmware/qcom/sdm845/beryllium/adsp.mbn
 ./lib/firmware/qcom/sdm845/beryllium/a630_zap.mbn
@@ -11,4 +12,4 @@
 ./lib/firmware/qcom/sdm845/beryllium/adspua.jsn
 ./lib/firmware/qcom/sdm845/beryllium/cdspr.jsn
 ./lib/firmware/qcom/sdm845/beryllium/modemr.jsn
-./lib/firmware/qcom/sdm845/beryllium/modemuw.jsn
+./lib/firmware/qcom/sdm845/beryllium/modemuw.jsn

device/community/firmware-xiaomi-scorpio/APKBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Yassine Oudjana (Tooniis) <y.oudjana@protonmail.com>
 pkgname=firmware-xiaomi-scorpio
-pkgver=3
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Xiaomi Mi Note 2"
 url="https://gitlab.com/Tooniis/firmware-xiaomi-scorpio"
@@ -8,30 +8,22 @@ arch="aarch64"
 license="proprietary"
 options="!strip !check !archcheck !tracedeps pmb:cross-native"
 
-_commit="4c7763beb4de1fc4ff0da99e7fd43ea767fac2e7"
-source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
+_commit="9412b604f4908566830023f9434c3ebf47a5d32d"
 
-_mbns="
-	a530_zap.mbn
-	adsp.mbn
-	mba.mbn
-	modem.mbn
-	slpi.mbn
-	venus.mbn
+source="
+	$pkgname.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
+	firmware.files
 	"
 
 package() {
 	cd "$srcdir/$pkgname-$_commit/"
-
-	# Install MBNs
-	for _i in $_mbns; do
-		install -Dm644 $_i "$pkgdir/lib/firmware/qcom/msm8996/scorpio/$_i"
-	done
-
-	# Install QCA6174 board firmware
-	install -Dm644 board-2.bin "$pkgdir/lib/firmware/postmarketos/ath10k/QCA6174/hw3.0/board-2.bin"
+	while IFS="" read -r _i || [ -n "$_i" ]; do
+		[ ! -d $(dirname $_i) ] && mkdir -p $(dirname $_i)
+		echo $_i
+		install -Dm644 $_i "$pkgdir/$_i"
+	done < "$srcdir/firmware.files"
 }
-
 sha512sums="
-b8be4f664608f88e8140c7182e855fbf5078d23445bba14cb2242a9ea785678ab88b4584b0dc35d6325693e911bdf3c1b8ff3913414c7a1f2e0eae75692a2e45  firmware-xiaomi-scorpio-4c7763beb4de1fc4ff0da99e7fd43ea767fac2e7.tar.gz
+84183c62bf7a432507b975892b1f1099a1ac6cf9b0f1c4e12924c3bd9c9f0989eacc964555d96ece861895dc252cac50f185c5b44aee9500d6b42762291d0b4c  firmware-xiaomi-scorpio.tar.gz
+2c909dcf7ea542fec51b34f31f29ef85e7aa745c5237df51ac7498ebaa40ee704e2fa7c67fbb72f747b598963bd8828bc4d131f3f54ddcc7f99d731ef74c504f  firmware.files
 "

device/community/firmware-xiaomi-scorpio/firmware.files

@@ -0,0 +1,6 @@
+./lib/firmware/qcom/msm8996/scorpio/a530_zap.mbn
+./lib/firmware/qcom/msm8996/scorpio/adsp.mbn
+./lib/firmware/qcom/msm8996/scorpio/mba.mbn
+./lib/firmware/qcom/msm8996/scorpio/modem.mbn
+./lib/firmware/qcom/msm8996/scorpio/slpi.mbn
+./lib/firmware/qcom/msm8996/scorpio/venus.mbn

device/community/linux-asus-me176c/APKBUILD

@@ -3,7 +3,7 @@
 
 _flavor="asus-me176c"
 pkgname=linux-$_flavor
-pkgver=5.4.197
+pkgver=5.4.165
 _kernver=${pkgver%.*}
 _me176cver=5.4.17
 pkgrel=0
@@ -64,7 +64,7 @@ package() {
 
 sha512sums="
 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-74d40207bec5273988759660cee5d5ed4fdd993ca92027a726d4d4f45a23c2c86f4a42fc060af8bcf2a367cab8c17f19eccb85c7f473e11bae6c5cac405c32dc  linux-5.4.197.patch.xz
+c64606085a57f7068f393fe4ae62733602cf84709fe9599bfc18f066700766dbafa5ce9c93e50bfbeca7f4663b38da376a8460a53901f1edf5b07c1c3d552602  linux-5.4.165.patch.xz
 aa462bfcbba87469a617e2ffd4058cd41137b74f836aae47ac89bc70de2836b8f3ddce94f597e61bb287eb009bb71f4e831c487b0073011673d5db4a8d8ae080  linux-me176c-5.4.17.patch.xz
-c4ad6bfb37990a51ee83b8791bc6f9fb47ccd566de0282deb595a00d9a4787e13e1a01810212a966e3e8090c61bd513869af346704b8c2f22c7bbeea5e8eada4  config-asus-me176c.x86_64
+56d565703da993f1908948b2232e42625783c18ef3e7053f71e3c808e98d35a472c27b32b7afcd91838b5ac6850bf6284d4c3bd7017e2964b80f4d9617952807  config-asus-me176c.x86_64
 "

device/community/linux-asus-me176c/config-asus-me176c.x86_64

@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.197 Kernel Configuration
+# Linux/x86_64 5.4.159 Kernel Configuration
 #
 
 #
-# Compiler: gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219
+# Compiler: gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110201
+CONFIG_GCC_VERSION=100301
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -233,7 +233,6 @@ CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
@@ -783,8 +782,12 @@ CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC=""
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -2035,7 +2038,6 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
@@ -2651,6 +2653,7 @@ CONFIG_IEEE802154_HWSIM=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
+# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -6497,11 +6500,17 @@ CONFIG_LSM="yama"
 #
 # Kernel hardening options
 #
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
 
 #
 # Memory initialization
 #
-CONFIG_INIT_STACK_NONE=y
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+# CONFIG_GCC_PLUGIN_STACKLEAK is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization

device/community/linux-nokia-n900/0002-ARM-dts-n900-remove-rx51-battery.patch

@@ -0,0 +1,31 @@
+From 35e9c94fb265213848d4cd2b0d062dec62cdfb0a Mon Sep 17 00:00:00 2001
+From: Arthur Demchenkov <spinal.by@gmail.com>
+Date: Fri, 14 Dec 2018 16:36:04 +0300
+Subject: [PATCH] ARM: dts: n900: remove rx51-battery
+
+N900 has bq27200 chip, which provides much better
+functionality when exposing battery properties.
+
+No need to confuse userspace with two battery devices
+exposed by the kernel at the same time.
+---
+ arch/arm/boot/dts/omap3-n900.dts | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
+index 826920e6b8787..de7a31ae72207 100644
+--- a/arch/arm/boot/dts/omap3-n900.dts
++++ b/arch/arm/boot/dts/omap3-n900.dts
+@@ -137,12 +137,6 @@
+ 		speaker-amplifier-gpios = <&twl_gpio 7 GPIO_ACTIVE_HIGH>;
+ 	};
+ 
+-	battery: n900-battery {
+-		compatible = "nokia,n900-battery";
+-		io-channels = <&twl_madc 0>, <&twl_madc 4>, <&twl_madc 12>;
+-		io-channel-names = "temp", "bsi", "vbat";
+-	};
+-
+ 	pwm9: dmtimer-pwm {
+ 		compatible = "ti,omap-dmtimer-pwm";
+ 		#pwm-cells = <3>;

device/community/linux-nokia-n900/0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch

@@ -1,115 +0,0 @@
-commit 68fdbe090c362e8be23890a7333d156e18c27781
-Author: Sicelo A. Mhlongo <absicsz@gmail.com>
-Date:   Wed Apr 20 14:30:59 2022 +0200
-
-    power: supply: bq27xxx: expose battery data when CI=1
-    
-    When the Capacity Inaccurate flag is set, the chip still provides data
-    about the battery, albeit inaccurate. Instead of discarding capacity
-    values for CI=1, expose the stale data and use the
-    POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED property to indicate that the
-    values should be used with care.
-    
-    Reviewed-by: Pali Rohár <pali@kernel.org>
-    Signed-off-by: Sicelo A. Mhlongo <absicsz@gmail.com>
-    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-
-diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
-index 72e727cd31e8..35e6a394c0df 100644
---- a/drivers/power/supply/bq27xxx_battery.c
-+++ b/drivers/power/supply/bq27xxx_battery.c
-@@ -1572,14 +1572,6 @@ static int bq27xxx_battery_read_charge(struct bq27xxx_device_info *di, u8 reg)
-  */
- static inline int bq27xxx_battery_read_nac(struct bq27xxx_device_info *di)
- {
--	int flags;
--
--	if (di->opts & BQ27XXX_O_ZERO) {
--		flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, true);
--		if (flags >= 0 && (flags & BQ27000_FLAG_CI))
--			return -ENODATA;
--	}
--
- 	return bq27xxx_battery_read_charge(di, BQ27XXX_REG_NAC);
- }
- 
-@@ -1742,6 +1734,18 @@ static bool bq27xxx_battery_dead(struct bq27xxx_device_info *di, u16 flags)
- 		return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF);
- }
- 
-+/*
-+ * Returns true if reported battery capacity is inaccurate
-+ */
-+static bool bq27xxx_battery_capacity_inaccurate(struct bq27xxx_device_info *di,
-+						 u16 flags)
-+{
-+	if (di->opts & BQ27XXX_O_HAS_CI)
-+		return (flags & BQ27000_FLAG_CI);
-+	else
-+		return false;
-+}
-+
- static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
- {
- 	/* Unlikely but important to return first */
-@@ -1751,6 +1755,8 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
- 		return POWER_SUPPLY_HEALTH_COLD;
- 	if (unlikely(bq27xxx_battery_dead(di, di->cache.flags)))
- 		return POWER_SUPPLY_HEALTH_DEAD;
-+	if (unlikely(bq27xxx_battery_capacity_inaccurate(di, di->cache.flags)))
-+		return POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED;
- 
- 	return POWER_SUPPLY_HEALTH_GOOD;
- }
-@@ -1758,7 +1764,6 @@ static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di)
- void bq27xxx_battery_update(struct bq27xxx_device_info *di)
- {
- 	struct bq27xxx_reg_cache cache = {0, };
--	bool has_ci_flag = di->opts & BQ27XXX_O_HAS_CI;
- 	bool has_singe_flag = di->opts & BQ27XXX_O_ZERO;
- 
- 	cache.flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, has_singe_flag);
-@@ -1766,30 +1771,19 @@ void bq27xxx_battery_update(struct bq27xxx_device_info *di)
- 		cache.flags = -1; /* read error */
- 	if (cache.flags >= 0) {
- 		cache.temperature = bq27xxx_battery_read_temperature(di);
--		if (has_ci_flag && (cache.flags & BQ27000_FLAG_CI)) {
--			dev_info_once(di->dev, "battery is not calibrated! ignoring capacity values\n");
--			cache.capacity = -ENODATA;
--			cache.energy = -ENODATA;
--			cache.time_to_empty = -ENODATA;
--			cache.time_to_empty_avg = -ENODATA;
--			cache.time_to_full = -ENODATA;
--			cache.charge_full = -ENODATA;
--			cache.health = -ENODATA;
--		} else {
--			if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
--				cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
--			if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
--				cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
--			if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
--				cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
--
--			cache.charge_full = bq27xxx_battery_read_fcc(di);
--			cache.capacity = bq27xxx_battery_read_soc(di);
--			if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
--				cache.energy = bq27xxx_battery_read_energy(di);
--			di->cache.flags = cache.flags;
--			cache.health = bq27xxx_battery_read_health(di);
--		}
-+		if (di->regs[BQ27XXX_REG_TTE] != INVALID_REG_ADDR)
-+			cache.time_to_empty = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTE);
-+		if (di->regs[BQ27XXX_REG_TTECP] != INVALID_REG_ADDR)
-+			cache.time_to_empty_avg = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTECP);
-+		if (di->regs[BQ27XXX_REG_TTF] != INVALID_REG_ADDR)
-+			cache.time_to_full = bq27xxx_battery_read_time(di, BQ27XXX_REG_TTF);
-+
-+		cache.charge_full = bq27xxx_battery_read_fcc(di);
-+		cache.capacity = bq27xxx_battery_read_soc(di);
-+		if (di->regs[BQ27XXX_REG_AE] != INVALID_REG_ADDR)
-+			cache.energy = bq27xxx_battery_read_energy(di);
-+		di->cache.flags = cache.flags;
-+		cache.health = bq27xxx_battery_read_health(di);
- 		if (di->regs[BQ27XXX_REG_CYCT] != INVALID_REG_ADDR)
- 			cache.cycle_count = bq27xxx_battery_read_cyct(di);
- 

device/community/linux-nokia-n900/0003-power-supply-bq27xxx_battery-ignore-inaccurate-flag.patch

@@ -0,0 +1,30 @@
+Ignore the uncalibrated flag in the battery controller and always show a capacity, even if it's
+not completely accurate.
+
+diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
+index 195c18c2f..be33a32cb 100644
+--- a/drivers/power/supply/bq27xxx_battery.c
++++ b/drivers/power/supply/bq27xxx_battery.c
+@@ -1377,11 +1377,11 @@ static inline int bq27xxx_battery_read_nac(struct bq27xxx_device_info *di)
+ {
+ 	int flags;
+ 
+-	if (di->opts & BQ27XXX_O_ZERO) {
++	/*if (di->opts & BQ27XXX_O_ZERO) {
+ 		flags = bq27xxx_read(di, BQ27XXX_REG_FLAGS, true);
+ 		if (flags >= 0 && (flags & BQ27000_FLAG_CI))
+ 			return -ENODATA;
+-	}
++	}*/
+ 
+ 	return bq27xxx_battery_read_charge(di, BQ27XXX_REG_NAC);
+ }
+@@ -1579,7 +1579,7 @@ void bq27xxx_battery_update(struct bq27xxx_device_info *di)
+ 		cache.flags = -1; /* read error */
+ 	if (cache.flags >= 0) {
+ 		cache.temperature = bq27xxx_battery_read_temperature(di);
+-		if (has_ci_flag && (cache.flags & BQ27000_FLAG_CI)) {
++		if (false && has_ci_flag && (cache.flags & BQ27000_FLAG_CI)) {
+ 			dev_info_once(di->dev, "battery is not calibrated! ignoring capacity values\n");
+ 			cache.capacity = -ENODATA;
+ 			cache.energy = -ENODATA;

device/community/linux-nokia-n900/0005-iio-accel-st-accel-add-lis302dl.patch

@@ -1,20 +1,36 @@
+From c594376d8ace517fe54e0d14716c341d071f4423 Mon Sep 17 00:00:00 2001
+From: "Sicelo A. Mhlongo" <absicsz@gmail.com>
+Date: Fri, 25 Feb 2022 19:47:56 +0200
+Subject: [PATCH 1/2] iio: accel: st_accel: add support for lis302dl
+
+---
+ drivers/iio/accel/st_accel.h      | 2 ++
+ drivers/iio/accel/st_accel_core.c | 1 +
+ drivers/iio/accel/st_accel_i2c.c  | 5 +++++
+ 3 files changed, 8 insertions(+)
+
 diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
-index 96e66b2f4cd9e..5b0f54e33d9ef 100644
+index 8750dea56fcb..15f4b7944362 100644
 --- a/drivers/iio/accel/st_accel.h
 +++ b/drivers/iio/accel/st_accel.h
-@@ -36,8 +36,10 @@
+@@ -37,6 +37,7 @@ enum st_accel_type {
+ 	LIS2DE12,
+ 	LIS2HH12,
+ 	ST_ACCEL_MAX,
++	LIS302DL,
+ };
+ 
+ #define H3LIS331DL_ACCEL_DEV_NAME	"h3lis331dl_accel"
+@@ -61,6 +62,7 @@ enum st_accel_type {
  #define LIS3DE_ACCEL_DEV_NAME		"lis3de"
  #define LIS2DE12_ACCEL_DEV_NAME		"lis2de12"
  #define LIS2HH12_ACCEL_DEV_NAME		"lis2hh12"
 +#define LIS302DL_ACCEL_DEV_NAME		"lis302dl"
- #define SC7A20_ACCEL_DEV_NAME		"sc7a20"
  
-+
  #ifdef CONFIG_IIO_BUFFER
  int st_accel_allocate_ring(struct iio_dev *indio_dev);
- int st_accel_trig_set_state(struct iio_trigger *trig, bool state);
 diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
-index 5c5da6fdb4902..673f3807f001c 100644
+index 31ea19d0ba71..2a353c51c84a 100644
 --- a/drivers/iio/accel/st_accel_core.c
 +++ b/drivers/iio/accel/st_accel_core.c
 @@ -444,6 +444,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
@@ -26,48 +42,28 @@ index 5c5da6fdb4902..673f3807f001c 100644
  		.ch = (struct iio_chan_spec *)st_accel_8bit_channels,
  		.odr = {
 diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
-index 96adc4344f4a5..45ee0ddc133c9 100644
+index c0ce78eebad9..086e8af89e18 100644
 --- a/drivers/iio/accel/st_accel_i2c.c
 +++ b/drivers/iio/accel/st_accel_i2c.c
-@@ -108,6 +108,10 @@ static const struct of_device_id st_accel_of_match[] = {
+@@ -107,6 +107,10 @@ static const struct of_device_id st_accel_of_match[] = {
+ 		.compatible = "st,lis2hh12",
  		.data = LIS2HH12_ACCEL_DEV_NAME,
  	},
- 	{
++	{
 +		.compatible = "st,lis302dl",
 +		.data = LIS302DL_ACCEL_DEV_NAME,
 +	},
-+	{
- 		.compatible = "silan,sc7a20",
- 		.data = SC7A20_ACCEL_DEV_NAME,
- 	},
-@@ -146,6 +150,7 @@ static const struct i2c_device_id st_accel_id_table[] = {
+ 	{},
+ };
+ MODULE_DEVICE_TABLE(of, st_accel_of_match);
+@@ -142,6 +146,7 @@ static const struct i2c_device_id st_accel_id_table[] = {
  	{ LIS3DE_ACCEL_DEV_NAME },
  	{ LIS2DE12_ACCEL_DEV_NAME },
  	{ LIS2HH12_ACCEL_DEV_NAME },
 +	{ LIS302DL_ACCEL_DEV_NAME },
- 	{ SC7A20_ACCEL_DEV_NAME },
  	{},
  };
-diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
-index 108b63d0146c5..6c0917750288c 100644
---- a/drivers/iio/accel/st_accel_spi.c
-+++ b/drivers/iio/accel/st_accel_spi.c
-@@ -92,6 +92,10 @@ static const struct of_device_id st_accel_of_match[] = {
- 		.compatible = "st,lis3de",
- 		.data = LIS3DE_ACCEL_DEV_NAME,
- 	},
-+	{
-+		.compatible = "st,lis302dl",
-+		.data = LIS302DL_ACCEL_DEV_NAME,
-+	},
- 	{}
- };
- MODULE_DEVICE_TABLE(of, st_accel_of_match);
-@@ -147,6 +151,7 @@ static const struct spi_device_id st_accel_id_table[] = {
- 	{ LIS2DW12_ACCEL_DEV_NAME },
- 	{ LIS3DHH_ACCEL_DEV_NAME },
- 	{ LIS3DE_ACCEL_DEV_NAME },
-+	{ LIS302DL_ACCEL_DEV_NAME },
- 	{},
- };
- MODULE_DEVICE_TABLE(spi, st_accel_id_table);
+ MODULE_DEVICE_TABLE(i2c, st_accel_id_table);
+-- 
+2.35.1
+

device/community/linux-nokia-n900/0008-wl1251-specify-max.-IE-length.patch

@@ -0,0 +1,41 @@
+From 7538e4ec6211a0d0e3d4f3d3138e9c2a39a38b62 Mon Sep 17 00:00:00 2001
+From: Merlijn Wajer <merlijn@wizzup.org>
+Date: Sun, 12 Dec 2021 23:13:08 +0100
+Subject: [PATCH] wl1251: specify max. IE length
+
+This fix is similar to commit 77c91295ea53 ("wil6210: specify max. IE
+length").  Without the max IE length set, wpa_supplicant cannot operate
+using the nl80211 interface.
+
+This patch is a workaround - the number 512 is taken from the wlcore
+driver, but note that per Paul Fertser:
+
+    there's no correct number because the driver will ignore the data
+    passed in extra IEs.
+
+Suggested-by: Paul Fertser <fercerpav@gmail.com>
+Signed-off-by: Merlijn Wajer <merlijn@wizzup.org>
+---
+ drivers/net/wireless/ti/wl1251/main.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
+index 136a0d3b23c9..a25a6143e65f 100644
+--- a/drivers/net/wireless/ti/wl1251/main.c
++++ b/drivers/net/wireless/ti/wl1251/main.c
+@@ -1520,6 +1520,12 @@ int wl1251_init_ieee80211(struct wl1251 *wl)
+ 	wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
+ 					 BIT(NL80211_IFTYPE_ADHOC);
+ 	wl->hw->wiphy->max_scan_ssids = 1;
++
++	/* We set max_scan_ie_len to a random value to make wpa_supplicant scans not
++	 * fail, as the driver will the ignore the extra passed IEs anyway
++	 */
++	wl->hw->wiphy->max_scan_ie_len = 512;
++
+ 	wl->hw->wiphy->bands[NL80211_BAND_2GHZ] = &wl1251_band_2ghz;
+ 
+ 	wl->hw->queues = 4;
+-- 
+2.34.1
+

device/community/linux-nokia-n900/0009-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch

@@ -1,3 +1,22 @@
+From 2c7e4a1ac8ec1f908927793e893566aac3dcb9df Mon Sep 17 00:00:00 2001
+From: Merlijn Wajer <merlijn@wizzup.org>
+Date: Sun, 12 Dec 2021 02:23:36 +0100
+Subject: [PATCH] wip: Revert "dma-direct: Fix potential NULL pointer
+ dereference"
+
+This reverts commit f959dcd6ddfd29235030e8026471ac1b022ad2b0.
+
+We will need to find a proper fix for this - but it looks like the
+dma_capable change in include/linux/dma-direct.h makes the ssi code
+always take the DMA path, which causes various problems. I am not 100%
+sure that is case, but I have a hunch that pio was always used on the
+N900 for this. If this is not the case, we'll have figure out what else
+is required to make DMA work again.
+---
+ include/linux/dma-direct.h | 4 ++++
+ kernel/dma/mapping.c       | 9 ---------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
 diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
 index 18aade195884..6eb8f8ae76da 100644
 --- a/include/linux/dma-direct.h
@@ -14,7 +33,7 @@ index 18aade195884..6eb8f8ae76da 100644
  	    min(addr, end) < phys_to_dma(dev, PFN_PHYS(min_low_pfn)))
  		return false;
 diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
-index 559461a826ba..389fc0faaa47 100644
+index 8349a9f2c345..899e6fbb9f40 100644
 --- a/kernel/dma/mapping.c
 +++ b/kernel/dma/mapping.c
 @@ -148,9 +148,6 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page,
@@ -44,6 +63,9 @@ index 559461a826ba..389fc0faaa47 100644
 -	if (WARN_ON_ONCE(!dev->dma_mask))
 -		return DMA_MAPPING_ERROR;
 -
- 	if (dma_map_direct(dev, ops))
- 		addr = dma_direct_map_resource(dev, phys_addr, size, dir, attrs);
- 	else if (ops->map_resource)
+ 	/* Don't allow RAM to be mapped */
+ 	if (WARN_ON_ONCE(pfn_valid(PHYS_PFN(phys_addr))))
+ 		return DMA_MAPPING_ERROR;
+-- 
+2.34.1
+

device/community/linux-nokia-n900/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 
 pkgname=linux-nokia-n900
-pkgver=5.18.1
+pkgver=5.15.31
 pkgrel=0
 pkgdesc="Mainline kernel fork for Nokia N900"
 arch="armv7"
@@ -26,12 +26,14 @@ source="
 	$_patch
 	$_config
 	0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
-	0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch
-	0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
+	0002-ARM-dts-n900-remove-rx51-battery.patch
+	0003-power-supply-bq27xxx_battery-ignore-inaccurate-flag.patch
 	0004-ARM-dts-omap3_n900-disable-thermal-for-now.patch
 	0005-iio-accel-st-accel-add-lis302dl.patch
 	0006-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
 	0007-Revert-ARM-omap3-enable-off-mode-automatically.patch
+	0008-wl1251-specify-max.-IE-length.patch
+	0009-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
 "
 builddir="$srcdir/linux-$_kernver"
 
@@ -60,14 +62,16 @@ package() {
 }
 
 sha512sums="
-dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5  linux-5.18.tar.xz
-d8f105b34b4a0f933cddc631f8f54ca2e50f055365c864f33c389972df03cb2cdf415eb47a2b2fbc0d43af6679fe21e3bb459d79d02103a2db8782146473910e  linux-5.18.1.patch.xz
-461e48aa7e26cc41de349da303df3751cf6a3d7c8aa0897a946b39ccab2240696e07a5671649d4d5c994051e649138a708011048a44e236d15e8fcb42f2a6179  config-nokia-n900.armv7
+d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
+1dc78db565dda619aa9f1d59bb78cf7ee43e8922f6e055bdd6f8b419556be8838235aa26e29fd1bd38cf12d8fb81e267714bb647921dee2c2aeab9319fbe294d  linux-5.15.31.patch.xz
+465cb8fcc3a5dc043323c0767e4918b68556c1f1b693e0959b486c0e3a72264704d1889137e640e6262b4fd22feeedcfc454b6515876168ff5f0f6ccc30c4a1e  config-nokia-n900.armv7
 04a39253afd25a7de03dc45ff322161672005406543c44b97d2dc293f202de7de446aee9707a690a290641c55c7bed6e78bbe096ca323dd7d88d3207427c8d31  0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
-3cc2036ba264bd855358361aacb309ad1cf1660cb82a0978523508d1b3fe513676c58f6efc5bb64f7601b77392c19d2c609b6d83541db7e418c1737cff3973e8  0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch
-991237276bee4ff7bca24cf3a26afe3f12a2a604452793ad905a605890f761ac98374b5509cfbcab33c7b7ccf3da5cc286e70afe27b8e201387f403bf5025ae9  0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
+c1055c7a4d2e39ce13db3871d948022b62eb7ebeb898777d197169b3e7c04d705ce7f52f28214754e3cefe99d1dd66f339a1a5770bae1ee970d5926067032061  0002-ARM-dts-n900-remove-rx51-battery.patch
+93e82f7041e347b63fc32ce54176ee3fe7e8260cc793810bcf0146a3699567b63a0cb7ce8c531b0484390907a25c51bfbeb15b32dddb2220c2481ec1f86e5eb5  0003-power-supply-bq27xxx_battery-ignore-inaccurate-flag.patch
 ea33adda06e1fb64b763c34f1f598bb00ccfdba5400d0996871138284b4cb8a51e021c7c0ace9d4bc16027530027fb2a443d5013c6f0b22ed3d64f36152c8854  0004-ARM-dts-omap3_n900-disable-thermal-for-now.patch
-d5a78e68c10a51f4354a420475db2d10e0be92632df9588c9136dba5b0e5e0c8757f0d8e1bd4fdf99cbbf2f93c54d20eacee1c3a668070037afeac1fded1531a  0005-iio-accel-st-accel-add-lis302dl.patch
+fc23b8ee50e387a05d820f07281a9735d3073de07c5a6a13e44da7615b0c9a8030bba80f9e63f567557f69e8d75d6d51330b3ca3a6c719275a5a5ed8223a6d2a  0005-iio-accel-st-accel-add-lis302dl.patch
 302aa8e6677e7ecfae473553806cdf5d47687c4f8e73322d0ace78486f9290ba503069ed6b41250fe38802b6c6091c7c4eac06ab387e011f1316b84ad5e2641d  0006-ARM-dts-N900-use-iio-driver-for-accelerometer.patch
 acf3beef5448da7f3be19b862ac2fef65379d9f1617246baaab296083901174d891526cd9bf781162d4406089969c311701dfded04219bafd3c5c7784bc4c2e6  0007-Revert-ARM-omap3-enable-off-mode-automatically.patch
+acaa153809c390957ee8d80caae440a41d84c78f045268ac226f05019dbdd69959b5cf56b6bac2e2c0300bcdb68649ffb847e7a0a333408bf5b4426fc969afe8  0008-wl1251-specify-max.-IE-length.patch
+f0a02313f168970499faef51207644e69ca65aa380ada055a2f5faceaa8c85f6ea0a161729637205c2bc116e1a0ac62d07c44a83c4419cfec04d4141508f7845  0009-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
 "

device/community/linux-odroid-hc2/APKBUILD

@@ -3,7 +3,7 @@
 # Maintainer: Dylan Van Assche <me@dylanvanassche.be>
 
 pkgname=linux-odroid-hc2
-pkgver=5.18.1
+pkgver=5.16.14
 pkgrel=0
 pkgdesc="ODROID XU3/XU4/HC1/HC2/MC1 kernel fork"
 arch="armv7"
@@ -72,6 +72,6 @@ dev() {
 }
 
 sha512sums="
-1d3f676403b7f21c6790cac568e9655f95012c250a7d0f35cb8223c8a36ce561b414a25cd85be6892607facb617247d4983f4be426388dd6c6817991a6da928d  linux-5.18.1.tar.xz
+3daf1b5a01cbab632492e18a8e71aaf2085545f4944ce587bc7c27e86a0a739d0cbffe7890ce9c5bc863b3c5083281bca6ed4df8d3c69d60c6dcc210cd86993e  linux-5.16.14.tar.xz
 22d641b681dffd5348076e8dc095d3a1b402bc496e05156356d0be7a77b8e7a270a66dedc1d6197320806740508589d359ea7335859972f4cadd9ebf1d81212d  config-odroid-hc2.armv7
 "

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

@@ -4,7 +4,7 @@
 
 _flavor="postmarketos-qcom-msm8916"
 pkgname=linux-$_flavor
-pkgver=5.18
+pkgver=5.17
 pkgrel=0
 pkgdesc="Mainline kernel fork for Qualcomm MSM8916 devices"
 arch="aarch64 armv7"
@@ -72,7 +72,7 @@ package() {
 }
 
 sha512sums="
-1433f960797289936f3b7d2aa76e1b299506c3e9db4b2c50b0cc291e3a7ca8eb54c5bde7e26865cad676386ba8795e070b1fed64db1cffb305da18a5f551ecba  linux-postmarketos-qcom-msm8916-v5.18-msm8916.tar.gz
-21efa9de397af835eca8c8558a59d1aaa0006785590ed936195f747572b15215a902eaa535ff00c5c64861cd4c127e41c03d5ff1379c69d2ca5e38f44ec9d0be  config-postmarketos-qcom-msm8916.aarch64
-9ebefba76c62c5d9e7f14855a15878cd0ae32dc34b8a55f6d429fd7396d1891ddd9c73e6a5b3d0eb7a8c788876e652355c9c7c7df496a4e813486c4c55956048  config-postmarketos-qcom-msm8916.armv7
+b702f5fe31e017c73e1841b18b36cf56a9dde92c71cee921f37a84024ef290199aba1b02db497b3a4b54f01b6a1636ad27de649454abca7fa1c63ff2f86b0919  linux-postmarketos-qcom-msm8916-v5.17-msm8916.tar.gz
+7d2dfefd615eee49bf83065d5c8ac0e260fd1ee30fcb264a8cf794490444a894005e9517a9674df7635ba65b182b1b8eab1c61a639ef3dbbb9e853a1b9437512  config-postmarketos-qcom-msm8916.aarch64
+384b41020f93fde33fb46251491282147bcde51c14e953653f6fd058131dc5f95c3c2246511941e49aae05ef241b5fffac4dbb455bf534af1caed5d31710108b  config-postmarketos-qcom-msm8916.armv7
 "

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

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.18.0 Kernel Configuration
+# Linux/arm64 5.17.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
 CONFIG_CC_IS_GCC=y
@@ -15,7 +15,6 @@ CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -90,12 +89,9 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 #
 # BPF subsystem
 #
-CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_SYSCALL is not set
 CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT_DEFAULT_ON=y
-CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
-# CONFIG_BPF_PRELOAD is not set
 # end of BPF subsystem
 
 CONFIG_PREEMPT_BUILD=y
@@ -104,7 +100,6 @@ CONFIG_PREEMPT_BUILD=y
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
-# CONFIG_PREEMPT_DYNAMIC is not set
 # CONFIG_SCHED_CORE is not set
 
 #
@@ -137,7 +132,6 @@ CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 # end of RCU Subsystem
@@ -181,7 +175,6 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_MISC is not set
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
@@ -266,7 +259,6 @@ CONFIG_PROFILING=y
 # end of General setup
 
 CONFIG_ARM64=y
-CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARM64_PAGE_SHIFT=12
@@ -365,7 +357,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_ARM64_ERRATUM_2051678=y
-CONFIG_ARM64_ERRATUM_2077057=y
+# CONFIG_ARM64_ERRATUM_2077057 is not set
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
 CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
@@ -543,7 +535,6 @@ CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_DT_IDLE_STATES=y
-CONFIG_DT_IDLE_GENPD=y
 
 #
 # ARM CPU Idle Drivers
@@ -702,7 +693,6 @@ CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
-CONFIG_RANDOMIZE_KSTACK_OFFSET=y
 # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
@@ -712,8 +702,6 @@ CONFIG_HAVE_ARCH_COMPILER_H=y
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
-CONFIG_HAVE_PREEMPT_DYNAMIC=y
-CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
@@ -747,7 +735,6 @@ CONFIG_MODULE_COMPRESS_NONE=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB is not set
@@ -775,7 +762,6 @@ CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
 CONFIG_BLOCK_HOLDER_DEPRECATED=y
-CONFIG_BLK_MQ_STACKING=y
 
 #
 # IO Schedulers
@@ -806,7 +792,6 @@ CONFIG_FREEZER=y
 CONFIG_BINFMT_ELF=y
 CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ARCH_BINFMT_ELF_STATE=y
-CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
 CONFIG_ARCH_HAVE_ELF_PROT=y
 CONFIG_ARCH_USE_GNU_PROPERTY=y
 CONFIG_ELFCORE=y
@@ -861,7 +846,6 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA32=y
@@ -897,7 +881,6 @@ CONFIG_AF_UNIX_OOB=y
 # CONFIG_TLS is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_NET_KEY is not set
-# CONFIG_XDP_SOCKETS is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -1331,7 +1314,6 @@ CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
-# CONFIG_BPF_STREAM_PARSER is not set
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -1343,13 +1325,10 @@ CONFIG_NET_FLOW_LIMIT=y
 
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-CONFIG_BT=y
+CONFIG_BT=m
 CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 # CONFIG_BT_HS is not set
 CONFIG_BT_LE=y
@@ -1389,7 +1368,7 @@ CONFIG_BT_QCOMSMD=m
 # CONFIG_AF_KCM is not set
 # CONFIG_MCTP is not set
 CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
+CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
@@ -1398,7 +1377,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 # CONFIG_CFG80211_WEXT is not set
-CONFIG_MAC80211=y
+CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
@@ -1447,9 +1426,6 @@ CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_SELFTESTS=m
-CONFIG_NET_SOCK_MSG=y
-CONFIG_PAGE_POOL=y
-# CONFIG_PAGE_POOL_STATS is not set
 # CONFIG_FAILOVER is not set
 CONFIG_ETHTOOL_NETLINK=y
 
@@ -1526,6 +1502,7 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 # end of ARM System Control and Management Interface Protocol
 
 # CONFIG_ARM_SCPI_PROTOCOL is not set
+# CONFIG_ARM_SDE_INTERFACE is not set
 CONFIG_QCOM_SCM=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_ARM_FFA_TRANSPORT is not set
@@ -1605,7 +1582,6 @@ CONFIG_QCOM_FASTRPC=m
 # CONFIG_SRAM is not set
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_HISI_HIKEY_USB is not set
-# CONFIG_OPEN_DICE is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -1761,14 +1737,11 @@ CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_GEMINI_ETHERNET is not set
-CONFIG_NET_VENDOR_DAVICOM=y
-# CONFIG_DM9051 is not set
 # CONFIG_DNET is not set
 CONFIG_NET_VENDOR_ENGLEDER=y
 # CONFIG_TSNEP is not set
 CONFIG_NET_VENDOR_EZCHIP=y
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_FUNGIBLE=y
 CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_HISILICON=y
 # CONFIG_HIX5HD2_GMAC is not set
@@ -1779,6 +1752,7 @@ CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_NET_VENDOR_HUAWEI=y
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_LITEX=y
 # CONFIG_LITEX_LITEETH is not set
 CONFIG_NET_VENDOR_MARVELL=y
@@ -1794,11 +1768,10 @@ CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
-CONFIG_NET_VENDOR_MICROSOFT=y
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_ETHOC is not set
 CONFIG_NET_VENDOR_PENSANDO=y
@@ -1994,7 +1967,6 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
 # CONFIG_MT7663U is not set
 # CONFIG_MT7663S is not set
 # CONFIG_MT7921S is not set
-# CONFIG_MT7921U is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
@@ -2002,7 +1974,7 @@ CONFIG_WLAN_VENDOR_RALINK=y
 # CONFIG_RT2X00 is not set
 CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL8187 is not set
-CONFIG_RTL_CARDS=y
+CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
 # CONFIG_RTL8XXXU is not set
 # CONFIG_RTW88 is not set
@@ -2145,7 +2117,6 @@ CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MSG2638=m
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
-CONFIG_TOUCHSCREEN_IMAGIS=m
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
@@ -2265,6 +2236,7 @@ CONFIG_SERIAL_MSM_CONSOLE=y
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
@@ -2489,7 +2461,6 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_SC7180 is not set
 # CONFIG_PINCTRL_SC7280 is not set
 # CONFIG_PINCTRL_SC8180X is not set
-# CONFIG_PINCTRL_SC8280XP is not set
 # CONFIG_PINCTRL_SDM660 is not set
 # CONFIG_PINCTRL_SDM845 is not set
 # CONFIG_PINCTRL_SDX55 is not set
@@ -2603,14 +2574,12 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
-# CONFIG_IP5XXX_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
 # CONFIG_BATTERY_CW2015 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SAMSUNG_SDI is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_MANAGER_SBS is not set
@@ -2645,7 +2614,6 @@ CONFIG_BATTERY_RT5033=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
-# CONFIG_BATTERY_UG3105 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -2762,7 +2730,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_SHT3x is not set
 # CONFIG_SENSORS_SHT4x is not set
 # CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SY7636A is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
@@ -2789,7 +2756,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_TMP108 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83773G is not set
@@ -2912,7 +2878,6 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_MAX77650 is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77714 is not set
 # CONFIG_MFD_MAX77843 is not set
 # CONFIG_MFD_MAX8907 is not set
 # CONFIG_MFD_MAX8925 is not set
@@ -2936,7 +2901,6 @@ CONFIG_MFD_RT5033=m
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SIMPLE_MFD_I2C is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
@@ -3036,20 +3000,17 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
 # CONFIG_REGULATOR_RT4801 is not set
 CONFIG_REGULATOR_RT5033=m
-# CONFIG_REGULATOR_RT5190A 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_SY7636A is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS6286X is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TPS65132=y
@@ -3088,6 +3049,7 @@ CONFIG_MEDIA_CONTROLLER=y
 #
 # Video4Linux options
 #
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -3110,111 +3072,21 @@ CONFIG_V4L2_ASYNC=m
 #
 # Drivers filtered as selected at 'Filter media drivers'
 #
-
-#
-# Media drivers
-#
 # CONFIG_MEDIA_USB_SUPPORT is not set
-CONFIG_MEDIA_PLATFORM_DRIVERS=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MUX is not set
-
-#
-# Allegro DVT media platform drivers
-#
-
-#
-# Amlogic media platform drivers
-#
-
-#
-# Amphion drivers
-#
-
-#
-# Aspeed media platform drivers
-#
-# CONFIG_VIDEO_ASPEED is not set
-
-#
-# Atmel media platform drivers
-#
-
-#
-# Cadence media platform drivers
-#
-# CONFIG_VIDEO_CADENCE_CSI2RX is not set
-# CONFIG_VIDEO_CADENCE_CSI2TX is not set
-
-#
-# Chips&Media media platform drivers
-#
-
-#
-# Intel media platform drivers
-#
-
-#
-# Marvell media platform drivers
-#
-
-#
-# Mediatek media platform drivers
-#
-
-#
-# NVidia media platform drivers
-#
-
-#
-# NXP media platform drivers
-#
-
-#
-# Qualcomm media platform drivers
-#
-CONFIG_VIDEO_QCOM_CAMSS=m
-CONFIG_VIDEO_QCOM_VENUS=m
-
-#
-# Renesas media platform drivers
-#
-
-#
-# Rockchip media platform drivers
-#
-
-#
-# Samsung media platform drivers
-#
-
-#
-# STMicroelectronics media platform drivers
-#
-
-#
-# Sunxi media platform drivers
-#
-
-#
-# Texas Instruments drivers
-#
-
-#
-# VIA media platform drivers
-#
-
-#
-# Xilinx media platform drivers
-#
-# CONFIG_VIDEO_XILINX is not set
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_V4L2=m
 CONFIG_VIDEOBUF2_MEMOPS=m
 CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+# CONFIG_VIDEO_CADENCE is not set
+# CONFIG_VIDEO_ASPEED is not set
+# CONFIG_VIDEO_MUX is not set
+CONFIG_VIDEO_QCOM_CAMSS=m
+# CONFIG_VIDEO_XILINX is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+CONFIG_VIDEO_QCOM_VENUS=m
 # end of Media drivers
 
 CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
@@ -3223,12 +3095,19 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # Media ancillary drivers
 #
 
+#
+# audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'
+#
+
+#
+# Video and audio decoders
+#
+
 #
 # Camera sensor devices
 #
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
-# CONFIG_VIDEO_HI847 is not set
 # CONFIG_VIDEO_IMX208 is not set
 # CONFIG_VIDEO_IMX214 is not set
 # CONFIG_VIDEO_IMX219 is not set
@@ -3240,6 +3119,33 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # 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
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5693 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
+# CONFIG_VIDEO_OV7640 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# 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
 # CONFIG_VIDEO_MT9M111 is not set
@@ -3249,48 +3155,19 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # CONFIG_VIDEO_MT9V011 is not set
 # CONFIG_VIDEO_MT9V032 is not set
 # CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_OG01A1B is not set
-# CONFIG_VIDEO_OV02A10 is not set
-# CONFIG_VIDEO_OV08D10 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_OV13B10 is not set
-# CONFIG_VIDEO_OV2640 is not set
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV5648 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5693 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV772X is not set
-# 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_M5MOLS is not set
 # CONFIG_VIDEO_RDACM20 is not set
 # CONFIG_VIDEO_RDACM21 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
 # CONFIG_VIDEO_S5K4ECGX is not set
 # CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_S5C73M3 is not set
 # end of Camera sensor devices
 
 #
@@ -3311,14 +3188,6 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # CONFIG_VIDEO_LM3646 is not set
 # end of Flash devices
 
-#
-# audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'
-#
-
-#
-# Video and audio decoders
-#
-
 #
 # SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'
 #
@@ -3326,7 +3195,6 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 #
 # Media SPI Adapters
 #
-# CONFIG_VIDEO_GS1662 is not set
 # end of Media SPI Adapters
 # end of Media ancillary drivers
 
@@ -3338,7 +3206,6 @@ CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_DP_HELPER=m
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@@ -3373,6 +3240,7 @@ CONFIG_DRM_SCHED=m
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_GPU_STATE=y
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 # CONFIG_DRM_MSM_HDMI_HDCP is not set
 # CONFIG_DRM_MSM_DP is not set
 CONFIG_DRM_MSM_DSI=y
@@ -3415,7 +3283,6 @@ CONFIG_DRM_PANEL_SIMPLE=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
@@ -3446,6 +3313,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
@@ -3469,7 +3337,6 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
-# CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 # CONFIG_DRM_LONTIUM_LT9611UXC is not set
@@ -3508,7 +3375,6 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 # CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_PANEL_MIPI_DBI is not set
 CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9163 is not set
@@ -3524,7 +3390,6 @@ CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_PANFROST is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
-# CONFIG_DRM_SSD130X is not set
 CONFIG_DRM_LEGACY=y
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 CONFIG_DRM_NOMODESET=y
@@ -3828,7 +3693,6 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
-# CONFIG_SND_SOC_TAS5805M is not set
 # CONFIG_SND_SOC_TAS6424 is not set
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
@@ -3975,14 +3839,12 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PLANTRONICS is not set
 # CONFIG_HID_PLAYSTATION is not set
-# CONFIG_HID_RAZER is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
 # CONFIG_HID_ROCCAT is not set
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SEMITEK is not set
-# CONFIG_HID_SIGMAMICRO is not set
 # CONFIG_HID_SONY is not set
 # CONFIG_HID_SPEEDLINK is not set
 # CONFIG_HID_STEAM is not set
@@ -4136,7 +3998,6 @@ CONFIG_USB_CHIPIDEA_TEGRA=y
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_QCOM_EUD is not set
 # CONFIG_APPLE_MFI_FASTCHARGE is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
@@ -4568,6 +4429,7 @@ CONFIG_STAGING=y
 # Analog to digital converters
 #
 # CONFIG_AD7816 is not set
+# CONFIG_AD7280 is not set
 # end of Analog to digital converters
 
 #
@@ -4609,8 +4471,16 @@ CONFIG_STAGING=y
 # end of IIO staging drivers
 
 # CONFIG_STAGING_MEDIA is not set
+
+#
+# Android
+#
+CONFIG_ASHMEM=y
+# end of Android
+
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
+# CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_FB_TFT is not set
@@ -4644,10 +4514,10 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_LAN966X is not set
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 # CONFIG_COMMON_CLK_XGENE is not set
 # CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_QCOM_GDSC=y
@@ -4689,7 +4559,6 @@ CONFIG_MSM_GCC_8916=y
 # CONFIG_MSM_GPUCC_8998 is not set
 # CONFIG_MSM_MMCC_8998 is not set
 # CONFIG_QCM_GCC_2290 is not set
-# CONFIG_QCM_DISPCC_2290 is not set
 # CONFIG_QCS_GCC_404 is not set
 # CONFIG_SC_CAMCC_7180 is not set
 # CONFIG_SC_CAMCC_7280 is not set
@@ -4717,8 +4586,8 @@ CONFIG_MSM_GCC_8916=y
 # CONFIG_SDM_DISPCC_845 is not set
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_55 is not set
-# CONFIG_SDX_GCC_65 is not set
 # CONFIG_SM_CAMCC_8250 is not set
+# CONFIG_SDX_GCC_65 is not set
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
 # CONFIG_SM_GCC_6350 is not set
@@ -4726,7 +4595,6 @@ CONFIG_MSM_GCC_8916=y
 # CONFIG_SM_GCC_8250 is not set
 # CONFIG_SM_GCC_8350 is not set
 # CONFIG_SM_GCC_8450 is not set
-# CONFIG_SM_GPUCC_6350 is not set
 # CONFIG_SM_GPUCC_8150 is not set
 # CONFIG_SM_GPUCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
@@ -4810,7 +4678,6 @@ CONFIG_QCOM_WCNSS_PIL=m
 #
 CONFIG_RPMSG=y
 CONFIG_RPMSG_CHAR=y
-# CONFIG_RPMSG_CTRL is not set
 # CONFIG_RPMSG_NS is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
@@ -4948,8 +4815,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_ADXL345_SPI is not set
 # CONFIG_ADXL355_I2C is not set
 # CONFIG_ADXL355_SPI is not set
-# CONFIG_ADXL367_SPI is not set
-# CONFIG_ADXL367_I2C is not set
 # CONFIG_ADXL372_SPI is not set
 # CONFIG_ADXL372_I2C is not set
 # CONFIG_BMA180 is not set
@@ -4993,7 +4858,6 @@ CONFIG_KXCJK1013=m
 # CONFIG_AD7124 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
-# CONFIG_AD7280 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
@@ -5069,7 +4933,6 @@ CONFIG_QCOM_SPMI_VADC=y
 # Amplifiers
 #
 # CONFIG_AD8366 is not set
-# CONFIG_ADA4250 is not set
 # CONFIG_HMC425 is not set
 # end of Amplifiers
 
@@ -5132,7 +4995,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
-# CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
 # CONFIG_AD5755 is not set
@@ -5188,8 +5050,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADMV1013 is not set
-# CONFIG_ADMV1014 is not set
-# CONFIG_ADMV4420 is not set
 # CONFIG_ADRF6780 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@@ -5416,8 +5276,6 @@ CONFIG_YAMAHA_YAS530=m
 # CONFIG_RFD77402 is not set
 # CONFIG_SRF04 is not set
 # CONFIG_SX9310 is not set
-# CONFIG_SX9324 is not set
-# CONFIG_SX9360 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
@@ -5466,7 +5324,6 @@ CONFIG_ARM_GIC_V3_ITS=y
 # CONFIG_AL_FIC is not set
 CONFIG_PARTITION_PERCPU=y
 # CONFIG_QCOM_PDC is not set
-# CONFIG_QCOM_MPM is not set
 # end of IRQ chip support
 
 # CONFIG_IPACK_BUS is not set
@@ -5490,9 +5347,11 @@ CONFIG_GENERIC_PHY=y
 
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_CADENCE_DPHY_RX is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
 # CONFIG_PHY_CADENCE_SALVO is not set
+# CONFIG_PHY_FSL_IMX8MQ_USB is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_LAN966X_SERDES is not set
@@ -5527,6 +5386,7 @@ CONFIG_PHY_QCOM_USB_HS=y
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
+# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 # end of Performance monitor support
 
 CONFIG_RAS=y
@@ -5565,7 +5425,6 @@ CONFIG_PM_OPP=y
 # CONFIG_INTERCONNECT is not set
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
-# CONFIG_PECI is not set
 # end of Device Drivers
 
 #
@@ -5605,7 +5464,7 @@ CONFIG_F2FS_FS_LZ4=y
 CONFIG_F2FS_FS_LZ4HC=y
 CONFIG_F2FS_FS_ZSTD=y
 CONFIG_F2FS_IOSTAT=y
-# CONFIG_F2FS_UNFAIR_RWSEM is not set
+# CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -5877,7 +5736,7 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
@@ -5900,9 +5759,8 @@ CONFIG_CRYPTO_AUTHENC=m
 #
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=y
-# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
-CONFIG_CRYPTO_ECC=y
-CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
 # CONFIG_CRYPTO_SM2 is not set
@@ -5911,8 +5769,8 @@ CONFIG_CRYPTO_ECDH=y
 #
 # Authenticated Encryption with Associated Data
 #
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
 # CONFIG_CRYPTO_CHACHA20POLY1305 is not set
 # CONFIG_CRYPTO_AEGIS128 is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -5923,7 +5781,7 @@ CONFIG_CRYPTO_GCM=y
 #
 CONFIG_CRYPTO_CBC=m
 # CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTR=m
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_LRW is not set
@@ -5938,7 +5796,7 @@ CONFIG_CRYPTO_ESSIV=m
 #
 # Hash modes
 #
-CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_VMAC is not set
@@ -5952,7 +5810,7 @@ CONFIG_CRYPTO_CRC32=m
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 # CONFIG_CRYPTO_CRCT10DIF is not set
-CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_GHASH=m
 # CONFIG_CRYPTO_POLY1305 is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
@@ -5962,7 +5820,7 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=m
-# CONFIG_CRYPTO_SM3 is not set
+CONFIG_CRYPTO_SM3=m
 # CONFIG_CRYPTO_STREEBOG is not set
 # CONFIG_CRYPTO_WP512 is not set
 
@@ -6045,8 +5903,6 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # end of Certificates for signature checking
 
-CONFIG_BINARY_PRINTF=y
-
 #
 # Library routines
 #
@@ -6070,7 +5926,7 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 # Crypto library routines
 #
 CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
 CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
@@ -6084,14 +5940,12 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
 CONFIG_CRYPTO_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM3=m
 CONFIG_CRYPTO_LIB_SM4=m
 # end of Crypto library routines
 
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC64_ROCKSOFT is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -6155,6 +6009,7 @@ CONFIG_SWIOTLB=y
 # CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
+CONFIG_DMA_REMAP=y
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_CMA=y
 # CONFIG_DMA_PERNUMA_CMA is not set
@@ -6215,20 +6070,16 @@ CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
 
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
 #
 # Compile-time checks and compiler options
 #
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_DWARF5 is not set
 CONFIG_DEBUG_INFO_REDUCED=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=2048
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -6259,6 +6110,9 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
 
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
 #
 # Networking Debugging
 #
@@ -6431,6 +6285,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
@@ -6447,6 +6302,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
 CONFIG_ARCH_USE_MEMTEST=y

device/community/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.18.0 Kernel Configuration
+# Linux/arm 5.17.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
 CONFIG_CC_IS_GCC=y
@@ -15,7 +15,6 @@ CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
-CONFIG_PAHOLE_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -96,12 +95,8 @@ CONFIG_HAVE_EBPF_JIT=y
 #
 # BPF subsystem
 #
-CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_SYSCALL is not set
 CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-CONFIG_BPF_JIT_DEFAULT_ON=y
-CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
-# CONFIG_BPF_PRELOAD is not set
 # end of BPF subsystem
 
 CONFIG_PREEMPT_BUILD=y
@@ -142,7 +137,6 @@ CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU_GENERIC=y
 CONFIG_TASKS_RCU=y
-CONFIG_TASKS_TRACE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 # end of RCU Subsystem
@@ -182,7 +176,6 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_MISC is not set
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
@@ -265,7 +258,6 @@ CONFIG_PROFILING=y
 # end of General setup
 
 CONFIG_ARM=y
-CONFIG_ARM_HAS_GROUP_RELOCS=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_HAVE_PROC_CPU=y
@@ -309,7 +301,6 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # end of Multiple platform selection
 
 # CONFIG_ARCH_VIRT is not set
-# CONFIG_ARCH_AIROHA is not set
 # CONFIG_ARCH_ACTIONS is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
@@ -447,7 +438,6 @@ CONFIG_HAVE_SMP=y
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
-CONFIG_IRQSTACKS=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
@@ -483,6 +473,7 @@ CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARM_MODULE_PLTS=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
@@ -550,7 +541,6 @@ CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_DT_IDLE_STATES=y
-CONFIG_DT_IDLE_GENPD=y
 
 #
 # ARM CPU Idle Drivers
@@ -671,8 +661,6 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
@@ -684,8 +672,6 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@@ -728,7 +714,6 @@ CONFIG_MODULE_COMPRESS_NONE=y
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 # CONFIG_BLK_DEV_BSGLIB is not set
@@ -755,7 +740,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
 CONFIG_BLOCK_HOLDER_DEPRECATED=y
-CONFIG_BLK_MQ_STACKING=y
 
 #
 # IO Schedulers
@@ -807,7 +791,6 @@ CONFIG_CONTIG_ALLOC=y
 CONFIG_BOUNCE=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
@@ -819,7 +802,6 @@ CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_KMAP_LOCAL=y
@@ -850,7 +832,6 @@ CONFIG_AF_UNIX_OOB=y
 # CONFIG_TLS is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_NET_KEY is not set
-# CONFIG_XDP_SOCKETS is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -1283,7 +1264,6 @@ CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
-# CONFIG_BPF_STREAM_PARSER is not set
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -1295,13 +1275,10 @@ CONFIG_NET_FLOW_LIMIT=y
 
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-CONFIG_BT=y
+CONFIG_BT=m
 CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_RFCOMM is not set
+# CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
 # CONFIG_BT_HS is not set
 CONFIG_BT_LE=y
@@ -1341,7 +1318,7 @@ CONFIG_BT_QCOMSMD=m
 # CONFIG_AF_KCM is not set
 # CONFIG_MCTP is not set
 CONFIG_WIRELESS=y
-CONFIG_CFG80211=y
+CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
@@ -1350,7 +1327,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 # CONFIG_CFG80211_WEXT is not set
-CONFIG_MAC80211=y
+CONFIG_MAC80211=m
 CONFIG_MAC80211_HAS_RC=y
 CONFIG_MAC80211_RC_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
@@ -1399,9 +1376,6 @@ CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_SELFTESTS=m
-CONFIG_NET_SOCK_MSG=y
-CONFIG_PAGE_POOL=y
-# CONFIG_PAGE_POOL_STATS is not set
 # CONFIG_FAILOVER is not set
 CONFIG_ETHTOOL_NETLINK=y
 
@@ -1559,7 +1533,6 @@ CONFIG_QCOM_FASTRPC=m
 # CONFIG_SRAM is not set
 # CONFIG_XILINX_SDFEC is not set
 # CONFIG_HISI_HIKEY_USB is not set
-# CONFIG_OPEN_DICE is not set
 # CONFIG_C2PORT is not set
 
 #
@@ -1713,9 +1686,7 @@ CONFIG_NET_VENDOR_CIRRUS=y
 # CONFIG_CS89x0_PLATFORM is not set
 CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_GEMINI_ETHERNET is not set
-CONFIG_NET_VENDOR_DAVICOM=y
 # CONFIG_DM9000 is not set
-# CONFIG_DM9051 is not set
 # CONFIG_DNET is not set
 CONFIG_NET_VENDOR_ENGLEDER=y
 # CONFIG_TSNEP is not set
@@ -1724,7 +1695,6 @@ CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_FARADAY=y
 # CONFIG_FTMAC100 is not set
 # CONFIG_FTGMAC100 is not set
-CONFIG_NET_VENDOR_FUNGIBLE=y
 CONFIG_NET_VENDOR_GOOGLE=y
 CONFIG_NET_VENDOR_HISILICON=y
 # CONFIG_HIX5HD2_GMAC is not set
@@ -1735,6 +1705,7 @@ CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_NET_VENDOR_HUAWEI=y
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_LITEX=y
 # CONFIG_LITEX_LITEETH is not set
 CONFIG_NET_VENDOR_MARVELL=y
@@ -1750,11 +1721,10 @@ CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
-CONFIG_NET_VENDOR_MICROSOFT=y
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_AX88796 is not set
 # CONFIG_ETHOC is not set
@@ -1951,7 +1921,6 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
 # CONFIG_MT7663U is not set
 # CONFIG_MT7663S is not set
 # CONFIG_MT7921S is not set
-# CONFIG_MT7921U is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
@@ -1959,7 +1928,7 @@ CONFIG_WLAN_VENDOR_RALINK=y
 # CONFIG_RT2X00 is not set
 CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL8187 is not set
-CONFIG_RTL_CARDS=y
+CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CU is not set
 # CONFIG_RTL8XXXU is not set
 # CONFIG_RTW88 is not set
@@ -2102,7 +2071,6 @@ CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
 CONFIG_TOUCHSCREEN_MSG2638=m
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
-CONFIG_TOUCHSCREEN_IMAGIS=m
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
@@ -2222,6 +2190,7 @@ CONFIG_SERIAL_MSM_CONSOLE=y
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
@@ -2445,7 +2414,6 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_SC7180 is not set
 # CONFIG_PINCTRL_SC7280 is not set
 # CONFIG_PINCTRL_SC8180X is not set
-# CONFIG_PINCTRL_SC8280XP is not set
 # CONFIG_PINCTRL_SDM660 is not set
 # CONFIG_PINCTRL_SDM845 is not set
 # CONFIG_PINCTRL_SDX55 is not set
@@ -2563,14 +2531,12 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
-# CONFIG_IP5XXX_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
 # CONFIG_BATTERY_CW2015 is not set
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SAMSUNG_SDI is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_MANAGER_SBS is not set
@@ -2605,7 +2571,6 @@ CONFIG_BATTERY_RT5033=m
 # CONFIG_CHARGER_RT9455 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
-# CONFIG_BATTERY_UG3105 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -2722,7 +2687,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_SHT3x is not set
 # CONFIG_SENSORS_SHT4x is not set
 # CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SY7636A is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_EMC1403 is not set
 # CONFIG_SENSORS_EMC2103 is not set
@@ -2749,7 +2713,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_TMP108 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83773G is not set
@@ -2873,7 +2836,6 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_MAX77650 is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77714 is not set
 # CONFIG_MFD_MAX77843 is not set
 # CONFIG_MFD_MAX8907 is not set
 # CONFIG_MFD_MAX8925 is not set
@@ -2898,7 +2860,6 @@ CONFIG_MFD_RT5033=m
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SIMPLE_MFD_I2C is not set
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
@@ -3001,20 +2962,17 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
 # CONFIG_REGULATOR_RT4801 is not set
 CONFIG_REGULATOR_RT5033=m
-# CONFIG_REGULATOR_RT5190A 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_SY7636A is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
 # CONFIG_REGULATOR_SY8827N is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS6286X is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TPS65132=y
@@ -3053,6 +3011,7 @@ CONFIG_MEDIA_CONTROLLER=y
 #
 # Video4Linux options
 #
+CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -3075,111 +3034,21 @@ CONFIG_V4L2_ASYNC=m
 #
 # Drivers filtered as selected at 'Filter media drivers'
 #
-
-#
-# Media drivers
-#
 # CONFIG_MEDIA_USB_SUPPORT is not set
-CONFIG_MEDIA_PLATFORM_DRIVERS=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MUX is not set
-
-#
-# Allegro DVT media platform drivers
-#
-
-#
-# Amlogic media platform drivers
-#
-
-#
-# Amphion drivers
-#
-
-#
-# Aspeed media platform drivers
-#
-# CONFIG_VIDEO_ASPEED is not set
-
-#
-# Atmel media platform drivers
-#
-
-#
-# Cadence media platform drivers
-#
-# CONFIG_VIDEO_CADENCE_CSI2RX is not set
-# CONFIG_VIDEO_CADENCE_CSI2TX is not set
-
-#
-# Chips&Media media platform drivers
-#
-
-#
-# Intel media platform drivers
-#
-
-#
-# Marvell media platform drivers
-#
-
-#
-# Mediatek media platform drivers
-#
-
-#
-# NVidia media platform drivers
-#
-
-#
-# NXP media platform drivers
-#
-
-#
-# Qualcomm media platform drivers
-#
-CONFIG_VIDEO_QCOM_CAMSS=m
-CONFIG_VIDEO_QCOM_VENUS=m
-
-#
-# Renesas media platform drivers
-#
-
-#
-# Rockchip media platform drivers
-#
-
-#
-# Samsung media platform drivers
-#
-
-#
-# STMicroelectronics media platform drivers
-#
-
-#
-# Sunxi media platform drivers
-#
-
-#
-# Texas Instruments drivers
-#
-
-#
-# VIA media platform drivers
-#
-
-#
-# Xilinx media platform drivers
-#
-# CONFIG_VIDEO_XILINX is not set
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_V4L2=m
 CONFIG_VIDEOBUF2_MEMOPS=m
 CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+# CONFIG_VIDEO_CADENCE is not set
+# CONFIG_VIDEO_ASPEED is not set
+# CONFIG_VIDEO_MUX is not set
+CONFIG_VIDEO_QCOM_CAMSS=m
+# CONFIG_VIDEO_XILINX is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+CONFIG_VIDEO_QCOM_VENUS=m
 # end of Media drivers
 
 CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
@@ -3188,12 +3057,19 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # Media ancillary drivers
 #
 
+#
+# audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'
+#
+
+#
+# Video and audio decoders
+#
+
 #
 # Camera sensor devices
 #
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
-# CONFIG_VIDEO_HI847 is not set
 # CONFIG_VIDEO_IMX208 is not set
 # CONFIG_VIDEO_IMX214 is not set
 # CONFIG_VIDEO_IMX219 is not set
@@ -3205,6 +3081,33 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # 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
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV5640 is not set
+# CONFIG_VIDEO_OV5645 is not set
+# CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5670 is not set
+# CONFIG_VIDEO_OV5675 is not set
+# CONFIG_VIDEO_OV5693 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV7251 is not set
+# CONFIG_VIDEO_OV772X is not set
+# CONFIG_VIDEO_OV7640 is not set
+# CONFIG_VIDEO_OV7670 is not set
+# 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
 # CONFIG_VIDEO_MT9M111 is not set
@@ -3214,48 +3117,19 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # CONFIG_VIDEO_MT9V011 is not set
 # CONFIG_VIDEO_MT9V032 is not set
 # CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_OG01A1B is not set
-# CONFIG_VIDEO_OV02A10 is not set
-# CONFIG_VIDEO_OV08D10 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_OV13B10 is not set
-# CONFIG_VIDEO_OV2640 is not set
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV5648 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5693 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV772X is not set
-# 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_M5MOLS is not set
 # CONFIG_VIDEO_RDACM20 is not set
 # CONFIG_VIDEO_RDACM21 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
+# CONFIG_VIDEO_S5K6AA is not set
+# CONFIG_VIDEO_S5K6A3 is not set
 # CONFIG_VIDEO_S5K4ECGX is not set
 # CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_S5C73M3 is not set
 # end of Camera sensor devices
 
 #
@@ -3276,14 +3150,6 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # CONFIG_VIDEO_LM3646 is not set
 # end of Flash devices
 
-#
-# audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'
-#
-
-#
-# Video and audio decoders
-#
-
 #
 # SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'
 #
@@ -3291,7 +3157,6 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 #
 # Media SPI Adapters
 #
-# CONFIG_VIDEO_GS1662 is not set
 # end of Media SPI Adapters
 # end of Media ancillary drivers
 
@@ -3304,7 +3169,6 @@ CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_MM is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_DP_HELPER=m
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@@ -3343,6 +3207,7 @@ CONFIG_DRM_SCHED=m
 # CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_GPU_STATE=y
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
 # CONFIG_DRM_MSM_HDMI_HDCP is not set
 # CONFIG_DRM_MSM_DP is not set
 CONFIG_DRM_MSM_DSI=y
@@ -3387,7 +3252,6 @@ CONFIG_DRM_PANEL_SIMPLE=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
@@ -3418,6 +3282,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
@@ -3441,7 +3306,6 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
-# CONFIG_DRM_ITE_IT6505 is not set
 # CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9611 is not set
 # CONFIG_DRM_LONTIUM_LT9611UXC is not set
@@ -3480,7 +3344,6 @@ CONFIG_DRM_I2C_ADV7511_CEC=y
 # CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_PANEL_MIPI_DBI is not set
 CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9163 is not set
@@ -3498,7 +3361,6 @@ CONFIG_DRM_SIMPLEDRM=y
 # CONFIG_DRM_MCDE is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
-# CONFIG_DRM_SSD130X is not set
 CONFIG_DRM_LEGACY=y
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
 CONFIG_DRM_NOMODESET=y
@@ -3802,7 +3664,6 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
 # CONFIG_SND_SOC_TAS5720 is not set
-# CONFIG_SND_SOC_TAS5805M is not set
 # CONFIG_SND_SOC_TAS6424 is not set
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
@@ -3949,14 +3810,12 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PLANTRONICS is not set
 # CONFIG_HID_PLAYSTATION is not set
-# CONFIG_HID_RAZER is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_RETRODE is not set
 # CONFIG_HID_ROCCAT is not set
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SEMITEK is not set
-# CONFIG_HID_SIGMAMICRO is not set
 # CONFIG_HID_SONY is not set
 # CONFIG_HID_SPEEDLINK is not set
 # CONFIG_HID_STEAM is not set
@@ -4110,7 +3969,6 @@ CONFIG_USB_CHIPIDEA_TEGRA=y
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_QCOM_EUD is not set
 # CONFIG_APPLE_MFI_FASTCHARGE is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
@@ -4543,6 +4401,7 @@ CONFIG_STAGING=y
 # Analog to digital converters
 #
 # CONFIG_AD7816 is not set
+# CONFIG_AD7280 is not set
 # end of Analog to digital converters
 
 #
@@ -4584,8 +4443,16 @@ CONFIG_STAGING=y
 # end of IIO staging drivers
 
 # CONFIG_STAGING_MEDIA is not set
+
+#
+# Android
+#
+CONFIG_ASHMEM=y
+# end of Android
+
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
+# CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 # CONFIG_FB_TFT is not set
@@ -4618,9 +4485,9 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_LAN966X is not set
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 # CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_RS9_PCIE is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_QCOM_GDSC=y
@@ -4661,7 +4528,6 @@ CONFIG_MSM_GCC_8916=y
 # CONFIG_MSM_GPUCC_8998 is not set
 # CONFIG_MSM_MMCC_8998 is not set
 # CONFIG_QCM_GCC_2290 is not set
-# CONFIG_QCM_DISPCC_2290 is not set
 # CONFIG_QCS_GCC_404 is not set
 # CONFIG_SC_CAMCC_7180 is not set
 # CONFIG_SC_CAMCC_7280 is not set
@@ -4689,8 +4555,8 @@ CONFIG_MSM_GCC_8916=y
 # CONFIG_SDM_DISPCC_845 is not set
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_55 is not set
-# CONFIG_SDX_GCC_65 is not set
 # CONFIG_SM_CAMCC_8250 is not set
+# CONFIG_SDX_GCC_65 is not set
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
 # CONFIG_SM_GCC_6350 is not set
@@ -4698,7 +4564,6 @@ CONFIG_MSM_GCC_8916=y
 # CONFIG_SM_GCC_8250 is not set
 # CONFIG_SM_GCC_8350 is not set
 # CONFIG_SM_GCC_8450 is not set
-# CONFIG_SM_GPUCC_6350 is not set
 # CONFIG_SM_GPUCC_8150 is not set
 # CONFIG_SM_GPUCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
@@ -4774,7 +4639,6 @@ CONFIG_QCOM_WCNSS_PIL=m
 #
 CONFIG_RPMSG=y
 CONFIG_RPMSG_CHAR=y
-# CONFIG_RPMSG_CTRL is not set
 # CONFIG_RPMSG_NS is not set
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
@@ -4913,8 +4777,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_ADXL345_SPI is not set
 # CONFIG_ADXL355_I2C is not set
 # CONFIG_ADXL355_SPI is not set
-# CONFIG_ADXL367_SPI is not set
-# CONFIG_ADXL367_I2C is not set
 # CONFIG_ADXL372_SPI is not set
 # CONFIG_ADXL372_I2C is not set
 # CONFIG_BMA180 is not set
@@ -4958,7 +4820,6 @@ CONFIG_KXCJK1013=m
 # CONFIG_AD7124 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
-# CONFIG_AD7280 is not set
 # CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
 # CONFIG_AD7298 is not set
@@ -5034,7 +4895,6 @@ CONFIG_QCOM_SPMI_VADC=y
 # Amplifiers
 #
 # CONFIG_AD8366 is not set
-# CONFIG_ADA4250 is not set
 # CONFIG_HMC425 is not set
 # end of Amplifiers
 
@@ -5097,7 +4957,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5593R is not set
 # CONFIG_AD5504 is not set
 # CONFIG_AD5624R_SPI is not set
-# CONFIG_LTC2688 is not set
 # CONFIG_AD5686_SPI is not set
 # CONFIG_AD5696_I2C is not set
 # CONFIG_AD5755 is not set
@@ -5152,7 +5011,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # CONFIG_ADMV1013 is not set
-# CONFIG_ADMV4420 is not set
 # CONFIG_ADRF6780 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@@ -5379,8 +5237,6 @@ CONFIG_YAMAHA_YAS530=m
 # CONFIG_RFD77402 is not set
 # CONFIG_SRF04 is not set
 # CONFIG_SX9310 is not set
-# CONFIG_SX9324 is not set
-# CONFIG_SX9360 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
@@ -5426,7 +5282,6 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_AL_FIC is not set
 # CONFIG_QCOM_PDC is not set
-# CONFIG_QCOM_MPM is not set
 # end of IRQ chip support
 
 # CONFIG_IPACK_BUS is not set
@@ -5449,9 +5304,11 @@ CONFIG_GENERIC_PHY=y
 
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_CADENCE_DPHY_RX is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
 # CONFIG_PHY_CADENCE_SALVO is not set
+# CONFIG_PHY_FSL_IMX8MQ_USB is not set
+# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_LAN966X_SERDES is not set
@@ -5520,7 +5377,6 @@ CONFIG_PM_OPP=y
 # CONFIG_INTERCONNECT is not set
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
-# CONFIG_PECI is not set
 # end of Device Drivers
 
 #
@@ -5560,7 +5416,6 @@ CONFIG_F2FS_FS_LZ4=y
 CONFIG_F2FS_FS_LZ4HC=y
 CONFIG_F2FS_FS_ZSTD=y
 CONFIG_F2FS_IOSTAT=y
-# CONFIG_F2FS_UNFAIR_RWSEM is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -5815,7 +5670,7 @@ CONFIG_CRYPTO=y
 #
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y
@@ -5823,7 +5678,7 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
@@ -5847,9 +5702,8 @@ CONFIG_CRYPTO_SIMD=y
 #
 CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=y
-# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set
-CONFIG_CRYPTO_ECC=y
-CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
 # CONFIG_CRYPTO_SM2 is not set
@@ -5858,8 +5712,8 @@ CONFIG_CRYPTO_ECDH=y
 #
 # Authenticated Encryption with Associated Data
 #
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
 # CONFIG_CRYPTO_CHACHA20POLY1305 is not set
 # CONFIG_CRYPTO_AEGIS128 is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -5870,7 +5724,7 @@ CONFIG_CRYPTO_GCM=y
 #
 CONFIG_CRYPTO_CBC=m
 # CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTR=m
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_LRW is not set
@@ -5885,7 +5739,7 @@ CONFIG_CRYPTO_ESSIV=m
 #
 # Hash modes
 #
-CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_VMAC is not set
@@ -5899,7 +5753,7 @@ CONFIG_CRYPTO_CRC32=m
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 # CONFIG_CRYPTO_CRCT10DIF is not set
-CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_GHASH=m
 # CONFIG_CRYPTO_POLY1305 is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
@@ -5990,8 +5844,6 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # end of Certificates for signature checking
 
-CONFIG_BINARY_PRINTF=y
-
 #
 # Library routines
 #
@@ -6012,7 +5864,7 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 # Crypto library routines
 #
 CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_LIB_ARC4=m
 CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
 CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
 CONFIG_CRYPTO_LIB_CHACHA=m
@@ -6026,14 +5878,12 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
 CONFIG_CRYPTO_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM3=m
 CONFIG_CRYPTO_LIB_SM4=m
 # end of Crypto library routines
 
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC64_ROCKSOFT is not set
 # CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
@@ -6090,6 +5940,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_DMA_NONCOHERENT_MMAP=y
+CONFIG_DMA_REMAP=y
 CONFIG_DMA_CMA=y
 # CONFIG_DMA_PERNUMA_CMA is not set
 
@@ -6148,20 +5999,16 @@ CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
 
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
 #
 # Compile-time checks and compiler options
 #
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_NONE is not set
-CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
-# CONFIG_DEBUG_INFO_DWARF4 is not set
-# CONFIG_DEBUG_INFO_DWARF5 is not set
 CONFIG_DEBUG_INFO_REDUCED=y
 # CONFIG_DEBUG_INFO_COMPRESSED is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_DWARF5 is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -6189,6 +6036,9 @@ CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
 
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
 #
 # Networking Debugging
 #
@@ -6361,6 +6211,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_SIPHASH is not set
 # CONFIG_TEST_IDA is not set
@@ -6377,6 +6228,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_STACKINIT is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
 CONFIG_ARCH_USE_MEMTEST=y

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

@@ -3,8 +3,8 @@
 
 _flavor="postmarketos-qcom-msm8996"
 pkgname=linux-$_flavor
-pkgver=5.18.1
-pkgrel=1
+pkgver=5.16.12
+pkgrel=0
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
 arch="aarch64"
 _carch="arm64"
@@ -15,7 +15,6 @@ options="!strip !check !tracedeps
 	pmb:kconfigcheck-nftables
 	pmb:kconfigcheck-anbox
 	pmb:kconfigcheck-containers
-	pmb:kconfigcheck-iwd
 	pmb:kconfigcheck-zram
 "
 makedepends="bison findutils flex installkernel openssl-dev perl"
@@ -54,6 +53,6 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb
 }
 sha512sums="
-909d9735623b9cf20e1efa735e520eed579751bcbb45f95821d489d993424c8ac3699f3fdbdd339c70188acb5b6315fee4a7dd9087f098e5dc23c1498277cc56  linux-v5.18.1-msm8996.tar.gz
-289a080aa4977141d2d36c5e2cc459d23241fbc59c3754768b08f93de6311950607379eac00dc84acd25c1974f495c508cb17b2111a08b53cd8dabb09b39abaa  config-postmarketos-qcom-msm8996.aarch64
+2cbe733bf4c76417ff7f0222564dcfb8d1c183d74c926dd0959b9b3ed794899d3306cce7b1c78d34400ca6c9bed6ae4fe6e52d5e9cc86fef4ec26f45bfdc426b  linux-v5.16.12-msm8996.tar.gz
+aec533a349a2fc7e9ad8bc0ee9bc574f387d22bb75b03a1735761e2f89bf209341e5353d886651d67bb01676e75709f399d908715eb7dcc547baa70a63503c14  config-postmarketos-qcom-msm8996.aarch64
 "

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

@@ -5,8 +5,8 @@
 
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=5.18.3
-pkgrel=0
+pkgver=5.17.0
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -23,7 +23,7 @@ makedepends="bison findutils flex installkernel openssl-dev perl"
 
 _repo="linux"
 _config="config-$_flavor.$arch"
-_tag="sdm845-5.18.3"
+_tag="sdm845-5.17.0-r1"
 
 # Source
 source="
@@ -62,6 +62,6 @@ package() {
 }
 
 sha512sums="
-b35bb5dc9bd7bef8fdafd34cb34e7cb04a120f60b2310c67979f7431c584f1ed41da10e64165a1ae508474b918cdacc538ff0370aed21e7f55bb82ea237d9a47  linux-sdm845-5.18.3.tar.gz
-2e2cc1f3eeab99a9639be9d89be36616aa76e09278c16d4cad218c57c29ac05dca3e1599a8c9d1ed1bf0d895fc6d1cff9b5bf23da6e52f1522bc1ff2f38b014c  config-postmarketos-qcom-sdm845.aarch64
+3c2ac7f9e89375ab06bfd5977359ba09d33bb6dc3258442ef84edeef368c303367b1049541c16e93ca20be09238906eed1bb8167cac0b77b3e71cbf2fb0b36d1  linux-sdm845-5.17.0-r1.tar.gz
+adff5d8d37984322a26bc6d87ca8b26ba1a70537597c382d2b8fc829bee0004c568dbcf38ad4f510b83b42db9c325d91e1d3a134531766bebc40ce5a00f77a69  config-postmarketos-qcom-sdm845.aarch64
 "

device/community/linux-postmarketos-rockchip/0001-phy-rockchip-typec-Set-extcon-capabilities.patch

@@ -0,0 +1,49 @@
+From db4e9ffdb985752ae3c3436ff86f8f376ae8fd22 Mon Sep 17 00:00:00 2001
+From: Tobias Schramm <t.schramm@manjaro.org>
+Date: Thu, 28 May 2020 14:25:32 +0200
+Subject: [PATCH] phy: rockchip: typec: Set extcon capabilities
+
+Do not mainline, hack.
+
+Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
+---
+ drivers/phy/rockchip/phy-rockchip-typec.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
+index 70a31251b202..5385bb4f0bd4 100644
+--- a/drivers/phy/rockchip/phy-rockchip-typec.c
++++ b/drivers/phy/rockchip/phy-rockchip-typec.c
+@@ -40,6 +40,7 @@
+ #include <linux/clk-provider.h>
+ #include <linux/delay.h>
+ #include <linux/extcon.h>
++#include <linux/extcon-provider.h>
+ #include <linux/io.h>
+ #include <linux/iopoll.h>
+ #include <linux/kernel.h>
+@@ -1160,6 +1161,22 @@ static int rockchip_typec_phy_probe(struct platform_device *pdev)
+ 				dev_err(dev, "Invalid or missing extcon\n");
+ 			return PTR_ERR(tcphy->extcon);
+ 		}
++	} else {
++		extcon_set_property_capability(tcphy->extcon, EXTCON_USB,
++					       EXTCON_PROP_USB_SS);
++		extcon_set_property_capability(tcphy->extcon, EXTCON_USB_HOST,
++					       EXTCON_PROP_USB_SS);
++		extcon_set_property_capability(tcphy->extcon, EXTCON_DISP_DP,
++					       EXTCON_PROP_USB_SS);
++		extcon_set_property_capability(tcphy->extcon, EXTCON_USB,
++					       EXTCON_PROP_USB_TYPEC_POLARITY);
++		extcon_set_property_capability(tcphy->extcon, EXTCON_USB_HOST,
++					       EXTCON_PROP_USB_TYPEC_POLARITY);
++		extcon_set_property_capability(tcphy->extcon, EXTCON_DISP_DP,
++					       EXTCON_PROP_USB_TYPEC_POLARITY);
++		extcon_sync(tcphy->extcon, EXTCON_USB);
++		extcon_sync(tcphy->extcon, EXTCON_USB_HOST);
++		extcon_sync(tcphy->extcon, EXTCON_DISP_DP);
+ 	}
+ 
+ 	pm_runtime_enable(dev);
+-- 
+GitLab 

device/community/linux-postmarketos-rockchip/0003-arm64-dts-rockchip-add-typec-extcon-hack.patch

@@ -0,0 +1,44 @@
+From 948d7ade0ddcf292b91d91cb8b6819a19ab3f604 Mon Sep 17 00:00:00 2001
+From: Tobias Schramm <t.schramm@manjaro.org>
+Date: Thu, 28 May 2020 14:44:15 +0200
+Subject: [PATCH] arm64: dts: rockchip: add typec extcon hack
+
+Not for mainline
+
+Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
+---
+ arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+index decb212e2dca..37f967a89401 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+@@ -401,6 +401,7 @@ opp08 {
+ 
+ &cdn_dp {
+ 	status = "okay";
++	extcon = <&fusb0>;
+ };
+ 
+ &cpu_b0 {
+@@ -735,6 +736,9 @@ connector {
+ 				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
+ 			try-power-role = "sink";
+ 
++			extcon-cables = <1 2 5 6 9 10 12 44>;
++			typec-altmodes = <0xff01 1 0x001c0000 1>;
++
+ 			ports {
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
+@@ -1002,6 +1006,7 @@ spiflash: flash@0 {
+ };
+ 
+ &tcphy0 {
++	extcon = <&fusb0>;
+ 	status = "okay";
+ };
+ 
+-- 
+GitLab 

device/community/linux-postmarketos-rockchip/0010-usb-typec-add-extcon-to-tcpm.patch

@@ -0,0 +1,226 @@
+From ed2bd8b9262b5367b0e253ffbb238ee85d82f52f Mon Sep 17 00:00:00 2001
+From: Dan Johansen <strit@manjaro.org>
+Date: Tue, 25 May 2021 22:50:01 +0200
+Subject: [PATCH] usb/typec: add extcon to tcpm
+
+---
+ drivers/usb/typec/tcpm/tcpm.c | 133 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 132 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
+index 64133e586c64..8fa1d0993b97 100644
+--- a/drivers/usb/typec/tcpm/tcpm.c
++++ b/drivers/usb/typec/tcpm/tcpm.c
+@@ -8,6 +8,7 @@
+ #include <linux/completion.h>
+ #include <linux/debugfs.h>
+ #include <linux/device.h>
++#include <linux/extcon-provider.h>
+ #include <linux/hrtimer.h>
+ #include <linux/jiffies.h>
+ #include <linux/kernel.h>
+@@ -468,6 +469,12 @@ struct tcpm_port {
+ 	 * SNK_READY for non-pd link.
+ 	 */
+ 	bool slow_charger_loop;
++
++#ifdef CONFIG_EXTCON
++	struct extcon_dev *extcon;
++	unsigned int *extcon_cables;
++#endif
++
+ #ifdef CONFIG_DEBUG_FS
+ 	struct dentry *dentry;
+ 	struct mutex logbuffer_lock;	/* log buffer access lock */
+@@ -824,6 +831,33 @@ static void tcpm_ams_finish(struct tcpm_port *port)
+ 	port->ams = NONE_AMS;
+ }
+ 
++static void tcpm_update_extcon_data(struct tcpm_port *port, bool attached) {
++#ifdef CONFIG_EXTCON
++	unsigned int *capability = port->extcon_cables;
++	if (port->data_role == TYPEC_HOST) {
++		extcon_set_state(port->extcon, EXTCON_USB, false);
++		extcon_set_state(port->extcon, EXTCON_USB_HOST, attached);
++	} else {
++		extcon_set_state(port->extcon, EXTCON_USB, true);
++		extcon_set_state(port->extcon, EXTCON_USB_HOST, attached);
++	}
++	while(*capability != EXTCON_NONE) {
++		union extcon_property_value val;
++		val.intval = true;
++		extcon_set_property(port->extcon, *capability, EXTCON_PROP_USB_SS, val);
++		val.intval = (port->polarity == TYPEC_POLARITY_CC2);
++		extcon_set_property(port->extcon, *capability,
++			EXTCON_PROP_USB_TYPEC_POLARITY, val);
++		extcon_sync(port->extcon, *capability);
++		capability++;
++	}
++	tcpm_log(port, "Extcon update (%s): %s, %s",
++		attached ? "attached" : "detached",
++		port->data_role == TYPEC_HOST ? "host" : "device",
++		port->polarity == TYPEC_POLARITY_CC1 ? "normal" : "flipped");
++#endif
++}
++
+ static int tcpm_pd_transmit(struct tcpm_port *port,
+ 			    enum tcpm_transmit_type type,
+ 			    const struct pd_message *msg)
+@@ -1036,6 +1070,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached,
+ 	typec_set_data_role(port->typec_port, data);
+ 	typec_set_pwr_role(port->typec_port, role);
+ 
++	tcpm_update_extcon_data(port, attached);
++
+ 	return 0;
+ }
+ 
+@@ -1484,7 +1520,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt)
+ 		paltmode->mode = i;
+ 		paltmode->vdo = p[i];
+ 
+-		tcpm_log(port, " Alternate mode %d: SVID 0x%04x, VDO %d: 0x%08x",
++		tcpm_log(port, "Alternate mode %d: SVID 0x%04x, VDO %d: 0x%08x",
+ 			 pmdata->altmodes, paltmode->svid,
+ 			 paltmode->mode, paltmode->vdo);
+ 
+@@ -1629,6 +1665,7 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
+ 			modep->svid_index++;
+ 			if (modep->svid_index < modep->nsvids) {
+ 				u16 svid = modep->svids[modep->svid_index];
++                 tcpm_log(port, "More modes available, sending discover");
+ 				response[0] = VDO(svid, 1, svdm_version, CMD_DISCOVER_MODES);
+ 				rlen = 1;
+ 			} else {
+@@ -3610,6 +3647,8 @@ static void tcpm_detach(struct tcpm_port *port)
+ 	}
+ 
+ 	tcpm_reset_port(port);
++
++	tcpm_update_extcon_data(port, false);
+ }
+ 
+ static void tcpm_src_detach(struct tcpm_port *port)
+@@ -5808,6 +5847,64 @@ void tcpm_tcpc_reset(struct tcpm_port *port)
+ }
+ EXPORT_SYMBOL_GPL(tcpm_tcpc_reset);
+ 
++static int tcpm_fw_get_caps_late(struct tcpm_port *port,
++			    struct fwnode_handle *fwnode)
++{
++	int ret, i;
++	ret = fwnode_property_count_u32(fwnode, "typec-altmodes");
++	if (ret > 0) {
++		u32 *props;
++		if (ret % 4) {
++			dev_err(port->dev, "Length of typec altmode array must be divisible by 4");
++			return -EINVAL;
++		}
++
++		props = devm_kzalloc(port->dev, sizeof(u32) * ret, GFP_KERNEL);
++		if (!props) {
++			dev_err(port->dev, "Failed to allocate memory for altmode properties");
++			return -ENOMEM;
++		}
++
++		if(fwnode_property_read_u32_array(fwnode, "typec-altmodes", props, ret) < 0) {
++			dev_err(port->dev, "Failed to read altmodes from port");
++			return -EINVAL;
++		}
++
++		i = 0;
++		while (ret > 0 && i < ARRAY_SIZE(port->port_altmode)) {
++			struct typec_altmode *alt;
++			struct typec_altmode_desc alt_desc = {
++				.svid = props[i * 4],
++				.mode = props[i * 4 + 1],
++				.vdo  = props[i * 4 + 2],
++				.roles = props[i * 4 + 3],
++			};
++
++
++			tcpm_log(port, "Adding altmode SVID: 0x%04x, mode: %d, vdo: %u, role: %d",
++				alt_desc.svid, alt_desc.mode, alt_desc.vdo, alt_desc.roles);
++			alt = typec_port_register_altmode(port->typec_port,
++							  &alt_desc);
++			if (IS_ERR(alt)) {
++				tcpm_log(port,
++					 "%s: failed to register port alternate mode 0x%x",
++					 dev_name(port->dev), alt_desc.svid);
++				break;
++			}
++			typec_altmode_set_drvdata(alt, port);
++			alt->ops = &tcpm_altmode_ops;
++			port->port_altmode[i] = alt;
++			i++;
++			ret -= 4;
++		}
++	}
++	return 0;
++}
++
++unsigned int default_supported_cables[] = {
++	EXTCON_NONE
++};
++
+ static int tcpm_fw_get_caps(struct tcpm_port *port,
+ 			    struct fwnode_handle *fwnode)
+ {
+@@ -5827,6 +5924,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
+ 	 */
+ 	fw_devlink_purge_absent_suppliers(fwnode);
+ 
++#ifdef CONFIG_EXTCON
++	ret = fwnode_property_count_u32(fwnode, "extcon-cables");
++	if (ret > 0) {
++		port->extcon_cables = devm_kzalloc(port->dev, sizeof(u32) * ret, GFP_KERNEL);
++		if (!port->extcon_cables) {
++			dev_err(port->dev, "Failed to allocate memory for extcon cable types. "\
++				"Using default tyes");
++			goto extcon_default;
++		}
++		fwnode_property_read_u32_array(fwnode, "extcon-cables", port->extcon_cables, ret);
++	} else {
++extcon_default:
++		dev_info(port->dev, "No cable types defined, using default cables");
++		port->extcon_cables = default_supported_cables;
++	}
++#endif
++
+ 	/* USB data support is optional */
+ 	ret = fwnode_property_read_string(fwnode, "data-role", &cap_str);
+ 	if (ret == 0) {
+@@ -6226,6 +6340,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+ 		goto out_destroy_wq;
+ 
+ 	port->try_role = port->typec_caps.prefer_role;
++#ifdef CONFIG_EXTCON
++	port->extcon = devm_extcon_dev_allocate(dev, port->extcon_cables);
++	if (IS_ERR(port->extcon)) {
++		dev_err(dev, "Failed to allocate extcon device: %ld", PTR_ERR(port->extcon));
++		goto out_destroy_wq;
++	}
++	if((err = devm_extcon_dev_register(dev, port->extcon))) {
++		dev_err(dev, "Failed to register extcon device: %d", err);
++		goto out_destroy_wq;
++	}
++#endif
+ 
+ 	port->typec_caps.fwnode = tcpc->fwnode;
+ 	port->typec_caps.revision = 0x0120;	/* Type-C spec release 1.2 */
+@@ -6259,6 +6384,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+ 				     &tcpm_altmode_ops, port,
+ 				     port->port_altmode, ALTMODE_DISCOVERY_MAX);
+ 
++	err = tcpm_fw_get_caps_late(port, tcpc->fwnode);
++	if (err < 0) {
++		dev_err(dev, "Failed to get altmodes from fwnode");
++		goto out_destroy_wq;
++	}
++
+ 	mutex_lock(&port->lock);
+ 	tcpm_init(port);
+ 	mutex_unlock(&port->lock);
+-- 
+2.31.1
+

device/community/linux-postmarketos-rockchip/APKBUILD

@@ -10,8 +10,8 @@
 # boot failure
 
 pkgname=linux-postmarketos-rockchip
-pkgver=5.18
-pkgrel=2
+pkgver=5.16.8
+pkgrel=1
 pkgdesc="Mainline kernel for rockchip devices"
 arch="aarch64 armv7"
 _flavor="${pkgname#linux-}"
@@ -54,6 +54,9 @@ esac
 
 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
+	0010-usb-typec-add-extcon-to-tcpm.patch
 	0007-block-partitions-efi-Add-support-for-IGNOREME-GPT-si.patch
 
 	config-$_flavor.aarch64
@@ -94,8 +97,11 @@ package() {
 
 
 sha512sums="
-dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5  linux-5.18.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
+e5cc0852506ea1e73213672f0c3f9144c08156f6d5e8af841bf3f7bffc0e89028507aac4718353eee20edd9069e3f81665caa5ca25e416f25e7e0da10451b67e  0010-usb-typec-add-extcon-to-tcpm.patch
 265b05bc542edb290ec15cd5f50132698a32e80d30ce28ce3ad7e990b7c07df92c4556122505b07a6aa582a919459872d1d874f4ed422d2aff2cdfb51889e720  0007-block-partitions-efi-Add-support-for-IGNOREME-GPT-si.patch
-9633e576fa04ed0ca38797082c15413016d273d6b601aa2f424001e7c33d2887090e27badb9d32ff6b3bf931ca0a994afda1b8971f14be76f64149b87db562de  config-postmarketos-rockchip.aarch64
-4eb095196a5e8e8e42de6d3e362c99498d1c7601c7ce91ea532abe9288e2e71ef20549dec22825ff547129c7c615a6a837e39dc64e9260ccadaf5c6bcf52bf58  config-postmarketos-rockchip.armv7
+5dc0ed5b947ca8153e3b3874cf380208b0736a0e5db25fbeddf4c9cbb8d121d20de130462c99f9f398f4d28a229eac8cf384d9170fff5d56a48e5aec1c1eea9e  config-postmarketos-rockchip.aarch64
+381064728710b2e74fbf623e7ce2ab84251ec656030e8c96c5f7630afd9e6786f725791ef5b4493eb6c821a0b87126e391a94b0ffc6999c4580f870b9cdfa1c8  config-postmarketos-rockchip.armv7
 "