diff --git a/.gitignore b/.gitignore
index 4fc617f..ff35f78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-SOURCES/cxgb4-old-fw.tar.bz2
-SOURCES/linux-firmware-20150904.tar.gz
+SOURCES/linux-firmware-20160830.tar.gz
diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata
index 25ced65..91afb0c 100644
--- a/.linux-firmware.metadata
+++ b/.linux-firmware.metadata
@@ -1,2 +1 @@
-951c12002e3a566ed13435766bb019ed280071ac SOURCES/cxgb4-old-fw.tar.bz2
-9b0ff7e220151edf12081895a6f49a626fbf9a42 SOURCES/linux-firmware-20150904.tar.gz
+082c37c67ab7246443434e60cb359950e6be9fe2 SOURCES/linux-firmware-20160830.tar.gz
diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec
index 530a903..2325dd1 100644
--- a/SPECS/linux-firmware.spec
+++ b/SPECS/linux-firmware.spec
@@ -1,8 +1,8 @@
-%global checkout 6ebf5d5
-%global firmware_release 43
+%global checkout 7534e19
+%global firmware_release 49
Name: linux-firmware
-Version: 20150904
+Version: 20160830
Release: %{firmware_release}.git%{checkout}%{?dist}
Summary: Firmware files used by the Linux kernel
@@ -31,13 +31,6 @@ Obsoletes: libertas-sd8686-firmware
Obsoletes: libertas-sd8787-firmware
Obsoletes: libertas-usb8388-olpc-firmware
-# We need to keep old fw blobs for backwards compat in RHEL.
-# RPMDiff tool complained about old firmware going away as well,
-# so here's where we're keeping them for now. Chelsio needs to
-# remedy the situation with their upstream firmware tree updates
-# removing old firmwares.
-Source1: cxgb4-old-fw.tar.bz2
-
%define fwdir /usr/lib/firmware
%description
@@ -233,8 +226,8 @@ for Linux. Usage of the firmware is subject to the terms and conditions
contained inside the provided LICENSE file. Please read it carefully.
%prep
-# Setup Source0 and additional Source1
-%setup -q -a 1 -c -n linux-firmware-%{checkout}
+# Setup Source0
+%setup -q -c -n linux-firmware-%{checkout}
%build
# Remove firmware shipped in separate packages already
@@ -247,10 +240,6 @@ rm v4l-cx23418-apu.fw v4l-cx23418-cpu.fw v4l-cx23418-dig.fw v4l-cx25840.fw
rm -f usbdux/*dux */*.asm
rm -rf carl9170fw
-# AMD ucode still breaks overflow signal handler and sampling on at least
-# some AMD systems, so remove it *again*.
-rm -rf LICENSE.amd-ucode amd-ucode
-
# Remove firmware images for WiFi & WiMax drivers not compiled in RHEL7 kernel
rm -rf ath6k
rm -rf ti-connectivity
@@ -265,13 +254,6 @@ rm -f i6050-fw-usb-1.5.sbcf
# Remove images for vxge, we do not provide that driver in RHEL7 kernel
rm -rf vxge
-# Fix up cxgb4 symlinks per bug 1262128
-pushd cxgb4
-rm -f t4fw.bin t5fw.bin
-ln -s t4fw-1.13.32.0.bin t4fw.bin
-ln -s t5fw-1.13.32.0.bin t5fw.bin
-popd
-
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{fwdir}
@@ -328,6 +310,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc WHENCE LICENCE.iwlwifi_firmware
%{fwdir}/iwlwifi-3160-*.ucode
+%{fwdir}/iwlwifi-3168-*.ucode
%files -n iwl3945-firmware
%defattr(-,root,root,-)
@@ -379,8 +362,9 @@ rm -rf $RPM_BUILD_ROOT
%doc WHENCE LICENCE.iwlwifi_firmware
%{fwdir}/iwlwifi-7265-*.ucode
%{fwdir}/iwlwifi-7265D-*.ucode
-# Followin up Fedora where they have included iwlwifi-8000C blob
+# Following up Fedora on where they have included iwlwifi-8000C & iwlwifi-8265 blobs
%{fwdir}/iwlwifi-8000C-*.ucode
+%{fwdir}/iwlwifi-8265-*.ucode
%files -f linux-firmware.files
%defattr(-,root,root,-)
@@ -389,6 +373,34 @@ rm -rf $RPM_BUILD_ROOT
%doc WHENCE LICENCE.* LICENSE.*
%changelog
+* Tue Aug 30 2016 Rafael Aquini <aquini@redhat.com> - 20160830-49.git7534e19
+- Update to latest upstream linux-firmware image for assorted updates
+- Update QCA6174/hw3.0/board-2.bin file to support ath10k devices (rhbz 1368159)
+
+* Tue Aug 23 2016 Rafael Aquini <aquini@redhat.com> - 20160728-48.git0daeaf3
+- Clean up t{4,5}fw.bin symlink leftovers from bug 1262128 (rhbz 1365763)
+
+* Thu Jul 28 2016 Rafael Aquini <aquini@redhat.com> - 20160728-47.git0daeaf3
+- Update to latest upstream linux-firmware image for assorted updates
+- Core14 firmware release for 7265, 7260, 3160 wireless devices (rhbz 1358566)
+- Core19 firmware release for 7265D, 8260, 8265, 3168 wireless devices (rhbz 1358568)
+
+* Wed Jun 15 2016 Rafael Aquini <aquini@redhat.com> - 20160615-46.gita4bbc81
+- Update to latest upstream linux-firmware image for assorted updates
+- Nuke old cxgb4 firmware blobs tarball (rhbz 1336906)
+- Update to latest Chelsio firmware release version (rhbz 1336906)
+
+* Tue Apr 26 2016 Rafael Aquini <aquini@redhat.com> - 20160426-45.git986a5a8
+- Update to latest upstream linux-firmware image for assorted updates
+- Restore AMD-ucode firmware blob again (rhbz 866700)
+- qat: Update to the latest upstream firmware (rhbz 1173792)
+- WiFi on Windstorm Peak Wireless Adapter 8265 - firmware support (rhbz 1315534)
+- WiFi on Sandy Peak Wireless Adapter 3168 - firmware support (rhbz 1315536)
+
+* Thu Mar 10 2016 Rafael Aquini <aquini@redhat.com> - 20160223-44.git8d1fd61
+- Update to latest upstream linux-firmware image for assorted updates
+- Update Intel Omni-Path Architecture hfi1 Firmware (rhbz 1267015)
+
* Mon Sep 14 2015 Jarod Wilson <jarod@redhat.com> - 20150904-43.git6ebf5d5
- Add more old chelsio firmwares, they nuked the one the driver in
RHEL7.2 is expecting from upstream (rhbz 1262128)