From f5dac18ae5213649ff37f9198e3e01d76b56a6a4 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Thu, 5 Jan 2017 12:00:25 +0100
Subject: [PATCH] meta-digi-arm: firmware-qualcomm: Match board file and UTF
 board file.

As discovered during certifications preparation work, calibration changes
applied only on the bdwlan30.bin file do not take effect.

Per QCA guidelines, the bdwlan30.bin and utfbd30.bin files should be the
same for the calibration changes to work.

This commit removes the current utfbd30.bin file, with an md5sum that
matches the original bdwlan30.bin file in QCA's chipcode
qca6564-le-1-0-3_qca_device repository, and creates a symbolic link to the
actual bdwlan30.bin board file used to certify Digi's module internal
antenna.

https://jira.digi.com/browse/DEL-3454

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 .../firmware-qualcomm/firmware-qualcomm.bb       |   2 --
 .../firmware-qualcomm/utfbd30.bin                | Bin 8124 -> 0 bytes
 .../kernel-module-qualcomm/qualcomm-pre-up       |   6 ++++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/utfbd30.bin

diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
index 8a4a37940..517869ccf 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -19,7 +19,6 @@ FW_QCA6564-WIFI = " \
     file://otp30.bin \
     file://qwlan30.bin \
     file://utf30.bin \
-    file://utfbd30.bin \
     file://wlan/cfg.dat \
     file://wlan/qcom_cfg.ini \
 "
@@ -50,7 +49,6 @@ do_install() {
 		otp30.bin \
 		qwlan30.bin \
 		utf30.bin \
-		utfbd30.bin \
 		${D}${base_libdir}/firmware
 	install -m 0644 \
 		wlan/cfg.dat \
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/utfbd30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/utfbd30.bin
deleted file mode 100644
index dfd6a46343a97329173ab2ffc1f204268a9e938a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8124
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

diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up
index 60364501f..53d0e18b0 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up
@@ -68,7 +68,8 @@ case "${DTB_REGION_CODE}" in
 esac
 
 BDATA_LINK="${FIRMWARE_DIR}/bdwlan30.bin"
-# Create a symbolic link to the FW file for the specific country region.
+UTFBDATA_LINK="${FIRMWARE_DIR}/utfbd30.bin"
+# Create a symbolic links to the FW files for the specific country region.
 BDATA_SOURCE="${FIRMWARE_DIR}/bdwlan30_US.bin"
 case "${REGULATORY_DOMAIN}" in
 	${US_CODE})
@@ -83,9 +84,10 @@ case "${REGULATORY_DOMAIN}" in
 esac
 
 # We don't want to rewrite NAND every time we boot so only
-# change the link if it is wrong.
+# change the links if they are wrong.
 if [ ! -e "${BDATA_LINK}" ] || ! cmp -s "${BDATA_LINK}" "${BDATA_SOURCE}"; then
 	ln -sf "${BDATA_SOURCE}" "${BDATA_LINK}"
+	ln -sf "${BDATA_SOURCE}" "${UTFBDATA_LINK}"
 fi
 
 # Check the version of modprobe installed to compound the arguments.