From f8aae3e25965df2b7ac7afa8bfa455e62e653270 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 1 Aug 2017 00:06:29 +0100
Subject: [PATCH 1/2] kernel-firmware: cleanup

---
 .../kernel-firmware/firmwares/any.dat         | 23 +++++++++++--------
 .../kernel-firmware/firmwares/x86_64.dat      |  8 +++++--
 .../imx6/kernel-firmware/firmwares/any.dat    | 15 ++++++++++++
 3 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 projects/imx6/kernel-firmware/firmwares/any.dat

diff --git a/packages/linux-firmware/kernel-firmware/firmwares/any.dat b/packages/linux-firmware/kernel-firmware/firmwares/any.dat
index a64078b9e9..1d9d08cdf0 100644
--- a/packages/linux-firmware/kernel-firmware/firmwares/any.dat
+++ b/packages/linux-firmware/kernel-firmware/firmwares/any.dat
@@ -1,14 +1,17 @@
-ar3k/*
-ath3k-1.fw
-rtl_bt/*_fw.bin
+#aarch64
+htc_7010.fw
+htc_9271.fw
 
-# WLAN firmwares
-ath6k/*
+ath3k-1.fw
+ar5523.bin
+carl9170-1.fw
+mt7601u.bin
+rt2870.bin
+rt73.bin
+vntwusb.fw
+
+ath6k/AR6004/hw1.?/bdata.bin
 ath9k_htc/*
-ath10k/*
 brcm/*
-libertas/*
-mrvl/*
-mwl8k/*
-mwlwifi/*
+rtl_bt/*_fw.bin
 rtlwifi/*
diff --git a/packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat b/packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat
index 0ddb835b28..bf602055a8 100644
--- a/packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat
+++ b/packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat
@@ -1,6 +1,10 @@
-e100/*_ucode.bin
+ctefx.bin
+lbtf_usb.bin
+rt2561.bin
+rt2561s.bin
+rt2661.bin
+rt2860.bin
 intel/dsp_fw_{bxtn,glk,kbl,release}.bin
 intel/fw_sst_*.bin*
 intel/ibt-*.{ddc,sfi,bseq}
 intel/IntcSST2.bin
-rtl_nic/*.fw
diff --git a/projects/imx6/kernel-firmware/firmwares/any.dat b/projects/imx6/kernel-firmware/firmwares/any.dat
new file mode 100644
index 0000000000..b5111dec47
--- /dev/null
+++ b/projects/imx6/kernel-firmware/firmwares/any.dat
@@ -0,0 +1,15 @@
+rsi_91x.fw
+f2255usb.bin
+
+mts_mt9234mu.fw
+mts_mt9234zba.fw
+
+wil6210.brd
+wil6210.fw
+
+ti-connectivity/wl1251-fw.bin
+ti-connectivity/wl1251-nvs.bin
+ti-connectivity/wl12{7,8}x-fw-{4,5}{,-mr,-plt,-sr}.bin
+ti-connectivity/wl1271-nvs.bin
+
+mrvl/{sd,usb}*.bin

From e5dd23bc936d50a8fb681bc6f3bda29cf8129a58 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 1 Aug 2017 00:06:29 +0100
Subject: [PATCH 2/2] linux: add e100 firmware to initrd

---
 packages/linux/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 7c3c8c2a02..589f6999a4 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -157,7 +157,7 @@ pre_make_target() {
   if [ "$TARGET_ARCH" = "x86_64" ]; then
     # copy some extra firmware to linux tree
     mkdir -p $PKG_BUILD/external-firmware
-      cp -a $(get_build_dir kernel-firmware)/{amdgpu,amd-ucode,i915,radeon,rtl_nic} $PKG_BUILD/external-firmware
+      cp -a $(get_build_dir kernel-firmware)/{amdgpu,amd-ucode,i915,radeon,e100,rtl_nic} $PKG_BUILD/external-firmware
 
     cp -a $(get_build_dir intel-ucode)/intel-ucode $PKG_BUILD/external-firmware