Update RB5 firmware packageHEADmaster

  * Update debian/compat
  * Drop mdt+bNN files not used anymore
  * Update to use newer firmware-nonfree, which includes e.g. board data, ZAP
    shader, etc.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

6 files changed, 15 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index 9f02264..6906b37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+linux-board-support-package-rb5 (1:20210331-v4+linaro2) UNRELEASED; urgency=medium
+
+  * Update debian/compat
+  * Drop mdt+bNN files not used anymore
+  * Update to use newer firmware-nonfree, which includes e.g. board data, ZAP
+    shader, etc.
+
+ -- Dmitry Baryshkov <dbaryshkov@gmail.com>  Thu, 20 Oct 2022 16:43:22 +0300
+
 linux-board-support-package-rb5 (1:20210331-v4+linaro1) unstable; urgency=medium
 
   * d/firmware-qcom-rb5.install: drop a650 firmware being part of firmware-qcom-soc
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 06e9ca6..df1faf8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: non-free/kernel
 Priority: optional
 Maintainer: Anibal Limon <anibal.limon@linaro.org>
 Standards-Version: 4.5.1
-Build-Depends: unzip, debhelper (>= 10~), python3
+Build-Depends: unzip, debhelper-compat (= 12)
 Vcs-Browser: https://git.linaro.org/landing-teams/working/qualcomm/pkg/linux-board-support-package-rb5.git
 
 Package: firmware-qcom-rb5
 Architecture: all
-Depends: ${misc:Depends}, firmware-qcom-soc (>= 20210427~)
-Replaces: firmware-qcom-soc (<= 20210403~)
+Depends: ${misc:Depends}, firmware-qcom-soc (>= 20220913~)
+Replaces: firmware-qcom-soc (<= 20220913~)
 Description: Binary firmware for various Qualcomm drivers used on Robotics RB5
- This package contains the binary firmware for GPU, Venus, DSP hardware
- coprocessors found on SM8250, which is the main SoC on the Robotics RB5.
+ This package contains the binary firmware for the SM8250, which is the main
+ SoC on the Robotics RB5.
  .
diff --git a/debian/firmware-qcom-rb5.install b/debian/firmware-qcom-rb5.install
index 2f1a3e6..3fb88ad 100644
--- a/debian/firmware-qcom-rb5.install
+++ b/debian/firmware-qcom-rb5.install
@@ -1,12 +1,2 @@
-# split zap shader for backwards compatibility
-RB5_firmware_*/18-adreno-fw/a650_zap.mdt lib/firmware/qcom
-RB5_firmware_*/18-adreno-fw/a650_zap.b* lib/firmware/qcom
-# split *DSP firmware for backwards compatibility
-RB5_firmware_*/20-adsp_split/adsp.mdt lib/firmware/qcom/sm8250/
-RB5_firmware_*/20-adsp_split/adsp.b* lib/firmware/qcom/sm8250/
-RB5_firmware_*/21-cdsp_split/cdsp.mdt lib/firmware/qcom/sm8250/
-RB5_firmware_*/21-cdsp_split/cdsp.b* lib/firmware/qcom/sm8250/
 # DSP fs image
 RB5_firmware_*/08-dspso/dspso.bin lib/firmware/qcom/sm8250/
-# WiFi board data
-board-2.bin lib/firmware/ath11k/QCA6390/hw2.0/
diff --git a/debian/rules b/debian/rules
index 2371c15..9fc8dd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,6 @@ override_dh_auto_build:
 	unzip -q $(ZIP_ORIG) -d $(DIR_ORIG)
 	cp ./$(DIR_ORIG)/LICENSE.qcom.txt debian/copyright
 
-	bash ./debian/ath10k_helpers/generate_board-2_json.sh ./$(DIR_ORIG)/38-bdwlan_split/ board-2.json
-	python3 ./debian/ath10k_helpers/ath10k-bdencoder -m ath11k -c board-2.json -o board-2.bin
-
-	cp ./$(DIR_ORIG)/18-adreno-fw/a650_zap.elf a650_zap.mbn
-
 override_dh_auto_clean:
 	if [ -d $(DIR_ORIG) ] ; then chmod u+w $(DIR_ORIG) -R ; fi
 	rm -rf $(DIR_ORIG)
diff --git a/debian/source/options b/debian/source/options
index 5f9e942..4652b7f 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,3 @@
 --tar-ignore .git
 --tar-ignore .gitignore
+--diff-ignore .git.*