From 7ea3bc93bf3584181cb95fb802d0699e61ef1b70 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sat, 3 Mar 2018 20:48:31 +0000
Subject: [PATCH] kernel-firmware: use project/device firmware if configured,
 otherwise use common default

---
 .../kernel-firmware/firmwares/any.dat          |  0
 .../kernel-firmware/firmwares/x86_64.dat       | 18 ------------------
 .../linux-firmware/kernel-firmware/package.mk  | 15 +++++----------
 .../firmwares/kernel-firmware.dat              |  0
 .../firmwares/kernel-firmware.dat              |  0
 .../firmwares/kernel-firmware.dat              |  0
 6 files changed, 5 insertions(+), 28 deletions(-)
 rename {projects/RPi/packages => packages/linux-firmware}/kernel-firmware/firmwares/any.dat (100%)
 rename projects/Generic/packages/kernel-firmware/firmwares/any.dat => packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat (51%)
 create mode 100644 projects/Amlogic/packages/kernel-firmware/firmwares/kernel-firmware.dat
 create mode 100644 projects/WeTek_Core/packages/kernel-firmware/firmwares/kernel-firmware.dat
 create mode 100644 projects/WeTek_Play/packages/kernel-firmware/firmwares/kernel-firmware.dat

diff --git a/projects/RPi/packages/kernel-firmware/firmwares/any.dat b/packages/linux-firmware/kernel-firmware/firmwares/any.dat
similarity index 100%
rename from projects/RPi/packages/kernel-firmware/firmwares/any.dat
rename to packages/linux-firmware/kernel-firmware/firmwares/any.dat
diff --git a/projects/Generic/packages/kernel-firmware/firmwares/any.dat b/packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat
similarity index 51%
rename from projects/Generic/packages/kernel-firmware/firmwares/any.dat
rename to packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat
index b78dee76b5..26c30ab11b 100644
--- a/projects/Generic/packages/kernel-firmware/firmwares/any.dat
+++ b/packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat
@@ -1,21 +1,3 @@
-#aarch64
-htc_7010.fw
-htc_9271.fw
-
-ath3k-1.fw
-ar5523.bin
-carl9170-1.fw
-mt7601u.bin
-rt2870.bin
-rt73.bin
-vntwusb.fw
-
-ath6k/AR6004/hw1.?/bdata.bin
-ath9k_htc/*
-brcm/*
-rtl_bt/*_fw.bin
-rtlwifi/*
-
 ath10k/*
 ctefx.bin
 lbtf_usb.bin
diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk
index 05964c7234..22776849ef 100644
--- a/packages/linux-firmware/kernel-firmware/package.mk
+++ b/packages/linux-firmware/kernel-firmware/package.mk
@@ -35,16 +35,11 @@ PKG_TOOLCHAIN="manual"
 makeinstall_target() {
   FW_TARGET_DIR=$INSTALL/$(get_full_firmware_dir)
 
-  # Install all firmwares found in hierarchy
-  FW_LISTS=
-  for dir in ${PKG_DIR} \
-             ${PROJECT_DIR}/${PROJECT}/packages/${PKG_NAME} \
-             ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME} \
-             ; do
-    for fmware in any.dat ${TARGET_ARCH}.dat; do
-      [ -f "${dir}/firmwares/${fmware}" ] && FW_LISTS+=" ${dir}/firmwares/${fmware}"
-    done
-  done
+  if find_file_path firmwares/kernel-firmware.dat; then
+    FW_LISTS="${FOUND_FILE}"
+  else
+    FW_LISTS="${PKG_DIR}/firmwares/any.dat ${PKG_DIR}/firmwares/${TARGET_ARCH}.dat"
+  fi
 
   for fwlist in ${FW_LISTS}; do
     [ -f ${fwlist} ] || continue
diff --git a/projects/Amlogic/packages/kernel-firmware/firmwares/kernel-firmware.dat b/projects/Amlogic/packages/kernel-firmware/firmwares/kernel-firmware.dat
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/projects/WeTek_Core/packages/kernel-firmware/firmwares/kernel-firmware.dat b/projects/WeTek_Core/packages/kernel-firmware/firmwares/kernel-firmware.dat
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/projects/WeTek_Play/packages/kernel-firmware/firmwares/kernel-firmware.dat b/projects/WeTek_Play/packages/kernel-firmware/firmwares/kernel-firmware.dat
new file mode 100644
index 0000000000..e69de29bb2