CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated make-linux-hwe for 4.10

Browse source
This commit is contained in:
Ruben Rodriguez 2017-08-30 11:46:56 -04:00
parent c27c057a1d
commit 0c8e3cfdca
9 changed files with 3141 additions and 1023 deletions
Download patch file Download diff file Expand all files Collapse all files

12
helpers/DATA/linux-hwe/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.8.0.patch → helpers/DATA/linux-hwe/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.10..patch
View file

@ -1,7 +1,7 @@
From f2ebe596e7d72e96e0fb2be87be90f0b96e6f1b3 Mon Sep 17 00:00:00 2001 From 8500f47272575b4616beb487c483019248d8c501 Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@unimore.it> From: Paolo Valente <paolo.valente@unimore.it>
Date: Tue, 7 Apr 2015 13:39:12 +0200 Date: Tue, 7 Apr 2015 13:39:12 +0200
Subject: [PATCH 1/4] block: cgroups, kconfig, build bits for BFQ-v7r11-4.8.0 Subject: [PATCH 1/4] block: cgroups, kconfig, build bits for BFQ-v7r11-4.10.0
Update Kconfig.iosched and do the related Makefile changes to include Update Kconfig.iosched and do the related Makefile changes to include
kernel configuration options for BFQ. Also increase the number of kernel configuration options for BFQ. Also increase the number of
@ -74,7 +74,7 @@ index 421bef9..0ee5f0f 100644
endmenu endmenu
diff --git a/block/Makefile b/block/Makefile diff --git a/block/Makefile b/block/Makefile
index 9eda232..4a36683 100644 index a827f98..3b14703 100644
--- a/block/Makefile --- a/block/Makefile
+++ b/block/Makefile +++ b/block/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o @@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
@ -86,10 +86,10 @@ index 9eda232..4a36683 100644
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e79055c..931ff1e 100644 index 1ca8e8f..8e2d6ed 100644
--- a/include/linux/blkdev.h --- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h +++ b/include/linux/blkdev.h
@@ -45,7 +45,7 @@ struct pr_ops; @@ -47,7 +47,7 @@ struct rq_wb;
* Maximum number of blkcg policies allowed to be registered concurrently. * Maximum number of blkcg policies allowed to be registered concurrently.
* Defined here to simplify include dependency. * Defined here to simplify include dependency.
*/ */
@ -99,5 +99,5 @@ index e79055c..931ff1e 100644
typedef void (rq_end_io_fn)(struct request *, int); typedef void (rq_end_io_fn)(struct request *, int);
-- --
2.7.4 (Apple Git-66) 2.10.0

7
helpers/DATA/linux-hwe/0002-block-introduce-the-BFQ-v7r11-I-O-sched-to-be-ported.patch → helpers/DATA/linux-hwe/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.10.0.patch
View file

@ -1,8 +1,7 @@
From d9af6fcc4167cbb8433b10bbf3663c8297487f52 Mon Sep 17 00:00:00 2001 From 2f56e91506b329ffc29d0f184924ad0123c9ba9e Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@unimore.it> From: Paolo Valente <paolo.valente@unimore.it>
Date: Thu, 9 May 2013 19:10:02 +0200 Date: Thu, 9 May 2013 19:10:02 +0200
Subject: [PATCH 2/4] block: introduce the BFQ-v7r11 I/O sched, to be ported to Subject: [PATCH 2/4] block: introduce the BFQ-v7r11 I/O sched for 4.10.0
4.8.0
The general structure is borrowed from CFQ, as much of the code for The general structure is borrowed from CFQ, as much of the code for
handling I/O contexts. Over time, several useful features have been handling I/O contexts. Over time, several useful features have been
@ -7106,5 +7105,5 @@ index 0000000..2bf54ae
+ +
+#endif /* _BFQ_H */ +#endif /* _BFQ_H */
-- --
2.7.4 (Apple Git-66) 2.10.0

8
helpers/DATA/linux-hwe/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-to-.patch → helpers/DATA/linux-hwe/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
View file

@ -1,8 +1,8 @@
From 409e62551360d2802992b0175062237352793a2a Mon Sep 17 00:00:00 2001 From e4d9bed2dfdec562b23491e44602c89c4a2a5ea4 Mon Sep 17 00:00:00 2001
From: Mauro Andreolini <mauro.andreolini@unimore.it> From: Mauro Andreolini <mauro.andreolini@unimore.it>
Date: Sun, 6 Sep 2015 16:09:05 +0200 Date: Sun, 6 Sep 2015 16:09:05 +0200
Subject: [PATCH 3/4] block, bfq: add Early Queue Merge (EQM) to BFQ-v7r11, to Subject: [PATCH 3/4] block, bfq: add Early Queue Merge (EQM) to BFQ-v7r11 for
port to 4.8.0 4.10.0
A set of processes may happen to perform interleaved reads, i.e.,requests A set of processes may happen to perform interleaved reads, i.e.,requests
whose union would give rise to a sequential read pattern. There are two whose union would give rise to a sequential read pattern. There are two
@ -1097,5 +1097,5 @@ index 2bf54ae..fcce855 100644
static void bfq_put_queue(struct bfq_queue *bfqq); static void bfq_put_queue(struct bfq_queue *bfqq);
static void bfq_dispatch_insert(struct request_queue *q, struct request *rq); static void bfq_dispatch_insert(struct request_queue *q, struct request *rq);
-- --
2.7.4 (Apple Git-66) 2.10.0

3316
helpers/DATA/linux-hwe/0004-Turn-BFQ-v7r11-into-BFQ-v8r4-for-4.8.0.patch → helpers/DATA/linux-hwe/0004-Turn-BFQ-v7r11-for-4.10.0-into-BFQ-v8r11-for-4.10.0.patch
View file

File diff suppressed because it is too large Load diff

163
helpers/DATA/linux-hwe/deblob-4.8 → helpers/DATA/linux-hwe/deblob-4.10
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Copyright (C) 2008-2016 Alexandre Oliva <lxoliva@fsfla.org> # Copyright (C) 2008-2017 Alexandre Oliva <lxoliva@fsfla.org>
# Copyright (C) 2008 Jeff Moe # Copyright (C) 2008 Jeff Moe
# Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org> # Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org>
# #
@ -48,7 +48,7 @@
# For each kver release, start extra with an empty string, then count # For each kver release, start extra with an empty string, then count
# from 1 if changes are needed that require rebuilding the tarball. # from 1 if changes are needed that require rebuilding the tarball.
kver=4.8 extra= kver=4.10 extra=
case $1 in case $1 in
--force) --force)
@ -339,11 +339,31 @@ clean_sed "/^EXTRAVERSION *=/ { s,=$,& ,; s,$,&-gnu$extra,; }
grep -q Linux-libre README || grep -q Linux-libre README ||
clean_sed ' clean_sed '
1 s,^Linux kernel$,GNU Linux-libre,
2 s,^============$,===============,
' README 'renamed to GNU Linux-libre'
grep -q Linux-libre Documentation/admin-guide/README.rst ||
clean_sed '
1,3 s,Linux kernel release.*kernel\.org.*,GNU Linux-libre <http://linux-libre.fsfla.org>, 1,3 s,Linux kernel release.*kernel\.org.*,GNU Linux-libre <http://linux-libre.fsfla.org>,
2 s,=$,&&,
' Documentation/admin-guide/README.rst 'renamed to GNU Linux-libre'
grep -q 'release notes for GNU Linux-libre' Documentation/admin-guide/README.rst ||
clean_sed '
2,5 s,Linux version [0-9.]*[0-9],GNU Linux-libre, 2,5 s,Linux version [0-9.]*[0-9],GNU Linux-libre,
' Documentation/admin-guide/README.rst 'dropped partial Linux version'
grep -q 'Unix kernel' Documentation/admin-guide/README.rst ||
clean_sed '
1,20 s,\(operating system \)\?Unix,Unix kernel, 1,20 s,\(operating system \)\?Unix,Unix kernel,
/WHAT IS LINUX/i\ ' Documentation/admin-guide/README.rst 'Linux is a kernel'
WHAT IS GNU Linux-libre?\
grep -q 'What is GNU Linux-libre' Documentation/admin-guide/README.rst ||
clean_sed '
/What is Linux/i\
What is GNU Linux-libre?\
------------------------\
\ \
GNU Linux-libre is a Free version of the kernel Linux (see below),\ GNU Linux-libre is a Free version of the kernel Linux (see below),\
suitable for use with the GNU Operating System in 100% Free\ suitable for use with the GNU Operating System in 100% Free\
@ -374,7 +394,7 @@ WHAT IS GNU Linux-libre?\
promotion. See our web page for their images.\ promotion. See our web page for their images.\
http://linux-libre.fsfla.org/\ http://linux-libre.fsfla.org/\
' README 'added blurb about GNU Linux-libre' ' Documentation/admin-guide/README.rst 'added blurb about GNU Linux-libre'
# Add reject_firmware and maybe_reject_firmware # Add reject_firmware and maybe_reject_firmware
grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h ||
@ -471,7 +491,7 @@ maybe_reject_firmware_nowait(struct module *module, int uevent,\
#endif /* _LINUX_LIBRE_FIRMWARE_H */\ #endif /* _LINUX_LIBRE_FIRMWARE_H */\
' include/linux/firmware.h 'added non-Free firmware notification support' ' include/linux/firmware.h 'added non-Free firmware notification support'
grep -q _LINUX_LIBRE_IHEX_FIRMWARE_H include/linux/ihex.h || grep -q _LINUX_LIBRE_IHEX_H include/linux/ihex.h ||
clean_sed '$i\ clean_sed '$i\
#ifndef _LINUX_LIBRE_IHEX_H\ #ifndef _LINUX_LIBRE_IHEX_H\
#define _LINUX_LIBRE_IHEX_H\ #define _LINUX_LIBRE_IHEX_H\
@ -533,6 +553,15 @@ clean_blob drivers/net/ethernet/netx-eth.c
clean_kconfig arch/arm/Kconfig ARCH_NETX clean_kconfig arch/arm/Kconfig ARCH_NETX
clean_mk CONFIG_ARCH_NETX arch/arm/Makefile clean_mk CONFIG_ARCH_NETX arch/arm/Makefile
announce MACH_SUN8I - "Allwinner sun8i Family SoCs support"
clean_blob arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
clean_blob arch/arm/boot/dts/sun8i-a23-inet86dz.dts
clean_blob arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
clean_blob arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
clean_blob arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
clean_kconfig arch/arm/mach-sunxi/Kconfig MACH_SUN8I
clean_mk CONFIG_MACH_SUN8I arch/arm/boot/dts/Makefile
# mips # mips
# I couldn't figure out where the firmware name actually comes from. # I couldn't figure out where the firmware name actually comes from.
@ -626,18 +655,14 @@ reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
reject_firmware drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c reject_firmware drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
clean_blob drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c clean_blob drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
reject_firmware drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
clean_blob drivers/gpu/drm/amd/amdgpu/iceland_dpm.c
reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
reject_firmware drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
clean_blob drivers/gpu/drm/amd/amdgpu/fiji_dpm.c
reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
reject_firmware drivers/gpu/drm/amd/amdgpu/tonga_dpm.c reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
clean_blob drivers/gpu/drm/amd/amdgpu/tonga_dpm.c clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
clean_blob drivers/gpu/drm/amd/amdgpu/vi.c clean_blob drivers/gpu/drm/amd/amdgpu/vi.c
clean_kconfig drivers/gpu/drm/Kconfig DRM_AMDGPU clean_kconfig drivers/gpu/drm/Kconfig DRM_AMDGPU
clean_mk CONFIG_DRM_AMDGPU drivers/gpu/drm/amd/amdgpu/Makefile clean_mk CONFIG_DRM_AMDGPU drivers/gpu/drm/amd/amdgpu/Makefile
@ -654,6 +679,16 @@ clean_blob drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
clean_kconfig drivers/gpu/drm/amd/amdgpu/Kconfig DRM_AMDGPU_CIK clean_kconfig drivers/gpu/drm/amd/amdgpu/Kconfig DRM_AMDGPU_CIK
clean_mk CONFIG_DRM_AMDGPU_CIK drivers/gpu/drm/amd/amdgpu/Makefile clean_mk CONFIG_DRM_AMDGPU_CIK drivers/gpu/drm/amd/amdgpu/Makefile
announce DRM_AMDGPU_SI - "Enable amdgpu support for CIK parts"
reject_firmware drivers/gpu/drm/amd/amdgpu/si_dpm.c
clean_blob drivers/gpu/drm/amd/amdgpu/si_dpm.c
reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
reject_firmware drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
clean_blob drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
clean_kconfig drivers/gpu/drm/amd/amdgpu/Kconfig DRM_AMDGPU_SI
clean_mk CONFIG_DRM_AMDGPU_SI drivers/gpu/drm/amd/amdgpu/Makefile
announce DRM_AST - "AST server chips" announce DRM_AST - "AST server chips"
reject_firmware drivers/gpu/drm/ast/ast_dp501.c reject_firmware drivers/gpu/drm/ast/ast_dp501.c
clean_blob drivers/gpu/drm/ast/ast_dp501.c clean_blob drivers/gpu/drm/ast/ast_dp501.c
@ -668,6 +703,11 @@ clean_blob drivers/gpu/drm/i915/intel_guc_loader.c
clean_kconfig drivers/gpu/drm/i915/Kconfig DRM_I915 clean_kconfig drivers/gpu/drm/i915/Kconfig DRM_I915
clean_mk CONFIG_DRM_I915 drivers/gpu/drm/i915/Makefile clean_mk CONFIG_DRM_I915 drivers/gpu/drm/i915/Makefile
announce DRM_I915_GVT - "Enable Intel GVT-g graphics virtualization host support"
reject_firmware drivers/gpu/drm/i915/gvt/firmware.c
clean_kconfig drivers/gpu/drm/i915/Kconfig DRM_I915_GVT
clean_mk CONFIG_DRM_I915_GVT drivers/gpu/drm/i915/Makefile
announce DRM_NOUVEAU - "Nouveau (nVidia) cards" announce DRM_NOUVEAU - "Nouveau (nVidia) cards"
reject_firmware drivers/gpu/drm/nouveau/nvkm/core/firmware.c reject_firmware drivers/gpu/drm/nouveau/nvkm/core/firmware.c
clean_blob drivers/gpu/drm/nouveau/nvkm/core/firmware.c clean_blob drivers/gpu/drm/nouveau/nvkm/core/firmware.c
@ -691,6 +731,7 @@ clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile
announce DRM_MSM - "MSM DRM" announce DRM_MSM - "MSM DRM"
reject_firmware drivers/gpu/drm/msm/adreno/adreno_gpu.c reject_firmware drivers/gpu/drm/msm/adreno/adreno_gpu.c
reject_firmware drivers/gpu/drm/msm/adreno/a5xx_power.c
clean_blob drivers/gpu/drm/msm/adreno/adreno_device.c clean_blob drivers/gpu/drm/msm/adreno/adreno_device.c
clean_kconfig drivers/gpu/drm/msm/Kconfig DRM_MSM clean_kconfig drivers/gpu/drm/msm/Kconfig DRM_MSM
clean_mk CONFIG_DRM_MSM drivers/gpu/drm/msm/Makefile clean_mk CONFIG_DRM_MSM drivers/gpu/drm/msm/Makefile
@ -744,6 +785,9 @@ clean_sed '
clean_sed ' clean_sed '
/r = r600_init_microcode(rdev);/,/}/ s,return r;,/*(DEBLOBBED)*/, /r = r600_init_microcode(rdev);/,/}/ s,return r;,/*(DEBLOBBED)*/,
' drivers/gpu/drm/radeon/evergreen.c 'enable blobless activation' ' drivers/gpu/drm/radeon/evergreen.c 'enable blobless activation'
clean_sed '
/r = r600_init_microcode(rdev);/,/}/ s,return r;,/*(DEBLOBBED)*/,
' drivers/gpu/drm/radeon/rv770.c 'enable blobless activation'
reject_firmware drivers/gpu/drm/radeon/ni.c reject_firmware drivers/gpu/drm/radeon/ni.c
clean_blob drivers/gpu/drm/radeon/ni.c clean_blob drivers/gpu/drm/radeon/ni.c
reject_firmware drivers/gpu/drm/radeon/si.c reject_firmware drivers/gpu/drm/radeon/si.c
@ -780,10 +824,16 @@ clean_blob arch/arm/boot/dts/imx6qdl.dtsi
clean_blob arch/arm/boot/dts/imx6sl.dtsi clean_blob arch/arm/boot/dts/imx6sl.dtsi
clean_blob arch/arm/boot/dts/imx6sx.dtsi clean_blob arch/arm/boot/dts/imx6sx.dtsi
clean_blob arch/arm/boot/dts/imx6ul.dtsi clean_blob arch/arm/boot/dts/imx6ul.dtsi
clean_blob arch/arm/boot/dts/imx7s.dtsi
clean_blob Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt clean_blob Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
clean_kconfig drivers/dma/Kconfig IMX_SDMA clean_kconfig drivers/dma/Kconfig IMX_SDMA
clean_mk CONFIG_IMX_SDMA drivers/dma/Makefile clean_mk CONFIG_IMX_SDMA drivers/dma/Makefile
announce ST_FDMA - "ST FDMA dmaengine support"
clean_blob drivers/dma/st_fdma.c
clean_kconfig drivers/dma/Kconfig ST_FDMA
clean_mk CONFIG_ST_FDMA drivers/dma/Makefile
######### #########
# Media # # Media #
######### #########
@ -1541,10 +1591,11 @@ clean_kconfig drivers/net/ethernet/realtek/Kconfig R8169
clean_mk CONFIG_R8169 drivers/net/ethernet/realtek/Makefile clean_mk CONFIG_R8169 drivers/net/ethernet/realtek/Makefile
announce SLICOSS - "Alacritech Gigabit IS-NIC cards" announce SLICOSS - "Alacritech Gigabit IS-NIC cards"
reject_firmware drivers/staging/slicoss/slicoss.c reject_firmware drivers/net/ethernet/alacritech/slicoss.c
clean_blob drivers/staging/slicoss/slicoss.c clean_blob drivers/net/ethernet/alacritech/slic.h
clean_kconfig drivers/staging/slicoss/Kconfig SLICOSS clean_blob drivers/net/ethernet/alacritech/slicoss.c
clean_mk CONFIG_SLICOSS drivers/staging/slicoss/Makefile clean_kconfig drivers/net/ethernet/alacritech/Kconfig SLICOSS
clean_mk CONFIG_SLICOSS drivers/net/ethernet/alacritech/Makefile
announce SPIDER_NET - "Spider Gigabit Ethernet driver" announce SPIDER_NET - "Spider Gigabit Ethernet driver"
reject_firmware drivers/net/ethernet/toshiba/spider_net.c reject_firmware drivers/net/ethernet/toshiba/spider_net.c
@ -1739,14 +1790,20 @@ clean_sed '
goto error;\ goto error;\
} }
}' drivers/net/wireless/broadcom/b43/main.c 'double-check and reject non-Free firmware' }' drivers/net/wireless/broadcom/b43/main.c 'double-check and reject non-Free firmware'
# Major portions of firmware filenames not deblobbed. clean_sed '
/^[\t]*filename = "\(ucode\|b0g0\(bs\)\?initvals\)5";$/! {
s,^\([\t]*filename = "\)\(ucode\|pcm\|[^ "]*initvals\)[0-9][^ ."]*";,\1/*(DEBLOBBED)*/";,g
}' drivers/net/wireless/broadcom/b43/main.c 'cleaned up blob basenames'
clean_blob drivers/net/wireless/broadcom/b43/main.c clean_blob drivers/net/wireless/broadcom/b43/main.c
clean_kconfig drivers/net/wireless/broadcom/b43/Kconfig B43 clean_kconfig drivers/net/wireless/broadcom/b43/Kconfig B43
clean_mk CONFIG_B43 drivers/net/wireless/broadcom/b43/Makefile clean_mk CONFIG_B43 drivers/net/wireless/broadcom/b43/Makefile
announce B43LEGACY - "Broadcom 43xx-legacy wireless support (mac80211 stack)" announce B43LEGACY - "Broadcom 43xx-legacy wireless support (mac80211 stack)"
reject_firmware drivers/net/wireless/broadcom/b43legacy/main.c reject_firmware drivers/net/wireless/broadcom/b43legacy/main.c
# Major portions of firwmare filenames not deblobbed. clean_sed '
{
s,^\([\t]*filename = "\)\(ucode\|pcm\|[^ "]*initvals\)[0-9][^ ."]*";,\1/*(DEBLOBBED)*/";,g
}' drivers/net/wireless/broadcom/b43legacy/main.c 'cleaned up blob basenames'
clean_blob drivers/net/wireless/broadcom/b43legacy/main.c clean_blob drivers/net/wireless/broadcom/b43legacy/main.c
clean_kconfig drivers/net/wireless/broadcom/b43legacy/Kconfig B43LEGACY clean_kconfig drivers/net/wireless/broadcom/b43legacy/Kconfig B43LEGACY
clean_mk CONFIG_B43LEGACY drivers/net/wireless/broadcom/b43legacy/Makefile clean_mk CONFIG_B43LEGACY drivers/net/wireless/broadcom/b43legacy/Makefile
@ -1888,6 +1945,7 @@ clean_mk CONFIG_MT7601U drivers/net/wireless/mediatek/mt7601u/Makefile
announce MWIFIEX - "Marvell WiFi-Ex Driver" announce MWIFIEX - "Marvell WiFi-Ex Driver"
clean_blob drivers/net/wireless/marvell/mwifiex/README clean_blob drivers/net/wireless/marvell/mwifiex/README
reject_firmware drivers/net/wireless/marvell/mwifiex/main.c reject_firmware drivers/net/wireless/marvell/mwifiex/main.c
clean_blob drivers/net/wireless/marvell/mwifiex/main.c
clean_kconfig drivers/net/wireless/marvell/mwifiex/Kconfig MWIFIEX clean_kconfig drivers/net/wireless/marvell/mwifiex/Kconfig MWIFIEX
clean_mk CONFIG_MWIFIEX drivers/net/wireless/marvell/mwifiex/Makefile clean_mk CONFIG_MWIFIEX drivers/net/wireless/marvell/mwifiex/Makefile
@ -2144,13 +2202,6 @@ clean_blob drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
clean_kconfig drivers/net/wireless/realtek/rtlwifi/Kconfig RTL8723AE clean_kconfig drivers/net/wireless/realtek/rtlwifi/Kconfig RTL8723AE
clean_mk CONFIG_RTL8723AE drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile clean_mk CONFIG_RTL8723AE drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile
announce R8723AU - "RealTek RTL8723AU Wireless LAN NIC driver"
reject_firmware drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
clean_blob drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
clean_blob drivers/staging/rtl8723au/os_dep/os_intfs.c
clean_kconfig drivers/staging/rtl8723au/Kconfig R8723AU
clean_mk CONFIG_R8723AU drivers/staging/rtl8723au/Makefile
announce RTL8723BE - "Realtek RTL8723BE PCIe Wireless Network Adapter" announce RTL8723BE - "Realtek RTL8723BE PCIe Wireless Network Adapter"
reject_firmware drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c reject_firmware drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
clean_blob drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c clean_blob drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
@ -2189,11 +2240,19 @@ clean_mk CONFIG_WL18XX drivers/net/wireless/ti/wl18xx/Makefile
announce WLCORE - "TI wlcore support" announce WLCORE - "TI wlcore support"
reject_firmware drivers/net/wireless/ti/wlcore/main.c reject_firmware drivers/net/wireless/ti/wlcore/main.c
clean_blob drivers/net/wireless/ti/wlcore/main.c
clean_blob drivers/net/wireless/ti/wlcore/wlcore_i.h
clean_kconfig drivers/net/wireless/ti/wlcore/Kconfig WLCORE clean_kconfig drivers/net/wireless/ti/wlcore/Kconfig WLCORE
clean_mk CONFIG_WLCORE drivers/net/wireless/ti/wlcore/Makefile clean_mk CONFIG_WLCORE drivers/net/wireless/ti/wlcore/Makefile
announce WLCORE_SDIO - "TI wlcore SDIO support"
clean_blob drivers/net/wireless/ti/wlcore/sdio.c
clean_kconfig drivers/net/wireless/ti/wlcore/Kconfig WLCORE_SDIO
clean_mk CONFIG_WLCORE_SDIO drivers/net/wireless/ti/wlcore/Makefile
announce WLCORE_SPI - "TI wlcore SPI support"
clean_blob drivers/net/wireless/ti/wlcore/spi.c
clean_kconfig drivers/net/wireless/ti/wlcore/Kconfig WLCORE_SPI
clean_mk CONFIG_WLCORE_SPI drivers/net/wireless/ti/wlcore/Makefile
announce USB_ZD1201 - "USB ZD1201 based Wireless device support" announce USB_ZD1201 - "USB ZD1201 based Wireless device support"
reject_firmware drivers/net/wireless/zydas/zd1201.c reject_firmware drivers/net/wireless/zydas/zd1201.c
clean_blob drivers/net/wireless/zydas/zd1201.c clean_blob drivers/net/wireless/zydas/zd1201.c
@ -2260,6 +2319,12 @@ reject_firmware drivers/bluetooth/hci_bcm.c
clean_kconfig drivers/bluetooth/Kconfig BT_HCIUART_BCM clean_kconfig drivers/bluetooth/Kconfig BT_HCIUART_BCM
clean_mk CONFIG_BT_HCIUART_BCM drivers/bluetooth/Makefile clean_mk CONFIG_BT_HCIUART_BCM drivers/bluetooth/Makefile
announce BT_HCIUART_MRVL - "Marvell protocol support"
reject_firmware drivers/bluetooth/hci_mrvl.c
clean_blob drivers/bluetooth/hci_mrvl.c
clean_kconfig drivers/bluetooth/Kconfig BT_HCIUART_MRVL
clean_mk CONFIG_BT_HCIUART_MRVL drivers/bluetooth/Makefile
announce BT_HCIBFUSB - "HCI BlueFRITZ! USB driver" announce BT_HCIBFUSB - "HCI BlueFRITZ! USB driver"
reject_firmware drivers/bluetooth/bfusb.c reject_firmware drivers/bluetooth/bfusb.c
clean_blob drivers/bluetooth/bfusb.c clean_blob drivers/bluetooth/bfusb.c
@ -2836,15 +2901,17 @@ clean_blob drivers/misc/lattice-ecp3-config.c
clean_kconfig drivers/misc/Kconfig LATTICE_ECP3_CONFIG clean_kconfig drivers/misc/Kconfig LATTICE_ECP3_CONFIG
clean_mk CONFIG_LATTICE_ECP3_CONFIG drivers/misc/Makefile clean_mk CONFIG_LATTICE_ECP3_CONFIG drivers/misc/Makefile
announce STE_MODEM_RPROC - "STE-Modem remoteproc support" announce REMOTEPROC - "Support for Remote Processor subsystem"
maybe_reject_firmware drivers/remoteproc/remoteproc_core.c maybe_reject_firmware drivers/remoteproc/remoteproc_core.c
undefine_macro SPROC_MODEM_FIRMWARE "\"/*(DEBLOBBED)*/\"" \ clean_kconfig drivers/remoteproc/Kconfig REMOTEPROC
"disabled non-Free firmware" drivers/remoteproc/ste_modem_rproc.c clean_mk CONFIG_REMOTEPROC drivers/remoteproc/Makefile
announce WKUP_M3_RPROC - "AMx3xx Wakeup M3 remoteproc support"
clean_blob Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt clean_blob Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt
clean_blob arch/arm/boot/dts/am33xx.dtsi clean_blob arch/arm/boot/dts/am33xx.dtsi
clean_blob arch/arm/boot/dts/am4372.dtsi clean_blob arch/arm/boot/dts/am4372.dtsi
clean_kconfig drivers/remoteproc/Kconfig STE_MODEM_RPROC clean_kconfig drivers/remoteproc/Kconfig WKUP_M3_RPROC
clean_mk CONFIG_STE_MODEM_RPROC drivers/remoteproc/Makefile clean_mk CONFIG_WKUP_M3_RPROC drivers/remoteproc/Makefile
announce QCOM_Q6V5_PIL - "Qualcomm Hexagon V5 Peripherial Image Loader" announce QCOM_Q6V5_PIL - "Qualcomm Hexagon V5 Peripherial Image Loader"
reject_firmware drivers/remoteproc/qcom_q6v5_pil.c reject_firmware drivers/remoteproc/qcom_q6v5_pil.c
@ -3234,6 +3301,35 @@ clean_blob sound/usb/6fire/firmware.c
clean_kconfig sound/usb/Kconfig SND_USB_6FIRE clean_kconfig sound/usb/Kconfig SND_USB_6FIRE
clean_mk CONFIG_SND_USB_6FIRE sound/usb/6fire/Makefile clean_mk CONFIG_SND_USB_6FIRE sound/usb/6fire/Makefile
############
# Watchdog #
############
announce ZIIRAVE_WATCHDOG - "Zodiac RAVE Watchdog Timer"
reject_firmware drivers/watchdog/ziirave_wdt.c
clean_blob drivers/watchdog/ziirave_wdt.c
clean_kconfig drivers/watchdog/Kconfig ZIIRAVE_WATCHDOG
clean_mk CONFIG_ZIIRAVE_WATCHDOG drivers/watchdog/Makefile
###########
# Greybus #
###########
# I couldn't find any evidence of any Free Software firmware for
# devices that use this bus type, so I'm tentatively disabling it all.
announce GREYBUS_FIRMWARE - "Greybus Firmware Download Class driver"
clean_blob drivers/staging/greybus/firmware.h
reject_firmware drivers/staging/greybus/fw-download.c
clean_blob drivers/staging/greybus/fw-download.c
clean_kconfig drivers/staging/greybus/Kconfig GREYBUS_FIRMWARE
clean_mk CONFIG_GREYBUS_FIRMWARE drivers/staging/greybus/Makefile
announce GREYBUS_BOOTROM - "Greybus Bootrom Class driver"
reject_firmware drivers/staging/greybus/bootrom.c
clean_blob drivers/staging/greybus/bootrom.c
clean_kconfig drivers/staging/greybus/Kconfig GREYBUS_BOOTROM
clean_mk CONFIG_GREYBUS_BOOTROM drivers/staging/greybus/Makefile
####### #######
# SOC # # SOC #
####### #######
@ -3258,7 +3354,8 @@ clean_mk CONFIG_KEYSTONE_NAVIGATOR_QMSS drivers/soc/ti/Makefile
announce Documentation - "non-Free firmware scripts and documentation" announce Documentation - "non-Free firmware scripts and documentation"
clean_blob Documentation/media/dvb-drivers/avermedia.rst clean_blob Documentation/media/dvb-drivers/avermedia.rst
clean_blob Documentation/media/dvb-drivers/opera-firmware.rst clean_blob Documentation/media/dvb-drivers/opera-firmware.rst
clean_blob Documentation/sound/alsa/ALSA-Configuration.txt clean_blob Documentation/media/v4l-drivers/ivtv.rst
clean_blob Documentation/sound/alsa-configuration.rst
clean_blob Documentation/sound/oss/MultiSound clean_blob Documentation/sound/oss/MultiSound
clean_blob Documentation/sound/oss/PSS clean_blob Documentation/sound/oss/PSS
clean_blob Documentation/sound/oss/PSS-updates clean_blob Documentation/sound/oss/PSS-updates

167
helpers/DATA/linux-hwe/deblob-check
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# deblob-check version 2016-09-25 + 2017-01-09's r13475 # deblob-check version 2017-02-06
# Inspired in gNewSense's find-firmware script. # Inspired in gNewSense's find-firmware script.
# Written by Alexandre Oliva <lxoliva@fsfla.org> # Written by Alexandre Oliva <lxoliva@fsfla.org>
@ -47,27 +47,38 @@
# --reverse-patch: Test the removed parts of a patch, rather than # --reverse-patch: Test the removed parts of a patch, rather than
# the added ones. # the added ones.
# --use-python: Choose the internal python script for the bulk of
# the work. This is the fastest for cleaning up,
# because of the fast startup time of the regular
# expression engine. This option is the default if
# python is found. Set PYTHON to override the python
# interpreter. The internal script works in both Python
# 2 and 3.
# --use-awk: Choose the internal GNU awk script for the bulk of the # --use-awk: Choose the internal GNU awk script for the bulk of the
# work. This is the default option, if GNU awk is found. # work. This is the recommended option to check entire
# The awk interpreter is named gawk, unless AWK is set. # tarballs, because its regular expression engine offers
# the best speed/memory use. This is the default option
# --use-sed: Choose the internal GNU sed script for the bulk of the # if python is not found. Set AWK to specify GNU awk's
# work. This is the default option, if GNU awk is not # name.
# found.
# --use-python: Choose the internal python script. This is not
# recommended, because the regular expressions we use
# invoke exponential behavior in the python engine.
# --use-perl: Choose the internal perl script. This is not # --use-perl: Choose the internal perl script. This is not
# recommended, because our regular expressions exceed # recommended, because our regular expressions exceed
# some limits hard-coded into perl. # some limits hard-coded into perl. Set PERL to specify
# which perl implementation to use. This is the default
# option if neither python nor GNU awk are found, AND if
# PERL is set.
# --use-sed: Choose the internal GNU sed script for the bulk of the
# work. This is the default option, if no other
# alternative is found. Use SED to specify which sed
# program to use.
# --save-script-input: Save the input that would have been fed to # --save-script-input: Save the input that would have been fed to
# any of the engines above. # any of the engines above.
# --gen-flex: Generate a flex input file with all known blob and # --gen-flex: Generate a flex input file with all known blob and
# false positive patterns. It would have been a fast # false positive patterns. It might have been a fast
# regular expression processor if only the flex program # regular expression processor if only the flex program
# completed in reasonable time. # completed in reasonable time.
@ -893,7 +904,7 @@ set_except () {
blobna 'DEFAULT_FIRMWARE' blobna 'DEFAULT_FIRMWARE'
blobna '\([.]\|->\)firmware[ \n]*=[^=]' blobna '\([.]\|->\)firmware[ \n]*=[^=]'
blobna 'mod_firmware_load' # sound/ blobna 'mod_firmware_load' # sound/
blobname '[.]\(fw\|bin[0-9]*\|hex\|frm\|co[dx]\|dat\|elf\|xlx\|rfb\|ucode\|img\|sbcf\|ctx\(prog\|vals\)\|z77\|wfw\|inp\|dlmem\|cld\)[\\]\?["]' blobname '[.]\(\(fw\|bin\)[0-9]*\|hex\|frm\|co[dx]\|dat\|elf\|xlx\|rfb\|ucode\|img\|sbcf\|ctx\(prog\|vals\)\|z77\|wfw\|inp\|dlmem\|cld\|tftf\)[\\]\?["]'
# Catch misdeblobbed fw extension. # Catch misdeblobbed fw extension.
blobname '["][^" \t\n]*[/][*][(]DEBLOBBED[)][*][/][^"\\]' blobname '["][^" \t\n]*[/][*][(]DEBLOBBED[)][*][/][^"\\]'
# Ideally we'd whitelist URLs that don't recommend non-Free # Ideally we'd whitelist URLs that don't recommend non-Free
@ -3937,7 +3948,7 @@ set_except () {
accept '[\t]ret[ ]=[ ]p54spi_request_firmware[(]' drivers/net/wireless/p54/p54spi.c accept '[\t]ret[ ]=[ ]p54spi_request_firmware[(]' drivers/net/wireless/p54/p54spi.c
accept 'static[ ]int[ ]rt2x00lib_request_firmware[(]' drivers/net/wireless/rt2x00/rt2x00firwmare.c accept 'static[ ]int[ ]rt2x00lib_request_firmware[(]' drivers/net/wireless/rt2x00/rt2x00firwmare.c
accept '[\t][\t]retval[ ]=[ ]rt2x00lib_request_firmware[(]' drivers/net/wireless/rt2x00/rt2x00firmware.c accept '[\t][\t]retval[ ]=[ ]rt2x00lib_request_firmware[(]' drivers/net/wireless/rt2x00/rt2x00firmware.c
accept '[\t][\t]wl1271_error[(]["]request_firmware_nowait[ ]failed' drivers/net/wireless/ti/wlcore/main.c accept '[\t][\t]*wl1271_error[(]["]request_firmware_nowait[ ]failed' drivers/net/wireless/ti/wlcore/main.c
accept '[\t][\t]nfc_err[(][&]drv->pdev->dev[,][ ]["]request_firmware[ ]failed' drivers/nfc/nfcwilink.c accept '[\t][\t]nfc_err[(][&]drv->pdev->dev[,][ ]["]request_firmware[ ]failed' drivers/nfc/nfcwilink.c
accept '[\t][\t][\t]["]request_firmware[ ]returned' drivers/nfc/nfcwilink.c accept '[\t][\t][\t]["]request_firmware[ ]returned' drivers/nfc/nfcwilink.c
accept '[\t][\t]dev_err[(][&]rproc->dev[,][ ]["]request_firmware_nowait[ ]err' drivers/remoteproc/remoteproc_core.c accept '[\t][\t]dev_err[(][&]rproc->dev[,][ ]["]request_firmware_nowait[ ]err' drivers/remoteproc/remoteproc_core.c
@ -4435,7 +4446,7 @@ set_except () {
blobname 'pre-cal-%s-%s\.bin' drivers/net/wireless/ath/ath10k/core.c blobname 'pre-cal-%s-%s\.bin' drivers/net/wireless/ath/ath10k/core.c
accept '[\t]fw_file->firmware[ ]=[ ]ath10k_fetch_fw_file' drivers/net/wireless/ath/ath10k/core.c accept '[\t]fw_file->firmware[ ]=[ ]ath10k_fetch_fw_file' drivers/net/wireless/ath/ath10k/core.c
blobname 'brcmfmac4356-sdio\.bin' drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c blobname 'brcmfmac4356-sdio\.bin' drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
blobname 'iwlwifi-9000\(-pu-a0-lc-a0-\|-\|\)' drivers/net/wireless/intel/iwlwifi/iwl-9000.c blobname 'iwlwifi-9000\(-pu-a0-\(jf\|lc\)-a0-\|-\|\)' drivers/net/wireless/intel/iwlwifi/iwl-9000.c
blobname 'iwlwifi-9260-th-a0-\(jf\|lc\)-a0-' drivers/net/wireless/intel/iwlwifi/iwl-9000.c blobname 'iwlwifi-9260-th-a0-\(jf\|lc\)-a0-' drivers/net/wireless/intel/iwlwifi/iwl-9000.c
blobname 'mrvl[/]pcie8897_uapsta_a0\.bin' drivers/net/wireless/marvell/mwifiex/pcie.h blobname 'mrvl[/]pcie8897_uapsta_a0\.bin' drivers/net/wireless/marvell/mwifiex/pcie.h
blobname 'mrvl[/]pcieuart8997_combo\(_v2\)\?\.bin' drivers/net/wireless/marvell/mwifiex/pcie.h blobname 'mrvl[/]pcieuart8997_combo\(_v2\)\?\.bin' drivers/net/wireless/marvell/mwifiex/pcie.h
@ -4521,9 +4532,133 @@ set_except () {
blobname 'modem\.mdt' drivers/remoteproc/qcom_q6v5_pil.c blobname 'modem\.mdt' drivers/remoteproc/qcom_q6v5_pil.c
blobname 'mba\.b00' drivers/remoteproc/qcom_q6v5_pil.c blobname 'mba\.b00' drivers/remoteproc/qcom_q6v5_pil.c
# New in 4.9.
blobname 'rtl_bt[/]rtl\(8723b\|8821a\|8761a\|8822b\)_\(config\|fw\)\.bin' drivers/bluetooth/btrtl.c
blobname 'amdgpu[/]\(topaz\|tonga\)_k_smc\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
blobname 'i915[/]["][^"]*["]_guc_ver["][^"]*["]_["][^"]*["]\.bin' drivers/gpu/drm/i915/intel_guc_loader.c
blobname 'mrvl[/]pcie\(uart\|usb\)8997_combo_v4\.bin' drivers/net/wireless/marvell/mwifiex/pcie.h
blobname 'mrvl[/]pcie8997_wlan_v4\.bin' drivers/net/wireless/marvell/mwifiex/pcie.h
blobname 'mrvl[/]usbusb8997_combo_v4\.bin' drivers/net/wireless/marvell/mwifiex/usb.h
accept '[ ]*[/]Widths[ ]\[[0-9 ]*\]' Documentation/media/media_api_files/typical_media_device.pdf
accept '[ ]*:widths:[0-9 ]*' Documentation/media/uapi/v4l/subdev-formats.rst
defsc 'static[ ]const[ ]struct[ ]iceland_pt_defaults[ ]defaults_iceland\(xt\|pro\)\?[ ]=' drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
defsc 'static[ ]const[ ]struct[ ]tonga_pt_defaults[ ]tonga_power_tune_data_set_array\[POWERTUNE_DEFAULT_SET_MAX\][ ]=' drivers/gpu/drm/amd/poewrplay/smumgr/tonga_smc.c
defsnc 'static[ ]const[ ]uint32_t[ ]tonga_clock_stretcher_ddt_table\[2\]\[4\]\[4\][ ]=' drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
defsnc 'static[ ]const[ ]u16[ ]\(forward\|inverse\)_quantization_table\[QUANTIZATION_TABLE_LEN\][ ]=' drivers/media/pci/tw5864/tw5864-video.c
defsnc 'static[ ]const[ ]u16[ ]encoder_vlc_lookup_table\[VLC_LOOKUP_TABLE_LEN\][ ]=' drivers/media/pci/tw5864/tw5864-video.c
defsnc 'static[ ]const[ ]unsigned[ ]int[ ]\(lambda_lookup_table\|intra4x4_lambda3\)\[\][ ]=' drivers/media/pci/tw5864/tw5864-video.c
defsnc 'static[ ]const[ ]struct[ ]iro[ ]iro_arr\[47\][ ]=' drivers/net/ethernet/qlogic/qed/qed_hsi.h
defsnc 'static[ ]const[ ]u8[ ]netvsc_hash_key\[\][ ]=' drivers/net/hyperv/rndis_filter.c
defsc 'static[ ]const[ ]struct[ ]cs42l73_mclk_div[ ]cs42l73_mclk_coeffs\[\][ ]=' sound/soc/codecs/cs42l73.c
defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]rt5660_reg\[\][ ]=' sound/soc/codecs/rt5660.c
defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]rt566[38]_reg\[\][ ]=' sound/soc/codecs/rt5663.c
defsnc '__thread[ ]vector[ ]int[ ]varray\[24\][ ]=' tools/testing/selftests/powerpc/math/vsx_preempt.c
defsnc 'vector[ ]int[ ]vms\[\][ ]=' tools/testing/selftests/powerpc/tm/tm-signal-context-chk-vmx.c
defsnc 'vector[ ]int[ ]vss\[\][ ]=' tools/testing/selftests/powerpc/tm/tm-signal-context-chk-vsx.c
blobname 'imx[/]sdma[/]sdma-imx7d\.bin' arch/arm/boot/dts/imx7s.dtsi
blobname 'gsl3675-gt90h\.fw' arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
blobname 'gsl1680-inet86dz\.fw' arch/arm/boot/dts/sun8i-a23-inet86dz.dts
blobname 'gsl1680-polaroid-mid2407pxe03\.fw' arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
blobname 'gsl3670-polaroid-mid2809pxe04\.fw' arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
blobname 'gsl3675-ga10h\.fw' arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
blobname 'mrvl[/]helper_uart_3000000\.bin' drivers/bluetooth/hci_mrvl.c
blobname 'mrvl[/]uart8897_bt\.bin' drivers/bluetooth/hci_mrvl.c
accept 'static[ ]int[ ]bnxt_flash_\(firmware\|package\)_from_file[(][ \t\na-z0-9_,*]*[)][\n][{][\n][\t]\([^\n]*[\n]\+[\t]\)*rc[ ]=[ ]request_firmware[(][&]fw' drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
accept '[\t]*\(rc[ ]=[ ]\)\?wil_request_firmware[(]wil[,][ ]WIL_FW2\?_NAME[,][ ]\(true\|false\)[)][;]' drivers/net/wireless/ath/wil6210/main.c
blobname 'mwifiex_mfg\.bin' drivers/net/wireless/marvell/mwifiex/main.c
accept '[\t]*mwifiex_dbg[(]adapter[,][ ]ERROR[,][\n][\t ]*["]request_firmware[ ]error' drivers/net/wireless/marvell/mwifiex/main.c
blobname 'ti-connectivity[/]wl12[78]x-nvs\.bin' 'drivers/net/wireless/ti/wlcore/\(sdio\|spi\)\.c'
blobname 'ti-connectivity[/]wl18xx-conf\.bin' 'drivers/net/wireless/ti/wlcore/\(sdio\|spi\)\.c'
blobname 'ziirave_wdt\.fw' drivers/watchdog/wiirave_wdt.c
blobna '["]gmp_["]' drivers/staging/greybus/firmware.h
blobna '["]FW_NAME_PREFIX["]["]%08x_%08x_%08x_%08x_%s\.tftf["][\n][^*]*\([*]\+[^/*][^*]*\)*[*]\+[/]' drivers/staging/greybus/firmware.h
blobname '\(gmp_\)\?%08x_%08x_%08x_%08x_s2l\.tftf' drivers/staging/greybus/bootrom.c
blobname '\(gmp_\)\?%08x_%08x_%08x_%08x_\(%s\|[^"]*\)\.tftf' drivers/staging/greybus/fw-download.c
# Long-needed b43 cleanup. These are actually cleaned up with
# custom code in deblob-<kver>. Only ucode5, b0g0initvals5 and
# b0g0bsinitvals5 are provided by openfwwf, and only b43 (not
# b43legacy) can use the openfwwf files, so anything else in b43
# and b43legacy ought to be cleaned up.
accept '[\t]*filename[ ]=[ ]["]\(ucode\|b0g0\(bs\)\?initvals\)5["][;]' drivers/net/wireless/broadcom/b43.c
blobna '["]\(ucode\|[^ "\n]*initvals\)[0-9][^" .\n]*["]' 'drivers/net/wireless/broadcom/b43\(legacy\)\?\.c'
# We want to be more specific than deblob0-<kver> in the pcm
# matches, to avoid numerous false positives in sound pcm drivers.
blobna '["]pcm[45]["]' 'drivers/net/wireless/broadcom/b43\(legacy\)\?\.c'
blobna '[/][*][ ]What[ ]about[ ][^ \n]*initvals22[?][ ][*][/]' drivers/net/wireless/broadcom/b43.c
# New in 4.9.2 and 4.8.17. # New in 4.9.2 and 4.8.17.
accept '[\t]*fwname[ ]=[ ]["]fuc4\(09\|1a\)[cd]["][;]' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c accept '[\t]*fwname[ ]=[ ]["]fuc4\(09\|1a\)[cd]["][;]' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
accept '[\t]*snprintf[(]f[,][ ]sizeof[(]f[)][,][ ]["]nouveau[/]nv%02x_%s["][,][ ]device->chipset[,][ ]fwname[)][;][\n][\t]*ret[ ]=[ ]request_firmware[(][&]fw[,][ ]f[,][ ]device->dev[)][;][\n][\t]*if[ ][(]ret[)][ ][{][\n][\t]*snprintf[(]f[,][ ]sizeof[(]f[)][,][ ]["]nouveau[/]%s["][,][ ]fwname[)][;][\n][\t]*ret[ ]=[ ]request_firmware[(][&]fw[,][ ]f[,][ ]device->dev[)][;]' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c accept '[\t]*snprintf[(]f[,][ ]sizeof[(]f[)][,][ ]["]nouveau[/]nv%02x_%s["][,][ ]device->chipset[,][ ]fwname[)][;][\n][\t]*ret[ ]=[ ]request_firmware[(][&]fw[,][ ]f[,][ ]device->dev[)][;][\n][\t]*if[ ][(]ret[)][ ][{][\n][\t]*snprintf[(]f[,][ ]sizeof[(]f[)][,][ ]["]nouveau[/]%s["][,][ ]fwname[)][;][\n][\t]*ret[ ]=[ ]request_firmware[(][&]fw[,][ ]f[,][ ]device->dev[)][;]' drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
# New in 4.10-rc*.
accept '[ ]*d=["]m[ ]0[,]0[ ][^z\n]*z["]' Documentation/media/uapi/v4l/crop.svg
accept '[ ]*Kernel[ ]driver[ ]in[ ]use:[ ]serial\([\n][ ]*[0-3]0:[ 0-9a-f]*\)*' Documentation/media/v4l-drivers/ivtv.rst
accept 'tbl_shf_table:[\n]\([/][/][^\n]*[\n]\)*[\n]*\([\n][\t]\.byte[ \t0-9xa-f]*\)*' arch/arm/crypto/crct10dif-ce-core.S
accept '\.LK256:\([\n][ ]*\.long[ ]*0\(x[0-9a-f]*\([,]0x[0-9a-f]*\)*\)\?\)*[ \t]*[/][/][ ]*terminator' arch/arm64/crypto/sha256-core.S_shipped
accept '\.LK[$]BITS:\([\n]___[\n][$]code\.=<<___[ ]if[^\n]*\([\n][ ]*\.\(long\|quad\)[ ]*0\(x[0-9a-f]*\([,]0x[0-9a-f]*\)*\)\?\)*[ \t]*[/][/][ ]*terminator\)*' arch/arm64/crypto/sha512-armv8.pl
accept '\.LK512:\([\n][ ]*\.quad[ ]*0\(x[0-9a-f]*\([,]0x[0-9a-f]*\)*\)\?\)*[ \t]*[/][/][ ]*terminator' arch/arm64/crypto/sha512-core.S_shipped
accept '[ ][*][ ]Concurrent[ ]request_firmware[(][)][ ]for[ ]the[ ]same' drivers/base/firmware_class.c
defsnc 'static[ ]const[ ]struct[ ]rcar_gen2_cpg_pll_config[ ]cpg_pll_configs\[8\][ ]__initconst[ ]=' drivers/clk/renesas/r8a7745-cpg-mssr.c
defsnc 'static[ ]unsigned[ ]int[ ]eotf_33_linear_mapping\[OSD_EOTF_LUT_SIZE\][ ]=' drivers/gpu/drm/meson/meson_viu.c
defsnc 'static[ ]unsigned[ ]int[ ]oetf_41_linear_mapping\[OSD_OETF_LUT_SIZE\][ ]=' drivers/gpu/drm/meson/meson_viu.c
defsnc 'static[ ]unsigned[ ]int[ ]vpp_filter_coefs_4point_bspline\[\][ ]=' drivers/gpu/drm/meson/meson_vpp.c
defsnc 'static[ ]const[ ]u32[ ]a5xx_registers\[\][ ]=' drivers/gpu/drm/msm/adreno/a5xx_gpu.c
defsnc '[}][ ]a5xx_sequence_regs\[\][ ]=' drivers/gpu/drm/msm/adreno/a5dxx_power.c
defsnc 'static[ ]uint32_t[ ]gf100_ce_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h
defsnc 'static[ ]uint32_t[ ]gt215_ce_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf215.fuc3.h
defsnc 'static[ ]uint32_t[ ]gf100_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
defsnc 'static[ ]uint32_t[ ]gf117_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
defsnc 'static[ ]uint32_t[ ]gk104_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
defsnc 'static[ ]uint32_t[ ]gk110_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
defsnc 'static[ ]uint32_t[ ]gk208_grgpc_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
defsnc 'static[ ]uint32_t[ ]gm107_grgpc_code\[\][ ]=' drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcgm107.fuc5.h
defsnc 'static[ ]uint32_t[ ]gf100_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h
defsnc 'static[ ]uint32_t[ ]gf117_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h
defsnc 'static[ ]uint32_t[ ]gk104_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h
defsnc 'static[ ]uint32_t[ ]gk110_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h
defsnc 'static[ ]uint32_t[ ]gk208_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h
defsnc 'static[ ]uint32_t[ ]gm107_grhub_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5.h
defsnc 'static[ ]uint32_t[ ]g98_psec_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h
defsnc 'static[ ]uint32_t[ ]gf100_pmu_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h
defsnc 'static[ ]uint32_t[ ]gf119_pmu_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf119.fuc4.h
defsnc 'static[ ]uint32_t[ ]gk208_pmu_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h
defsnc 'static[ ]uint32_t[ ]gt215_pmu_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h
defsnc 'static[ ]uint32_t[ ]g98_sec_\(data\|code\)\[\][ ]=' drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf98.fuc0s.h
defsnc 'static[ ]const[ ]u16[ ]lmp91000_temp_lut\[\][ ]=' drivers/iio/potentiostat/lmp91000.c
defsnc 'static[ ]const[ ]u8[ ]fdp1_mdet\[\][ ]=' drivers/media/platform/rcar_fdp1.c
defsnc 'static[ ]struct[ ]cs35l34_mclk_div[ ]cs35l34_mclk_coeffs\[\][ ]=' sound/soc/codecs/cs35l34.c
defsnc 'static[ ]const[ ]struct[ ]cs42l42_pll_params[ ]pll_ratio_table\[\][ ]=' sound/soc/codecs/cs42l42.c
defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]rt5663_v2_reg\[\][ ]=' sound/soc/codecs/rt5663.c
defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]rt5665_reg\[\][ ]=' sound/soc/codecs/rt5665.c
defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]stac9766_reg_defaults\[\][ ]=' sound/soc/codecs/stac9766.c
defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]wm9705_reg_defaults\[\][ ]=' sound/soc/codecs/wm9705.c
defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]wm9712_reg_defaults\[\][ ]=' sound/soc/codecs/wm9712.c
blobname 'fdma_\(%s_%d\|[^\." ,;_]*_[0-9][0-9]*\)\.elf' drivers/dma/st_fdma.c
blobname 'amdgpu[/]polaris12_smc\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
blobname 'amdgpu[/]polaris12_uvd\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
blobname 'amdgpu[/]polaris12_vce\.bin' drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
blobname 'amdgpu[/]polaris12_\(ce\|pfp\|me\|mec\|mec2\|rlc\)\.bin' drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
blobname 'amdgpu[/]polaris12_mc\.bin' drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
blobname 'amdgpu[/]polaris12_sdma1\?\.bin' drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
blobname 'amdgpu[/]polaris12_smc\.bin' drivers/gpu/drm/amd/amdgpu/vi.c
blobname 'radeon[/]si58_mc\.bin' 'drivers/gpu/drm/amd/amdgpu/gmc_v6_0\.c\|drivers/gpu/drm/radeon/si\.c'
blobname 'a530_p\(m4\|fp\)\.fw' drivers/gpu/drm/msm/adreno/adreno_device.c
blobname 'radeon[/]banks_k_2_smc\.bin' 'drivers/gpu/drm/amd/amdgpu/si_dpm\.c\|drivers/gpu/drm/radeon/si\.c'
blobname 'melfas_mip4_%04X\.fw' drivers/input/touchscreen/melfas_mip4.c
blobname 'cbfw-3\.2\.5\.1\.bin' drivers/scsi/bfa/bfad.c
blobname 'r8a779x_usb3_v3\.dlmem' drivers/usb/host/xhci-rcar.h
blob 'https\?:[/][/]linuxtv\.org[/][^" >]*firmware[/][^" \t\n>\\)]*' 'Documentation/media/v4l-drivers/ivtv\.rst\|drivers/media/pci/ttpci/av7110\.c\|firmware/WHENCE'
# The firmware file name is supplied by the user.
accept '[\t]ret[ ]=[ ]request_firmware[(][&]fw[,][ ]fw_name[,]\([^\n]*[\n]\+[^\n}]\)*ret[ ]=[ ]rmi_firmware_update[(]data[,][ ]fw[)]' drivers/input/rmi4/rmi_f34.c
# This seems to be an example file name of something to be
# supplied by the user in the DTS file, not the name of an actual
# firmware file.
accept '[\t ]*firmware-name[ ]=[ ]["]zynq-gpio\.bin["][;]' Documentation/devicetree/bindings/fpga/fpga-region.txt
accept '[\t]if[ ][(]of_property_read_bool[(]np[,][ ]["]qca[,]no-eeprom["][)][)][ ][{][\n][\t]*[/][*][ ]ath9k-eeprom-<bus>-<id>\.bin[ ][*][/][\n][\t]*scnprintf[(]eeprom_name[,][ ]sizeof[(]eeprom_name[)][,][\n][\t ]*["]ath9k-eeprom-%s-%s\.bin["][,]' drivers/net/wireless/ath/ath9k/init.c
blobname 'iwlwifi-3168-' drivers/net/wireless/intel/iwlwifi/iwl-7000.c
blobname 'iwlwifi-8265-' drivers/net/wireless/intel/iwlwifi/iwl-8000.c
blobname 'iwlwifi-[0-9][^"\n\t ]*-' drivers/net/wireless/intel/iwlwifi/iwl-8000.c
blobname 'a530v3_gpmu\.fw2' drivers/gpu/drm/msm/adreno/adreno_device.c
;; ;;
*/*freedo*.patch | */*logo*.patch) */*freedo*.patch | */*logo*.patch)

4
helpers/DATA/linux-hwe/deblob-main
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Copyright (C) 2008-2016 Alexandre Oliva <lxoliva@fsfla.org> # Copyright (C) 2008-2017 Alexandre Oliva <lxoliva@fsfla.org>
# This program is part of GNU Linux-libre, a GNU project that # This program is part of GNU Linux-libre, a GNU project that
# publishes scripts to clean up Linux so as to make it suitable for # publishes scripts to clean up Linux so as to make it suitable for
@ -112,7 +112,7 @@ else
fi fi
x1="kver=$mver extra=$extra" x1="kver=$mver extra=$extra"
x2=`grep "^kver=[^ ]* extra=" $deblob` x2=`grep "^kver=[^ ]* extra=" $deblob | sed 's, *#.*,,'`
if test "$x1" = "$x2"; then if test "$x1" = "$x2"; then
: :
else else

483
helpers/DATA/linux-hwe/silent-accept-firmware.patch
View file

@ -1,8 +1,8 @@
diff -ru source.bak/drivers/base/firmware_class.c source/drivers/base/firmware_class.c diff -ru source/drivers/base/firmware_class.c source/drivers/base/firmware_class.c
--- source.bak/drivers/base/firmware_class.c 2017-05-31 17:29:09.000000000 -0400 --- source/drivers/base/firmware_class.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/base/firmware_class.c 2017-05-31 17:32:41.346386778 -0400 +++ source/drivers/base/firmware_class.c 2017-08-21 10:54:54.485544208 -0400
@@ -97,7 +97,7 @@ @@ -99,7 +99,7 @@
FW_STATUS_ABORT, FW_STATUS_ABORTED,
}; };
-static int loading_timeout = 60; /* In seconds */ -static int loading_timeout = 60; /* In seconds */
@ -10,7 +10,7 @@ diff -ru source.bak/drivers/base/firmware_class.c source/drivers/base/firmware_c
static inline long firmware_loading_timeout(void) static inline long firmware_loading_timeout(void)
{ {
@@ -351,14 +351,14 @@ @@ -419,14 +419,14 @@
id); id);
if (rc) { if (rc) {
if (rc == -ENOENT) if (rc == -ENOENT)
@ -28,9 +28,9 @@ diff -ru source.bak/drivers/base/firmware_class.c source/drivers/base/firmware_c
- dev_dbg(device, "direct-loading %s\n", buf->fw_id); - dev_dbg(device, "direct-loading %s\n", buf->fw_id);
+ dev_dbg(device, "direct-loading\n", buf->fw_id); + dev_dbg(device, "direct-loading\n", buf->fw_id);
buf->size = size; buf->size = size;
fw_finish_direct_load(device, buf); fw_state_done(&buf->fw_st);
break; break;
@@ -949,7 +949,7 @@ @@ -1010,7 +1010,7 @@
if (opt_flags & FW_OPT_UEVENT) { if (opt_flags & FW_OPT_UEVENT) {
buf->need_uevent = true; buf->need_uevent = true;
dev_set_uevent_suppress(f_dev, false); dev_set_uevent_suppress(f_dev, false);
@ -39,7 +39,7 @@ diff -ru source.bak/drivers/base/firmware_class.c source/drivers/base/firmware_c
kobject_uevent(&fw_priv->dev.kobj, KOBJ_ADD); kobject_uevent(&fw_priv->dev.kobj, KOBJ_ADD);
} else { } else {
timeout = MAX_JIFFY_OFFSET; timeout = MAX_JIFFY_OFFSET;
@@ -1065,7 +1065,7 @@ @@ -1099,7 +1099,7 @@
} }
if (fw_get_builtin_firmware(firmware, name, dbuf, size)) { if (fw_get_builtin_firmware(firmware, name, dbuf, size)) {
@ -48,7 +48,7 @@ diff -ru source.bak/drivers/base/firmware_class.c source/drivers/base/firmware_c
return 0; /* assigned */ return 0; /* assigned */
} }
@@ -1152,11 +1152,11 @@ @@ -1186,11 +1186,11 @@
goto out; goto out;
ret = 0; ret = 0;
@ -62,7 +62,7 @@ diff -ru source.bak/drivers/base/firmware_class.c source/drivers/base/firmware_c
name); name);
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
@@ -1164,7 +1164,7 @@ @@ -1198,7 +1198,7 @@
} else { } else {
ret = usermodehelper_read_trylock(); ret = usermodehelper_read_trylock();
if (WARN_ON(ret)) { if (WARN_ON(ret)) {
@ -71,7 +71,7 @@ diff -ru source.bak/drivers/base/firmware_class.c source/drivers/base/firmware_c
name); name);
goto out; goto out;
} }
@@ -1174,12 +1174,13 @@ @@ -1208,12 +1208,13 @@
if (ret) { if (ret) {
if (!(opt_flags & FW_OPT_NO_WARN)) if (!(opt_flags & FW_OPT_NO_WARN))
dev_warn(device, dev_warn(device,
@ -87,10 +87,12 @@ diff -ru source.bak/drivers/base/firmware_class.c source/drivers/base/firmware_c
} }
} }
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c source/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c Only in source/drivers/base: firmware_class.c.orig
--- source.bak/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2016-10-02 19:24:33.000000000 -0400 Only in source/drivers/base: firmware_class.c.rej
+++ source/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2017-05-31 17:32:41.354386778 -0400 diff -ru source/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c source/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -786,7 +786,7 @@ --- source/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2017-08-21 10:54:54.485544208 -0400
@@ -856,7 +856,7 @@
err = amdgpu_ucode_validate(adev->pm.fw); err = amdgpu_ucode_validate(adev->pm.fw);
if (err) { if (err) {
@ -99,10 +101,11 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c source/drivers/gpu/d
release_firmware(adev->pm.fw); release_firmware(adev->pm.fw);
adev->pm.fw = NULL; adev->pm.fw = NULL;
return err; return err;
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c source/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c Only in source/drivers/gpu/drm/amd/amdgpu: amdgpu_cgs.c.rej
--- source.bak/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2016-10-02 19:24:33.000000000 -0400 diff -ru source/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c source/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ source/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2017-05-31 17:32:41.354386778 -0400 --- source/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2017-02-19 17:34:00.000000000 -0500
@@ -155,7 +155,7 @@ +++ source/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2017-08-21 10:54:54.485544208 -0400
@@ -160,7 +160,7 @@
r = request_firmware(&adev->uvd.fw, fw_name, adev->dev); r = request_firmware(&adev->uvd.fw, fw_name, adev->dev);
if (r) { if (r) {
@ -111,10 +114,11 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c source/drivers/gpu/d
fw_name); fw_name);
return r; return r;
} }
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c source/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c Only in source/drivers/gpu/drm/amd/amdgpu: amdgpu_uvd.c.orig
--- source.bak/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 2016-10-02 19:24:33.000000000 -0400 diff -ru source/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c source/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ source/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 2017-05-31 17:32:41.358386778 -0400 --- source/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 2017-02-19 17:34:00.000000000 -0500
@@ -128,7 +128,7 @@ +++ source/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 2017-08-21 10:54:54.485544208 -0400
@@ -133,7 +133,7 @@
r = request_firmware(&adev->vce.fw, fw_name, adev->dev); r = request_firmware(&adev->vce.fw, fw_name, adev->dev);
if (r) { if (r) {
@ -123,10 +127,11 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c source/drivers/gpu/d
fw_name); fw_name);
return r; return r;
} }
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/ci_dpm.c source/drivers/gpu/drm/amd/amdgpu/ci_dpm.c Only in source/drivers/gpu/drm/amd/amdgpu: amdgpu_vce.c.orig
--- source.bak/drivers/gpu/drm/amd/amdgpu/ci_dpm.c 2016-10-02 19:24:33.000000000 -0400 diff -ru source/drivers/gpu/drm/amd/amdgpu/ci_dpm.c source/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ source/drivers/gpu/drm/amd/amdgpu/ci_dpm.c 2017-05-31 17:32:41.358386778 -0400 --- source/drivers/gpu/drm/amd/amdgpu/ci_dpm.c 2017-02-19 17:34:00.000000000 -0500
@@ -5792,7 +5792,7 @@ +++ source/drivers/gpu/drm/amd/amdgpu/ci_dpm.c 2017-08-21 10:54:54.485544208 -0400
@@ -5806,7 +5806,7 @@
out: out:
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -135,9 +140,10 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/ci_dpm.c source/drivers/gpu/drm/a
fw_name); fw_name);
release_firmware(adev->pm.fw); release_firmware(adev->pm.fw);
adev->pm.fw = NULL; adev->pm.fw = NULL;
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/cik_sdma.c source/drivers/gpu/drm/amd/amdgpu/cik_sdma.c Only in source/drivers/gpu/drm/amd/amdgpu: ci_dpm.c.orig
--- source.bak/drivers/gpu/drm/amd/amdgpu/cik_sdma.c 2016-10-02 19:24:33.000000000 -0400 diff -ru source/drivers/gpu/drm/amd/amdgpu/cik_sdma.c source/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ source/drivers/gpu/drm/amd/amdgpu/cik_sdma.c 2017-05-31 17:32:41.358386778 -0400 --- source/drivers/gpu/drm/amd/amdgpu/cik_sdma.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/amd/amdgpu/cik_sdma.c 2017-08-21 10:54:54.485544208 -0400
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
out: out:
if (err) { if (err) {
@ -147,21 +153,9 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/cik_sdma.c source/drivers/gpu/drm
fw_name); fw_name);
for (i = 0; i < adev->sdma.num_instances; i++) { for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw); release_firmware(adev->sdma.instance[i].fw);
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c source/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c diff -ru source/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c source/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
--- source.bak/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/amd/amdgpu/fiji_dpm.c 2017-05-31 17:32:41.358386778 -0400 +++ source/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c 2017-08-21 10:54:54.489544208 -0400
@@ -51,7 +51,7 @@
out:
if (err) {
- DRM_ERROR("Failed to load firmware \"%s\"", fw_name);
+ DRM_ERROR("Failed to load firmware\n", fw_name);
release_firmware(adev->pm.fw);
adev->pm.fw = NULL;
}
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c source/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
--- source.bak/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c 2016-10-02 19:24:33.000000000 -0400
+++ source/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c 2017-05-31 17:32:41.358386778 -0400
@@ -973,7 +973,7 @@ @@ -973,7 +973,7 @@
out: out:
if (err) { if (err) {
@ -171,10 +165,10 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c source/drivers/gpu/drm
fw_name); fw_name);
release_firmware(adev->gfx.pfp_fw); release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL; adev->gfx.pfp_fw = NULL;
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c source/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c diff -ru source/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c source/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
--- source.bak/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 2017-05-31 17:29:09.000000000 -0400 --- source/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 2017-05-31 17:32:41.358386778 -0400 +++ source/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c 2017-08-21 10:54:54.489544208 -0400
@@ -1069,7 +1069,7 @@ @@ -1097,7 +1097,7 @@
out: out:
if (err) { if (err) {
dev_err(adev->dev, dev_err(adev->dev,
@ -183,9 +177,10 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c source/drivers/gpu/drm
fw_name); fw_name);
release_firmware(adev->gfx.pfp_fw); release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL; adev->gfx.pfp_fw = NULL;
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c source/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c Only in source/drivers/gpu/drm/amd/amdgpu: gfx_v8_0.c.orig
--- source.bak/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c 2016-10-02 19:24:33.000000000 -0400 diff -ru source/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c source/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ source/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c 2017-05-31 17:32:41.358386778 -0400 --- source/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c 2017-08-21 10:54:54.489544208 -0400
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
out: out:
if (err) { if (err) {
@ -195,10 +190,10 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c source/drivers/gpu/drm
fw_name); fw_name);
release_firmware(adev->mc.fw); release_firmware(adev->mc.fw);
adev->mc.fw = NULL; adev->mc.fw = NULL;
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c source/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c diff -ru source/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c source/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
--- source.bak/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c 2017-05-31 17:32:41.358386778 -0400 +++ source/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c 2017-08-21 10:54:54.489544208 -0400
@@ -240,7 +240,7 @@ @@ -246,7 +246,7 @@
out: out:
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -207,21 +202,10 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c source/drivers/gpu/drm
fw_name); fw_name);
release_firmware(adev->mc.fw); release_firmware(adev->mc.fw);
adev->mc.fw = NULL; adev->mc.fw = NULL;
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c source/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c Only in source/drivers/gpu/drm/amd/amdgpu: gmc_v8_0.c.orig
--- source.bak/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c 2016-10-02 19:24:33.000000000 -0400 diff -ru source/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c source/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ source/drivers/gpu/drm/amd/amdgpu/iceland_dpm.c 2017-05-31 17:32:41.358386778 -0400 --- source/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c 2017-02-19 17:34:00.000000000 -0500
@@ -51,7 +51,7 @@ +++ source/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c 2017-08-21 10:54:54.489544208 -0400
out:
if (err) {
- DRM_ERROR("Failed to load firmware \"%s\"", fw_name);
+ DRM_ERROR("Failed to load firmware\n", fw_name);
release_firmware(adev->pm.fw);
adev->pm.fw = NULL;
}
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c source/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
--- source.bak/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c 2016-10-02 19:24:33.000000000 -0400
+++ source/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c 2017-05-31 17:32:41.362386778 -0400
@@ -171,7 +171,7 @@ @@ -171,7 +171,7 @@
out: out:
if (err) { if (err) {
@ -231,10 +215,10 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c source/drivers/gpu/dr
fw_name); fw_name);
for (i = 0; i < adev->sdma.num_instances; i++) { for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw); release_firmware(adev->sdma.instance[i].fw);
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c source/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c diff -ru source/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c source/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
--- source.bak/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c 2017-05-31 17:32:41.362386778 -0400 +++ source/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c 2017-08-21 10:54:54.489544208 -0400
@@ -316,7 +316,7 @@ @@ -322,7 +322,7 @@
out: out:
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -243,21 +227,10 @@ diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c source/drivers/gpu/dr
fw_name); fw_name);
for (i = 0; i < adev->sdma.num_instances; i++) { for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw); release_firmware(adev->sdma.instance[i].fw);
diff -ru source.bak/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c source/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c Only in source/drivers/gpu/drm/amd/amdgpu: sdma_v3_0.c.orig
--- source.bak/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c 2016-10-02 19:24:33.000000000 -0400 diff -ru source/drivers/gpu/drm/drm_edid_load.c source/drivers/gpu/drm/drm_edid_load.c
+++ source/drivers/gpu/drm/amd/amdgpu/tonga_dpm.c 2017-05-31 17:32:41.362386778 -0400 --- source/drivers/gpu/drm/drm_edid_load.c 2017-02-19 17:34:00.000000000 -0500
@@ -50,7 +50,7 @@ +++ source/drivers/gpu/drm/drm_edid_load.c 2017-08-21 10:54:54.489544208 -0400
out:
if (err) {
- DRM_ERROR("Failed to load firmware \"%s\"", fw_name);
+ DRM_ERROR("Failed to load firmware\n", fw_name);
release_firmware(adev->pm.fw);
adev->pm.fw = NULL;
}
diff -ru source.bak/drivers/gpu/drm/drm_edid_load.c source/drivers/gpu/drm/drm_edid_load.c
--- source.bak/drivers/gpu/drm/drm_edid_load.c 2016-10-02 19:24:33.000000000 -0400
+++ source/drivers/gpu/drm/drm_edid_load.c 2017-05-31 17:32:41.362386778 -0400
@@ -188,8 +188,8 @@ @@ -188,8 +188,8 @@
err = request_firmware(&fw, name, &pdev->dev); err = request_firmware(&fw, name, &pdev->dev);
platform_device_unregister(pdev); platform_device_unregister(pdev);
@ -269,9 +242,9 @@ diff -ru source.bak/drivers/gpu/drm/drm_edid_load.c source/drivers/gpu/drm/drm_e
return ERR_PTR(err); return ERR_PTR(err);
} }
diff -ru source.bak/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c source/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c diff -ru source/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c source/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
--- source.bak/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c 2017-05-31 17:32:41.362386778 -0400 +++ source/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c 2017-08-21 10:54:54.489544208 -0400
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
ret = request_firmware(&fw, name, device->dev); ret = request_firmware(&fw, name, device->dev);
@ -281,9 +254,9 @@ diff -ru source.bak/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c source/drivers/
return ret; return ret;
} }
diff -ru source.bak/drivers/gpu/drm/r128/r128_cce.c source/drivers/gpu/drm/r128/r128_cce.c diff -ru source/drivers/gpu/drm/r128/r128_cce.c source/drivers/gpu/drm/r128/r128_cce.c
--- source.bak/drivers/gpu/drm/r128/r128_cce.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/r128/r128_cce.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/r128/r128_cce.c 2017-05-31 17:32:41.362386778 -0400 +++ source/drivers/gpu/drm/r128/r128_cce.c 2017-08-21 10:54:54.489544208 -0400
@@ -155,14 +155,14 @@ @@ -155,14 +155,14 @@
rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev); rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev);
platform_device_unregister(pdev); platform_device_unregister(pdev);
@ -301,10 +274,10 @@ diff -ru source.bak/drivers/gpu/drm/r128/r128_cce.c source/drivers/gpu/drm/r128/
fw->size, FIRMWARE_NAME); fw->size, FIRMWARE_NAME);
rc = -EINVAL; rc = -EINVAL;
goto out_release; goto out_release;
diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/cik.c diff -ru source/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/cik.c
--- source.bak/drivers/gpu/drm/radeon/cik.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/radeon/cik.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/radeon/cik.c 2017-05-31 17:32:41.362386778 -0400 +++ source/drivers/gpu/drm/radeon/cik.c 2017-08-21 10:54:54.489544208 -0400
@@ -2078,7 +2078,7 @@ @@ -2070,7 +2070,7 @@
goto out; goto out;
if (rdev->pfp_fw->size != pfp_req_size) { if (rdev->pfp_fw->size != pfp_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -313,7 +286,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
rdev->pfp_fw->size, fw_name); rdev->pfp_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
@@ -2087,7 +2087,7 @@ @@ -2079,7 +2079,7 @@
err = radeon_ucode_validate(rdev->pfp_fw); err = radeon_ucode_validate(rdev->pfp_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -322,7 +295,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -2104,7 +2104,7 @@ @@ -2096,7 +2096,7 @@
goto out; goto out;
if (rdev->me_fw->size != me_req_size) { if (rdev->me_fw->size != me_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -331,7 +304,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
rdev->me_fw->size, fw_name); rdev->me_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -2112,7 +2112,7 @@ @@ -2104,7 +2104,7 @@
err = radeon_ucode_validate(rdev->me_fw); err = radeon_ucode_validate(rdev->me_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -340,7 +313,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -2129,7 +2129,7 @@ @@ -2121,7 +2121,7 @@
goto out; goto out;
if (rdev->ce_fw->size != ce_req_size) { if (rdev->ce_fw->size != ce_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -349,7 +322,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
rdev->ce_fw->size, fw_name); rdev->ce_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -2137,7 +2137,7 @@ @@ -2129,7 +2129,7 @@
err = radeon_ucode_validate(rdev->ce_fw); err = radeon_ucode_validate(rdev->ce_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -358,7 +331,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -2154,7 +2154,7 @@ @@ -2146,7 +2146,7 @@
goto out; goto out;
if (rdev->mec_fw->size != mec_req_size) { if (rdev->mec_fw->size != mec_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -367,7 +340,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
rdev->mec_fw->size, fw_name); rdev->mec_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -2162,7 +2162,7 @@ @@ -2154,7 +2154,7 @@
err = radeon_ucode_validate(rdev->mec_fw); err = radeon_ucode_validate(rdev->mec_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -376,7 +349,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -2194,7 +2194,7 @@ @@ -2186,7 +2186,7 @@
goto out; goto out;
if (rdev->rlc_fw->size != rlc_req_size) { if (rdev->rlc_fw->size != rlc_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -385,7 +358,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
rdev->rlc_fw->size, fw_name); rdev->rlc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -2202,7 +2202,7 @@ @@ -2194,7 +2194,7 @@
err = radeon_ucode_validate(rdev->rlc_fw); err = radeon_ucode_validate(rdev->rlc_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -394,7 +367,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -2219,7 +2219,7 @@ @@ -2211,7 +2211,7 @@
goto out; goto out;
if (rdev->sdma_fw->size != sdma_req_size) { if (rdev->sdma_fw->size != sdma_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -403,7 +376,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
rdev->sdma_fw->size, fw_name); rdev->sdma_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -2227,7 +2227,7 @@ @@ -2219,7 +2219,7 @@
err = radeon_ucode_validate(rdev->sdma_fw); err = radeon_ucode_validate(rdev->sdma_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -412,7 +385,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -2251,7 +2251,7 @@ @@ -2243,7 +2243,7 @@
if ((rdev->mc_fw->size != mc_req_size) && if ((rdev->mc_fw->size != mc_req_size) &&
(rdev->mc_fw->size != mc2_req_size)){ (rdev->mc_fw->size != mc2_req_size)){
printk(KERN_ERR printk(KERN_ERR
@ -421,7 +394,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
rdev->mc_fw->size, fw_name); rdev->mc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -2260,7 +2260,7 @@ @@ -2252,7 +2252,7 @@
err = radeon_ucode_validate(rdev->mc_fw); err = radeon_ucode_validate(rdev->mc_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -430,7 +403,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -2278,14 +2278,14 @@ @@ -2270,14 +2270,14 @@
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -447,7 +420,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
rdev->smc_fw->size, fw_name); rdev->smc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -2293,7 +2293,7 @@ @@ -2285,7 +2285,7 @@
err = radeon_ucode_validate(rdev->smc_fw); err = radeon_ucode_validate(rdev->smc_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -456,7 +429,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -2315,7 +2315,7 @@ @@ -2307,7 +2307,7 @@
if (err) { if (err) {
if (err != -EINVAL) if (err != -EINVAL)
printk(KERN_ERR printk(KERN_ERR
@ -465,9 +438,10 @@ diff -ru source.bak/drivers/gpu/drm/radeon/cik.c source/drivers/gpu/drm/radeon/c
fw_name); fw_name);
release_firmware(rdev->pfp_fw); release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL; rdev->pfp_fw = NULL;
diff -ru source.bak/drivers/gpu/drm/radeon/ni.c source/drivers/gpu/drm/radeon/ni.c Only in source/drivers/gpu/drm/radeon: cik.c.orig
--- source.bak/drivers/gpu/drm/radeon/ni.c 2017-05-31 17:29:09.000000000 -0400 diff -ru source/drivers/gpu/drm/radeon/ni.c source/drivers/gpu/drm/radeon/ni.c
+++ source/drivers/gpu/drm/radeon/ni.c 2017-05-31 17:32:41.362386778 -0400 --- source/drivers/gpu/drm/radeon/ni.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/radeon/ni.c 2017-08-21 10:54:54.489544208 -0400
@@ -775,7 +775,7 @@ @@ -775,7 +775,7 @@
goto out; goto out;
if (rdev->pfp_fw->size != pfp_req_size) { if (rdev->pfp_fw->size != pfp_req_size) {
@ -530,9 +504,9 @@ diff -ru source.bak/drivers/gpu/drm/radeon/ni.c source/drivers/gpu/drm/radeon/ni
fw_name); fw_name);
release_firmware(rdev->pfp_fw); release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL; rdev->pfp_fw = NULL;
diff -ru source.bak/drivers/gpu/drm/radeon/r100.c source/drivers/gpu/drm/radeon/r100.c diff -ru source/drivers/gpu/drm/radeon/r100.c source/drivers/gpu/drm/radeon/r100.c
--- source.bak/drivers/gpu/drm/radeon/r100.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/radeon/r100.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/radeon/r100.c 2017-05-31 17:32:41.362386778 -0400 +++ source/drivers/gpu/drm/radeon/r100.c 2017-08-21 10:54:54.493544208 -0400
@@ -1042,11 +1042,11 @@ @@ -1042,11 +1042,11 @@
err = request_firmware(&rdev->me_fw, fw_name, rdev->dev); err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);
@ -547,9 +521,9 @@ diff -ru source.bak/drivers/gpu/drm/radeon/r100.c source/drivers/gpu/drm/radeon/
rdev->me_fw->size, fw_name); rdev->me_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
release_firmware(rdev->me_fw); release_firmware(rdev->me_fw);
diff -ru source.bak/drivers/gpu/drm/radeon/r600.c source/drivers/gpu/drm/radeon/r600.c diff -ru source/drivers/gpu/drm/radeon/r600.c source/drivers/gpu/drm/radeon/r600.c
--- source.bak/drivers/gpu/drm/radeon/r600.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/radeon/r600.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/radeon/r600.c 2017-05-31 17:32:41.362386778 -0400 +++ source/drivers/gpu/drm/radeon/r600.c 2017-08-21 10:54:54.493544208 -0400
@@ -2551,7 +2551,7 @@ @@ -2551,7 +2551,7 @@
goto out; goto out;
if (rdev->pfp_fw->size != pfp_req_size) { if (rdev->pfp_fw->size != pfp_req_size) {
@ -603,9 +577,9 @@ diff -ru source.bak/drivers/gpu/drm/radeon/r600.c source/drivers/gpu/drm/radeon/
fw_name); fw_name);
release_firmware(rdev->pfp_fw); release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL; rdev->pfp_fw = NULL;
diff -ru source.bak/drivers/gpu/drm/radeon/radeon_uvd.c source/drivers/gpu/drm/radeon/radeon_uvd.c diff -ru source/drivers/gpu/drm/radeon/radeon_uvd.c source/drivers/gpu/drm/radeon/radeon_uvd.c
--- source.bak/drivers/gpu/drm/radeon/radeon_uvd.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/radeon/radeon_uvd.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/radeon/radeon_uvd.c 2017-05-31 17:32:41.366386778 -0400 +++ source/drivers/gpu/drm/radeon/radeon_uvd.c 2017-08-21 10:54:54.493544208 -0400
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
/* Let's try to load the newer firmware first */ /* Let's try to load the newer firmware first */
r = request_firmware(&rdev->uvd_fw, fw_name, rdev->dev); r = request_firmware(&rdev->uvd_fw, fw_name, rdev->dev);
@ -624,9 +598,9 @@ diff -ru source.bak/drivers/gpu/drm/radeon/radeon_uvd.c source/drivers/gpu/drm/r
legacy_fw_name); legacy_fw_name);
return r; return r;
} }
diff -ru source.bak/drivers/gpu/drm/radeon/radeon_vce.c source/drivers/gpu/drm/radeon/radeon_vce.c diff -ru source/drivers/gpu/drm/radeon/radeon_vce.c source/drivers/gpu/drm/radeon/radeon_vce.c
--- source.bak/drivers/gpu/drm/radeon/radeon_vce.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/gpu/drm/radeon/radeon_vce.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/radeon/radeon_vce.c 2017-05-31 17:32:41.366386778 -0400 +++ source/drivers/gpu/drm/radeon/radeon_vce.c 2017-08-21 10:54:54.493544208 -0400
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
r = request_firmware(&rdev->vce_fw, fw_name, rdev->dev); r = request_firmware(&rdev->vce_fw, fw_name, rdev->dev);
@ -636,10 +610,10 @@ diff -ru source.bak/drivers/gpu/drm/radeon/radeon_vce.c source/drivers/gpu/drm/r
fw_name); fw_name);
return r; return r;
} }
diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si.c diff -ru source/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si.c
--- source.bak/drivers/gpu/drm/radeon/si.c 2017-05-31 17:29:09.000000000 -0400 --- source/drivers/gpu/drm/radeon/si.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/gpu/drm/radeon/si.c 2017-05-31 17:32:41.366386778 -0400 +++ source/drivers/gpu/drm/radeon/si.c 2017-08-21 10:54:54.493544208 -0400
@@ -1765,7 +1765,7 @@ @@ -1763,7 +1763,7 @@
goto out; goto out;
if (rdev->pfp_fw->size != pfp_req_size) { if (rdev->pfp_fw->size != pfp_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -648,7 +622,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
rdev->pfp_fw->size, fw_name); rdev->pfp_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
@@ -1774,7 +1774,7 @@ @@ -1772,7 +1772,7 @@
err = radeon_ucode_validate(rdev->pfp_fw); err = radeon_ucode_validate(rdev->pfp_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -657,7 +631,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -1791,7 +1791,7 @@ @@ -1789,7 +1789,7 @@
goto out; goto out;
if (rdev->me_fw->size != me_req_size) { if (rdev->me_fw->size != me_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -666,7 +640,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
rdev->me_fw->size, fw_name); rdev->me_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -1799,7 +1799,7 @@ @@ -1797,7 +1797,7 @@
err = radeon_ucode_validate(rdev->me_fw); err = radeon_ucode_validate(rdev->me_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -675,7 +649,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -1816,7 +1816,7 @@ @@ -1814,7 +1814,7 @@
goto out; goto out;
if (rdev->ce_fw->size != ce_req_size) { if (rdev->ce_fw->size != ce_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -684,7 +658,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
rdev->ce_fw->size, fw_name); rdev->ce_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -1824,7 +1824,7 @@ @@ -1822,7 +1822,7 @@
err = radeon_ucode_validate(rdev->ce_fw); err = radeon_ucode_validate(rdev->ce_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -693,7 +667,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -1841,7 +1841,7 @@ @@ -1839,7 +1839,7 @@
goto out; goto out;
if (rdev->rlc_fw->size != rlc_req_size) { if (rdev->rlc_fw->size != rlc_req_size) {
printk(KERN_ERR printk(KERN_ERR
@ -702,7 +676,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
rdev->rlc_fw->size, fw_name); rdev->rlc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -1849,7 +1849,7 @@ @@ -1847,7 +1847,7 @@
err = radeon_ucode_validate(rdev->rlc_fw); err = radeon_ucode_validate(rdev->rlc_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -711,7 +685,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -1871,7 +1871,7 @@ @@ -1872,7 +1872,7 @@
if ((rdev->mc_fw->size != mc_req_size) && if ((rdev->mc_fw->size != mc_req_size) &&
(rdev->mc_fw->size != mc2_req_size)) { (rdev->mc_fw->size != mc2_req_size)) {
printk(KERN_ERR printk(KERN_ERR
@ -720,7 +694,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
rdev->mc_fw->size, fw_name); rdev->mc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -1880,7 +1880,7 @@ @@ -1881,7 +1881,7 @@
err = radeon_ucode_validate(rdev->mc_fw); err = radeon_ucode_validate(rdev->mc_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -729,7 +703,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -1898,14 +1898,14 @@ @@ -1901,14 +1901,14 @@
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -746,7 +720,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
rdev->smc_fw->size, fw_name); rdev->smc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@@ -1913,7 +1913,7 @@ @@ -1916,7 +1916,7 @@
err = radeon_ucode_validate(rdev->smc_fw); err = radeon_ucode_validate(rdev->smc_fw);
if (err) { if (err) {
printk(KERN_ERR printk(KERN_ERR
@ -755,7 +729,7 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
fw_name); fw_name);
goto out; goto out;
} else { } else {
@@ -1933,7 +1933,7 @@ @@ -1936,7 +1936,7 @@
if (err) { if (err) {
if (err != -EINVAL) if (err != -EINVAL)
printk(KERN_ERR printk(KERN_ERR
@ -764,9 +738,10 @@ diff -ru source.bak/drivers/gpu/drm/radeon/si.c source/drivers/gpu/drm/radeon/si
fw_name); fw_name);
release_firmware(rdev->pfp_fw); release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL; rdev->pfp_fw = NULL;
diff -ru source.bak/drivers/net/wireless/intel/ipw2x00/ipw2200.c source/drivers/net/wireless/intel/ipw2x00/ipw2200.c Only in source/drivers/gpu/drm/radeon: si.c.orig
--- source.bak/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2016-10-02 19:24:33.000000000 -0400 diff -ru source/drivers/net/wireless/intel/ipw2x00/ipw2200.c source/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ source/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2017-05-31 17:32:41.366386778 -0400 --- source/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2017-08-21 10:54:54.493544208 -0400
@@ -3419,12 +3419,12 @@ @@ -3419,12 +3419,12 @@
/* ask firmware_class module to get the boot firmware off disk */ /* ask firmware_class module to get the boot firmware off disk */
rc = request_firmware(raw, name, &priv->pci_dev->dev); rc = request_firmware(raw, name, &priv->pci_dev->dev);
@ -826,9 +801,9 @@ diff -ru source.bak/drivers/net/wireless/intel/ipw2x00/ipw2200.c source/drivers/
return rc; return rc;
} }
diff -ru source.bak/drivers/net/wireless/intel/iwlegacy/3945-mac.c source/drivers/net/wireless/intel/iwlegacy/3945-mac.c diff -ru source/drivers/net/wireless/intel/iwlegacy/3945-mac.c source/drivers/net/wireless/intel/iwlegacy/3945-mac.c
--- source.bak/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2017-05-31 17:32:41.366386778 -0400 +++ source/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2017-08-21 10:54:54.493544208 -0400
@@ -1861,7 +1861,7 @@ @@ -1861,7 +1861,7 @@
sprintf(buf, "%s%u%s", name_pre, idx, ".ucode"); sprintf(buf, "%s%u%s", name_pre, idx, ".ucode");
ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev); ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev);
@ -866,9 +841,9 @@ diff -ru source.bak/drivers/net/wireless/intel/iwlegacy/3945-mac.c source/driver
api_ver); api_ver);
IL_INFO("loaded firmware version %u.%u.%u.%u\n", IL_INFO("loaded firmware version %u.%u.%u.%u\n",
diff -ru source.bak/drivers/net/wireless/intel/iwlegacy/4965-mac.c source/drivers/net/wireless/intel/iwlegacy/4965-mac.c diff -ru source/drivers/net/wireless/intel/iwlegacy/4965-mac.c source/drivers/net/wireless/intel/iwlegacy/4965-mac.c
--- source.bak/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2017-05-31 17:32:41.370386778 -0400 +++ source/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2017-08-21 10:54:54.497544208 -0400
@@ -4706,7 +4706,7 @@ @@ -4706,7 +4706,7 @@
sprintf(il->firmware_name, "%s%s%s", name_pre, tag, ".ucode"); sprintf(il->firmware_name, "%s%s%s", name_pre, tag, ".ucode");
@ -906,9 +881,9 @@ diff -ru source.bak/drivers/net/wireless/intel/iwlegacy/4965-mac.c source/driver
api_ver); api_ver);
IL_INFO("loaded firmware version %u.%u.%u.%u\n", IL_INFO("loaded firmware version %u.%u.%u.%u\n",
diff -ru source.bak/drivers/net/wireless/intel/iwlwifi/iwl-drv.c source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c diff -ru source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
--- source.bak/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2017-05-31 17:32:41.370386778 -0400 +++ source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2017-08-21 10:54:54.497544208 -0400
@@ -232,7 +232,7 @@ @@ -232,7 +232,7 @@
snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode", snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
name_pre, tag); name_pre, tag);
@ -918,10 +893,10 @@ diff -ru source.bak/drivers/net/wireless/intel/iwlwifi/iwl-drv.c source/drivers/
drv->firmware_name); drv->firmware_name);
return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name, return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name,
diff -ru source.bak/drivers/net/wireless/intel/iwlwifi/mvm/fw.c source/drivers/net/wireless/intel/iwlwifi/mvm/fw.c diff -ru source/drivers/net/wireless/intel/iwlwifi/mvm/fw.c source/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
--- source.bak/drivers/net/wireless/intel/iwlwifi/mvm/fw.c 2017-05-31 17:29:09.000000000 -0400 --- source/drivers/net/wireless/intel/iwlwifi/mvm/fw.c 2017-08-21 12:06:22.000000000 -0400
+++ source/drivers/net/wireless/intel/iwlwifi/mvm/fw.c 2017-05-31 17:32:41.370386778 -0400 +++ source/drivers/net/wireless/intel/iwlwifi/mvm/fw.c 2017-08-21 10:54:54.497544208 -0400
@@ -1279,7 +1279,7 @@ @@ -1307,7 +1307,7 @@
ret = iwl_mvm_load_ucode_wait_alive(mvm, IWL_UCODE_WOWLAN); ret = iwl_mvm_load_ucode_wait_alive(mvm, IWL_UCODE_WOWLAN);
if (ret) { if (ret) {
@ -930,10 +905,11 @@ diff -ru source.bak/drivers/net/wireless/intel/iwlwifi/mvm/fw.c source/drivers/n
goto error; goto error;
} }
diff -ru source.bak/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c source/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c Only in source/drivers/net/wireless/intel/iwlwifi/mvm: fw.c.orig
--- source.bak/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c 2016-10-02 19:24:33.000000000 -0400 diff -ru source/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c source/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
+++ source/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c 2017-05-31 17:32:41.370386778 -0400 --- source/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c 2017-02-19 17:34:00.000000000 -0500
@@ -415,7 +415,7 @@ +++ source/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c 2017-08-21 10:54:54.497544208 -0400
@@ -414,7 +414,7 @@
ret = request_firmware(&fw_entry, mvm->nvm_file_name, ret = request_firmware(&fw_entry, mvm->nvm_file_name,
mvm->trans->dev); mvm->trans->dev);
if (ret) { if (ret) {
@ -942,9 +918,10 @@ diff -ru source.bak/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c source/drivers/
mvm->nvm_file_name, ret); mvm->nvm_file_name, ret);
return ret; return ret;
} }
diff -ru source.bak/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c source/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c Only in source/drivers/net/wireless/intel/iwlwifi/mvm: nvm.c.orig
--- source.bak/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2017-05-31 17:29:09.000000000 -0400 diff -ru source/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c source/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ source/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2017-05-31 17:35:21.326386759 -0400 --- source/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2017-08-21 10:54:54.497544208 -0400
@@ -2074,9 +2074,9 @@ @@ -2074,9 +2074,9 @@
int ret = 0; int ret = 0;
u16 signature; u16 signature;
@ -957,147 +934,141 @@ diff -ru source.bak/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c source
ret = -EAGAIN; ret = -EAGAIN;
goto exit; goto exit;
} }
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/core.c source/drivers/net/wireless/realtek/rtlwifi/core.c diff -ru source/drivers/net/wireless/realtek/rtlwifi/core.c source/drivers/net/wireless/realtek/rtlwifi/core.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/core.c 2017-05-31 17:29:09.000000000 -0400 --- source/drivers/net/wireless/realtek/rtlwifi/core.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtlwifi/core.c 2017-05-31 17:32:41.370386778 -0400 +++ source/drivers/net/wireless/realtek/rtlwifi/core.c 2017-08-21 11:09:25.201544104 -0400
@@ -106,12 +106,12 @@ @@ -106,7 +106,7 @@
err = request_firmware(&firmware, err = request_firmware(&firmware,
rtlpriv->cfg->alt_fw_name, rtlpriv->cfg->alt_fw_name,
rtlpriv->io.dev); rtlpriv->io.dev);
- pr_info("Loading alternative firmware %s\n", - pr_info("Loading alternative firmware %s\n",
+ pr_info("Loading alternative firmware\n", + pr_info("Loading alternative firmware \n",
rtlpriv->cfg->alt_fw_name); rtlpriv->cfg->alt_fw_name);
if (!err) if (!err)
goto found_alt; goto found_alt;
} diff -ru source/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
- pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name); --- source/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2017-02-19 17:34:00.000000000 -0500
+ pr_err("Firmware not available\n", rtlpriv->cfg->fw_name); +++ source/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2017-08-21 11:07:03.713544121 -0400
rtlpriv->max_fw_size = 0; @@ -172,7 +172,7 @@
return;
}
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2016-10-02 19:24:33.000000000 -0400
+++ source/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2017-05-31 17:32:41.370386778 -0400
@@ -171,7 +171,7 @@
rtlpriv->cfg->fw_name = "rtlwifi/rtl8188efw.bin"; fw_name = "rtlwifi/rtl8188efw.bin";
rtlpriv->max_fw_size = 0x8000; rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name); - pr_info("Using firmware %s\n", fw_name);
+ pr_info("Requesting firmware\n", rtlpriv->cfg->fw_name); + pr_info("Using firmware \n", fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name, err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw, rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb); rtl_fw_cb);
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c diff -ru source/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2017-05-31 17:32:41.370386778 -0400 +++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2017-08-21 11:07:03.737544121 -0400
@@ -174,7 +174,7 @@ @@ -173,7 +173,7 @@
rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU_B.bin"; fw_name = "rtlwifi/rtl8192cfw.bin";
rtlpriv->max_fw_size = 0x4000; rtlpriv->max_fw_size = 0x4000;
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name); - pr_info("Using firmware %s\n", fw_name);
+ pr_info("Requesting firmware\n", rtlpriv->cfg->fw_name); + pr_info("Using firmware \n", fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name, err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw, rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb); rtl_fw_cb);
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c diff -ru source/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2017-05-31 17:32:41.370386778 -0400 +++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2017-08-21 11:07:03.737544121 -0400
@@ -85,7 +85,7 @@ @@ -82,7 +82,7 @@
} }
/* provide name of alternative file */ /* provide name of alternative file */
rtlpriv->cfg->alt_fw_name = "rtlwifi/rtl8192cufw.bin"; rtlpriv->cfg->alt_fw_name = "rtlwifi/rtl8192cufw.bin";
- pr_info("Loading firmware %s\n", rtlpriv->cfg->fw_name); - pr_info("Loading firmware %s\n", fw_name);
+ pr_info("Requesting firmware\n", rtlpriv->cfg->fw_name); + pr_info("Loading firmware \n", fw_name);
rtlpriv->max_fw_size = 0x4000; rtlpriv->max_fw_size = 0x4000;
err = request_firmware_nowait(THIS_MODULE, 1, err = request_firmware_nowait(THIS_MODULE, 1,
rtlpriv->cfg->fw_name, rtlpriv->io.dev, fw_name, rtlpriv->io.dev,
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c diff -ru source/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2017-05-31 17:32:41.370386778 -0400 +++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2017-08-21 11:09:58.965544100 -0400
@@ -181,7 +181,7 @@ @@ -178,7 +178,7 @@
rtlpriv->max_fw_size = 0x8000; rtlpriv->max_fw_size = 0x8000;
pr_info("Driver for Realtek RTL8192DE WLAN interface\n"); pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
- pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name); - pr_info("Loading firmware file %s\n", fw_name);
+ pr_info("Loading firmware file\n", rtlpriv->cfg->fw_name); + pr_info("Loading firmware file\n", fw_name);
/* request fw */ /* request fw */
err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name, err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c diff -ru source/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2017-05-31 17:34:08.242386768 -0400 +++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2017-08-21 11:07:03.741544121 -0400
@@ -173,7 +173,7 @@ @@ -174,7 +174,7 @@
rtlpriv->cfg->fw_name = "rtlwifi/rtl8192eefw.bin"; fw_name = "rtlwifi/rtl8192eefw.bin";
rtlpriv->max_fw_size = 0x8000; rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name); - pr_info("Using firmware %s\n", fw_name);
+ pr_info("Loading firmware\n", rtlpriv->cfg->fw_name); + pr_info("Using firmware \n", fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name, err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw, rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb); rtl_fw_cb);
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c diff -ru source/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2017-05-31 17:32:41.370386778 -0400 +++ source/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2017-08-21 11:08:21.829544111 -0400
@@ -94,7 +94,7 @@ @@ -91,7 +91,7 @@
"Firmware callback routine entered!\n"); "Firmware callback routine entered!\n");
complete(&rtlpriv->firmware_loading_complete); complete(&rtlpriv->firmware_loading_complete);
if (!firmware) { if (!firmware) {
- pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name); - pr_err("Firmware %s not available\n", fw_name);
+ pr_err("Firmware not available\n", rtlpriv->cfg->fw_name); + pr_err("Firmware not available\n", fw_name);
rtlpriv->max_fw_size = 0; rtlpriv->max_fw_size = 0;
return; return;
} }
@@ -214,7 +214,7 @@ @@ -212,7 +212,7 @@
rtlpriv->max_fw_size = RTL8190_MAX_FIRMWARE_CODE_SIZE*2 + rtlpriv->max_fw_size = RTL8190_MAX_FIRMWARE_CODE_SIZE*2 +
sizeof(struct fw_hdr); sizeof(struct fw_hdr);
pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n" pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
- "Loading firmware %s\n", rtlpriv->cfg->fw_name); - "Loading firmware %s\n", fw_name);
+ "Loading firmware\n", rtlpriv->cfg->fw_name); + "Loading firmware \n", fw_name);
/* request fw */ /* request fw */
err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name, err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw, rtlpriv->io.dev, GFP_KERNEL, hw,
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c diff -ru source/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2017-05-31 17:32:41.370386778 -0400 +++ source/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2017-08-21 11:07:03.741544121 -0400
@@ -182,7 +182,7 @@ @@ -181,7 +181,7 @@
rtlpriv->cfg->fw_name = "rtlwifi/rtl8723fw_B.bin"; fw_name = "rtlwifi/rtl8723fw_B.bin";
rtlpriv->max_fw_size = 0x6000; rtlpriv->max_fw_size = 0x6000;
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name); - pr_info("Using firmware %s\n", fw_name);
+ pr_info("Requesting firmware\n", rtlpriv->cfg->fw_name); + pr_info("Using firmware \n", fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name, err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw, rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb); rtl_fw_cb);
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c diff -ru source/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2017-05-31 17:33:46.026386770 -0400 +++ source/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2017-08-21 11:07:03.741544121 -0400
@@ -184,7 +184,7 @@ @@ -185,7 +185,7 @@
} }
rtlpriv->max_fw_size = 0x8000; rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name); - pr_info("Using firmware %s\n", fw_name);
+ pr_info("Loading firmware\n", rtlpriv->cfg->fw_name); + pr_info("Using firmware \n", fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name, err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw, rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb); rtl_fw_cb);
diff -ru source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c diff -ru source/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c source/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
--- source.bak/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2016-10-02 19:24:33.000000000 -0400 --- source/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2017-02-19 17:34:00.000000000 -0500
+++ source/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2017-05-31 17:34:40.466386764 -0400 +++ source/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2017-08-21 11:07:03.741544121 -0400
@@ -212,7 +212,7 @@ @@ -213,7 +213,7 @@
rtlpriv->max_fw_size = 0x8000; rtlpriv->max_fw_size = 0x8000;
/*load normal firmware*/ /*load normal firmware*/
- pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name); - pr_info("Using firmware %s\n", fw_name);
+ pr_info("Loading firmware\n", rtlpriv->cfg->fw_name); + pr_info("Using firmware \n", fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name, err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw, rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb); rtl_fw_cb);
@@ -222,7 +222,7 @@ @@ -223,7 +223,7 @@
return 1; return 1;
} }
/*load wowlan firmware*/ /*load wowlan firmware*/
- pr_info("Using firmware %s\n", rtlpriv->cfg->wowlan_fw_name); - pr_info("Using firmware %s\n", wowlan_fw_name);
+ pr_info("Loading firmware\n", rtlpriv->cfg->wowlan_fw_name); + pr_info("Using firmware \n", wowlan_fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, err = request_firmware_nowait(THIS_MODULE, 1,
rtlpriv->cfg->wowlan_fw_name, wowlan_fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw, rtlpriv->io.dev, GFP_KERNEL, hw,

4
helpers/make-linux-hwe
View file

@ -34,7 +34,7 @@ for FILE in $PRESERVE; do
cp $FILE /tmp/preserve --parents -a cp $FILE /tmp/preserve --parents -a
done done
sh $DATA/deblob-4.8 --force sh $DATA/deblob-4.10 --force
sed 's/bnx2.*fw/$(DEBLOBBED)/' -i firmware/Makefile sed 's/bnx2.*fw/$(DEBLOBBED)/' -i firmware/Makefile
cp /tmp/preserve/* . -a cp /tmp/preserve/* . -a
@ -48,7 +48,7 @@ rm zfs spl debian/scripts/misc/update-zfs.sh -rf
# Remove VBox # Remove VBox
rm ubuntu/vbox* -rf rm ubuntu/vbox* -rf
sed /vbox/d -i debian.master/info/RECONCILE debian.master/control.d/generic.inclusion-list ubuntu/Makefile sed /vbox/d -i debian.master/control.d/generic.inclusion-list ubuntu/Makefile
sed '/vbox/d' -i debian.master/reconstruct sed '/vbox/d' -i debian.master/reconstruct
# Compile with less modules and avoid abi check # Compile with less modules and avoid abi check