From 93f4fe9dce48f271304b95ca644d2fe62ea5b2f7 Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Wed, 5 Apr 2023 13:29:13 +0300
Subject: [PATCH] upg linux-firmware

---
 linux-firmware/PKGBUILD      | 27 +++++++++++++++++++++------
 linux-firmware/PKGBUILD-arch | 10 ++++++----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/linux-firmware/PKGBUILD b/linux-firmware/PKGBUILD
index 7dff980..50d2c1b 100644
--- a/linux-firmware/PKGBUILD
+++ b/linux-firmware/PKGBUILD
@@ -8,12 +8,11 @@
 pkgbase=linux-firmware
 pkgname=(linux-firmware-whence linux-firmware amd-ucode
          linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x})
-_tag=20220913
-pkgver=20220913.f09bebf
-pkgrel=01
+_tag=20230310
+pkgver=20230310.588dd071
+pkgrel=1
 pkgdesc="Firmware files for Linux"
 url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
-arch=('any')
 makedepends=('git')
 options=(!strip)
 source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed"
@@ -98,7 +97,7 @@ package_linux-firmware() {
   _pick linux-firmware-marvell usr/share/licenses/${pkgname}/LICENCE.{Marvell,NXP}
 
   _pick linux-firmware-qcom usr/lib/firmware/{qcom,a300_*}
-  _pick linux-firmware-qcom usr/share/licenses/${pkgname}/LICENSE.qcom
+  _pick linux-firmware-qcom usr/share/licenses/${pkgname}/LICENSE.qcom*
 
   _pick linux-firmware-liquidio usr/lib/firmware/liquidio
   _pick linux-firmware-liquidio usr/share/licenses/${pkgname}/LICENCE.cavium_liquidio
@@ -137,6 +136,9 @@ package_linux-firmware-marvell() {
   depends=('linux-firmware-whence')
 
   mv -v linux-firmware-marvell/* "${pkgdir}"
+
+  # remove arm64 firmware #76583
+  rm "${pkgdir}"/usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img.xz
 }
 
 package_linux-firmware-qcom() {
@@ -167,7 +169,9 @@ package_linux-firmware-bnx2x() {
   mv -v linux-firmware-bnx2x/* "${pkgdir}"
 }
 
-#---- license gpg-key sha256sums ----
+#---- arch license gpg-key & sha256sums ----
+
+arch=(x86_64)
 
 license=('GPL2' 'GPL3' 'custom')
 
@@ -176,4 +180,15 @@ validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@
 sha256sums=(SKIP # linux-firmware
             aa11b2eed9c0be42571b45eb7153908a43290f02a5fc715aefcaa81030a1832f) # 0001-Add-support-for-compressing-firmware-in-copy-firmware.patch 
 
+##  41d5d0c9f089788bc5e58e829cd525f2034bfdab8e5f62225bcb54c6a6105bf8  amd-ucode-20230310.588dd071-1-x86_64.pkg.tar.lz
+##  66149fce218cc3d45009b039eb6331ecf37eb41351e7117aab239a7d720b2cb9  linux-firmware-20230310.588dd071-1-x86_64.pkg.tar.lz
+##  ca95a77336ac00a1125292edd6e4f8ffef2b40d5676e6f21da9bf554d1899c07  linux-firmware-bnx2x-20230310.588dd071-1-x86_64.pkg.tar.lz
+##  b9c608567f0c5d50d414304ab0b0a3af8a096b6a8f2a2b23af1ea55a72a0f34d  linux-firmware-liquidio-20230310.588dd071-1-x86_64.pkg.tar.lz
+##  cfa9b9c7cc9e2fa10f312f586a89ef47de25da4ad66e7c7f224addba196f7f66  linux-firmware-marvell-20230310.588dd071-1-x86_64.pkg.tar.lz
+##  c53ecbf0d8642d4d620c2699cd7d5611150b0457ae7a2ec66f451b2f1ed7dcf3  linux-firmware-mellanox-20230310.588dd071-1-x86_64.pkg.tar.lz
+##  3679fdf498ae74462aed0b8819da5c71fb95824344c931fb4e08d3fe53660d64  linux-firmware-nfp-20230310.588dd071-1-x86_64.pkg.tar.lz
+##  b125b7d54f38a3e0e4fbc73f69625cc8fdfa3452805659b48d1a2a07bab15688  linux-firmware-qcom-20230310.588dd071-1-x86_64.pkg.tar.lz
+##  0a2fece487e7cd977fc02c4d5bd2741268a6354ee4e5b7e822f09210dfd46b9d  linux-firmware-qlogic-20230310.588dd071-1-x86_64.pkg.tar.lz
+##  0024b73c432b94625ee08c5597c55f97a6e4cb5a80426fd6f487a07bab4cbe74  linux-firmware-whence-20230310.588dd071-1-x86_64.pkg.tar.lz
+
 
diff --git a/linux-firmware/PKGBUILD-arch b/linux-firmware/PKGBUILD-arch
index 382052c..e874e63 100644
--- a/linux-firmware/PKGBUILD-arch
+++ b/linux-firmware/PKGBUILD-arch
@@ -4,8 +4,8 @@ pkgbase=linux-firmware
 pkgname=(linux-firmware-whence linux-firmware amd-ucode
          linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x}
 )
-_tag=20220913
-pkgver=20220913.f09bebf
+_tag=20230310
+pkgver=20230310.588dd07
 pkgrel=1
 pkgdesc="Firmware files for Linux"
 url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
@@ -98,7 +98,7 @@ package_linux-firmware() {
   _pick linux-firmware-marvell usr/share/licenses/${pkgname}/LICENCE.{Marvell,NXP}
 
   _pick linux-firmware-qcom usr/lib/firmware/{qcom,a300_*}
-  _pick linux-firmware-qcom usr/share/licenses/${pkgname}/LICENSE.qcom
+  _pick linux-firmware-qcom usr/share/licenses/${pkgname}/LICENSE.qcom*
 
   _pick linux-firmware-liquidio usr/lib/firmware/liquidio
   _pick linux-firmware-liquidio usr/share/licenses/${pkgname}/LICENCE.cavium_liquidio
@@ -135,8 +135,10 @@ package_linux-firmware-mellanox() {
 package_linux-firmware-marvell() {
   pkgdesc+=" - marvell / Firmware for Marvell devices"
   depends=('linux-firmware-whence')
-
+  
   mv -v linux-firmware-marvell/* "${pkgdir}"
+  # remove arm64 firmware #76583
+  rm "${pkgdir}"/usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img.xz
 }
 
 package_linux-firmware-qcom() {