From 5d2d0011d0edb4a2a838ab0699651f3cea8ea438 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Thu, 30 Mar 2017 18:37:00 +0200
Subject: [PATCH] meta-digi-arm: qualcomm: Move cfg.dat and qcom_cfg.ini to
 module recipe

The firmware configuration and the driver configuration are part of the
driver repository. Stop duplicating the content in meta-digi so they
are updated with the driver itself.

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

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 .../recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb    | 8 +-------
 .../kernel-module-qualcomm/kernel-module-qualcomm.bb      | 5 +++++
 2 files changed, 6 insertions(+), 7 deletions(-)

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 517869ccf..6bf486f38 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -19,8 +19,6 @@ FW_QCA6564-WIFI = " \
     file://otp30.bin \
     file://qwlan30.bin \
     file://utf30.bin \
-    file://wlan/cfg.dat \
-    file://wlan/qcom_cfg.ini \
 "
 
 SRC_URI = " \
@@ -41,7 +39,7 @@ do_install() {
 		${D}${base_libdir}/firmware/qca
 
 	# Wifi firmware
-	install -d ${D}${base_libdir}/firmware/wlan
+	install -d ${D}${base_libdir}/firmware
 	install -m 0644 \
 		bdwlan30_US.bin \
 		bdwlan30_World.bin \
@@ -50,10 +48,6 @@ do_install() {
 		qwlan30.bin \
 		utf30.bin \
 		${D}${base_libdir}/firmware
-	install -m 0644 \
-		wlan/cfg.dat \
-		wlan/qcom_cfg.ini \
-		${D}${base_libdir}/firmware/wlan
 }
 
 # Do not create empty debug and development packages (PN-dbg PN-dev PN-staticdev)
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
index 0261f23a0..66894f694 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
@@ -42,11 +42,16 @@ do_install_append() {
 	install -m 0755 ${WORKDIR}/qualcomm-pre-up ${D}${sysconfdir}/network/if-pre-up.d/qualcomm
 	install -d ${D}${sysconfdir}/modprobe.d
 	install -m 0644 ${WORKDIR}/modprobe-qualcomm.conf ${D}${sysconfdir}/modprobe.d/qualcomm.conf
+	install -d ${D}${base_libdir}/firmware/wlan/
+	install -m 0644 ${WORKDIR}/git/firmware_bin/WCNSS_cfg.dat ${D}${base_libdir}/firmware/wlan/cfg.dat
+	install -m 0644 ${WORKDIR}/git/firmware_bin/WCNSS_qcom_cfg.ini ${D}${base_libdir}/firmware/wlan/qcom_cfg.ini
 }
 
 FILES_${PN} += " \
     ${sysconfdir}/network/if-pre-up.d/qualcomm \
     ${sysconfdir}/modprobe.d/qualcomm.conf \
+    ${base_libdir}/firmware/wlan/cfg.dat \
+    ${base_libdir}/firmware/wlan/qcom_cfg.ini \
 "
 
 COMPATIBLE_MACHINE = "(ccimx6ul)"