Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Diff btw linux 5.11.6 and linux-libre same version
This file has been truncated, but you can view the full file.
diff -ruN linux-5.11.5/arch/arm/boot/dts/am33xx-l4.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/am33xx-l4.dtsi
--- linux-5.11.5/arch/arm/boot/dts/am33xx-l4.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/am33xx-l4.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -51,7 +51,7 @@
reg-names = "umem", "dmem";
resets = <&prm_wkup 3>;
reset-names = "rstctrl";
- ti,pm-firmware = "am335x-pm-firmware.elf";
+ ti,pm-firmware = "/*(DEBLOBBED)*/";
};
};
};
diff -ruN linux-5.11.5/arch/arm/boot/dts/am437x-l4.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/am437x-l4.dtsi
--- linux-5.11.5/arch/arm/boot/dts/am437x-l4.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/am437x-l4.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -52,7 +52,7 @@
reg-names = "umem", "dmem";
resets = <&prm_wkup 3>;
reset-names = "rstctrl";
- ti,pm-firmware = "am335x-pm-firmware.elf";
+ ti,pm-firmware = "/*(DEBLOBBED)*/";
};
};
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx25.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx25.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx25.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx25.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -522,7 +522,7 @@
clock-names = "ipg", "ahb";
#dma-cells = <3>;
interrupts = <34>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx25.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
watchdog@53fdc000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx31.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx31.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx31.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx31.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -304,7 +304,7 @@
clocks = <&clks 10>, <&clks 27>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx31.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
rtc: rtc@53fd8000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx35.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx35.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx35.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx35.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -291,7 +291,7 @@
clock-names = "ipg", "ahb";
#dma-cells = <3>;
interrupts = <34>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx35.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
wdog: watchdog@53fdc000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx50.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx50.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx50.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx50.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -429,7 +429,7 @@
<&clks IMX5_CLK_AHB>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx50.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
cspi: spi@63fc0000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx51.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx51.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx51.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx51.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -506,7 +506,7 @@
<&clks IMX5_CLK_AHB>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
cspi: spi@83fc0000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx53.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx53.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx53.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx53.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -718,7 +718,7 @@
<&clks IMX5_CLK_AHB>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
cspi: spi@63fc0000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx53-tx53.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx53-tx53.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx53-tx53.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx53-tx53.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -545,7 +545,7 @@
};
&sdma {
- fsl,sdma-ram-script-name = "sdma-imx53.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
&ssi1 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx6qdl.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx6qdl.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx6qdl.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx6qdl.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -935,7 +935,7 @@
<&clks IMX6QDL_CLK_SDMA>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
};
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx6sl.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx6sl.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx6sl.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx6sl.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -758,7 +758,7 @@
clock-names = "ipg", "ahb";
#dma-cells = <3>;
/* imx6sl reuses imx6q sdma firmware */
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
pxp: pxp@20f0000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx6sll.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx6sll.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx6sll.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx6sll.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -633,7 +633,7 @@
clock-names = "ipg", "ahb";
#dma-cells = <3>;
iram = <&ocram>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
pxp: pxp@20f0000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx6sx.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx6sx.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx6sx.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx6sx.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -851,7 +851,7 @@
clock-names = "ipg", "ahb";
#dma-cells = <3>;
/* imx6sx reuses imx6q sdma firmware */
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
};
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx6ul.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx6ul.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx6ul.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx6ul.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -751,7 +751,7 @@
<&clks IMX6UL_CLK_SDMA>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
pwm5: pwm@20f0000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/imx7s.dtsi linux-5.11.5-gnu/arch/arm/boot/dts/imx7s.dtsi
--- linux-5.11.5/arch/arm/boot/dts/imx7s.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/imx7s.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -1185,7 +1185,7 @@
<&clks IMX7D_SDMA_CORE_CLK>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
fec1: ethernet@30be0000 {
diff -ruN linux-5.11.5/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
--- linux-5.11.5/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts 2021-03-09 21:53:50.000000000 +0100
@@ -56,7 +56,7 @@
&touchscreen {
reg = <0x40>;
compatible = "silead,gsl3675";
- firmware-name = "gsl3675-gt90h.fw";
+ firmware-name = "/*(DEBLOBBED)*/";
touchscreen-size-x = <1792>;
touchscreen-size-y = <1024>;
status = "okay";
diff -ruN linux-5.11.5/arch/arm/boot/dts/sun8i-a23-inet86dz.dts linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a23-inet86dz.dts
--- linux-5.11.5/arch/arm/boot/dts/sun8i-a23-inet86dz.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a23-inet86dz.dts 2021-03-09 21:53:50.000000000 +0100
@@ -56,7 +56,7 @@
&touchscreen {
reg = <0x40>;
compatible = "silead,gsl1680";
- firmware-name = "gsl1680-inet86dz.fw";
+ firmware-name = "/*(DEBLOBBED)*/";
touchscreen-size-x = <960>;
touchscreen-size-y = <640>;
status = "okay";
diff -ruN linux-5.11.5/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
--- linux-5.11.5/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts 2021-03-09 21:53:50.000000000 +0100
@@ -86,7 +86,7 @@
&touchscreen {
reg = <0x40>;
compatible = "silead,gsl1680";
- firmware-name = "gsl1680-polaroid-mid2407pxe03.fw";
+ firmware-name = "/*(DEBLOBBED)*/";
touchscreen-size-x = <960>;
touchscreen-size-y = <640>;
touchscreen-inverted-x;
diff -ruN linux-5.11.5/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
--- linux-5.11.5/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts 2021-03-09 21:53:50.000000000 +0100
@@ -79,7 +79,7 @@
&touchscreen {
reg = <0x40>;
compatible = "silead,gsl3670";
- firmware-name = "gsl3670-polaroid-mid2809pxe04.fw";
+ firmware-name = "/*(DEBLOBBED)*/";
touchscreen-size-x = <1660>;
touchscreen-size-y = <890>;
status = "okay";
diff -ruN linux-5.11.5/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
--- linux-5.11.5/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts 2021-03-09 21:53:50.000000000 +0100
@@ -61,7 +61,7 @@
&touchscreen {
reg = <0x40>;
compatible = "silead,gsl3675";
- firmware-name = "gsl3675-ga10h.fw";
+ firmware-name = "/*(DEBLOBBED)*/";
touchscreen-size-x = <1630>;
touchscreen-size-y = <990>;
touchscreen-inverted-y;
diff -ruN linux-5.11.5/arch/arm64/boot/dts/freescale/imx8mm.dtsi linux-5.11.5-gnu/arch/arm64/boot/dts/freescale/imx8mm.dtsi
--- linux-5.11.5/arch/arm64/boot/dts/freescale/imx8mm.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/freescale/imx8mm.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -486,7 +486,7 @@
<&clk IMX8MM_CLK_SDMA2_ROOT>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
sdma3: dma-controller@302b0000 {
@@ -497,7 +497,7 @@
<&clk IMX8MM_CLK_SDMA3_ROOT>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
iomuxc: pinctrl@30330000 {
@@ -889,7 +889,7 @@
<&clk IMX8MM_CLK_AHB>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
fec1: ethernet@30be0000 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/freescale/imx8mn.dtsi linux-5.11.5-gnu/arch/arm64/boot/dts/freescale/imx8mn.dtsi
--- linux-5.11.5/arch/arm64/boot/dts/freescale/imx8mn.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/freescale/imx8mn.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -389,7 +389,7 @@
"ctx1_rx", "ctx1_tx",
"ctx2_rx", "ctx2_tx",
"ctx3_rx", "ctx3_tx";
- firmware-name = "imx/easrc/easrc-imx8mn.bin";
+ firmware-name = "/*(DEBLOBBED)*/";
fsl,asrc-rate = <8000>;
fsl,asrc-format = <2>;
status = "disabled";
@@ -500,7 +500,7 @@
<&clk IMX8MN_CLK_SDMA3_ROOT>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
sdma2: dma-controller@302c0000 {
@@ -511,7 +511,7 @@
<&clk IMX8MN_CLK_SDMA2_ROOT>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
iomuxc: pinctrl@30330000 {
@@ -883,7 +883,7 @@
<&clk IMX8MN_CLK_AHB>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
fec1: ethernet@30be0000 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/freescale/imx8mp.dtsi linux-5.11.5-gnu/arch/arm64/boot/dts/freescale/imx8mp.dtsi
--- linux-5.11.5/arch/arm64/boot/dts/freescale/imx8mp.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/freescale/imx8mp.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -742,7 +742,7 @@
<&clk IMX8MP_CLK_AHB>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
fec: ethernet@30be0000 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/freescale/imx8mq.dtsi linux-5.11.5-gnu/arch/arm64/boot/dts/freescale/imx8mq.dtsi
--- linux-5.11.5/arch/arm64/boot/dts/freescale/imx8mq.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/freescale/imx8mq.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -505,7 +505,7 @@
<&clk IMX8MQ_CLK_SDMA2_ROOT>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
lcdif: lcd-controller@30320000 {
@@ -1135,7 +1135,7 @@
<&clk IMX8MQ_CLK_AHB>;
clock-names = "ipg", "ahb";
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
fec1: ethernet@30be0000 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi linux-5.11.5-gnu/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
--- linux-5.11.5/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -826,7 +826,7 @@
compatible = "qcom,qca6174-bt";
enable-gpios = <&pio 120 0>;
clocks = <&clk32k>;
- firmware-name = "nvm_00440302_i2s.bin";
+ firmware-name = "/*(DEBLOBBED)*/";
};
};
diff -ruN linux-5.11.5/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi linux-5.11.5-gnu/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi
--- linux-5.11.5/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -41,7 +41,7 @@
};
&bluetooth {
- firmware-name = "nvm_00440302_i2s_eu.bin";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&i2c0 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
--- linux-5.11.5/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts 2021-03-09 21:53:50.000000000 +0100
@@ -21,7 +21,7 @@
};
reserved-memory {
- // wcnss.mdt is not relocatable, so it must be loaded at 0x8b600000
+ // /*(DEBLOBBED)*/ is not relocatable, so it must be loaded at 0x8b600000
/delete-node/ wcnss@89300000;
wcnss_mem: wcnss@8b600000 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
--- linux-5.11.5/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts 2021-03-09 21:53:50.000000000 +0100
@@ -26,8 +26,8 @@
};
&remoteproc_mss {
- firmware-name = "qcom/LENOVO/81F1/qcdsp1v28998.mbn",
- "qcom/LENOVO/81F1/qcdsp28998.mbn";
+ firmware-name = "/*(DEBLOBBED)*/",
+ "/*(DEBLOBBED)*/";
};
&sdhc2 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
--- linux-5.11.5/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -811,8 +811,8 @@
memory-region = <&mba_mem &mpss_mem>;
/* This gets overridden for SKUs with LTE support. */
- firmware-name = "qcom/sc7180-trogdor/modem-nolte/mba.mbn",
- "qcom/sc7180-trogdor/modem-nolte/qdsp6sw.mbn";
+ firmware-name = "/*(DEBLOBBED)*/",
+ "/*(DEBLOBBED)*/";
};
&sdhc_1 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi
--- linux-5.11.5/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi 2021-03-09 21:53:50.000000000 +0100
@@ -14,6 +14,6 @@
};
&remoteproc_mpss {
- firmware-name = "qcom/sc7180-trogdor/modem/mba.mbn",
- "qcom/sc7180-trogdor/modem/qdsp6sw.mbn";
+ firmware-name = "/*(DEBLOBBED)*/",
+ "/*(DEBLOBBED)*/";
};
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/sdm845-db845c.dts linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
--- linux-5.11.5/arch/arm64/boot/dts/qcom/sdm845-db845c.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sdm845-db845c.dts 2021-03-09 21:53:50.000000000 +0100
@@ -244,7 +244,7 @@
&adsp_pas {
status = "okay";
- firmware-name = "qcom/sdm845/adsp.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&apps_rsc {
@@ -390,7 +390,7 @@
&cdsp_pas {
status = "okay";
- firmware-name = "qcom/sdm845/cdsp.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&dsi0 {
@@ -423,7 +423,7 @@
&gpu {
zap-shader {
memory-region = <&gpu_mem>;
- firmware-name = "qcom/sdm845/a630_zap.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
};
@@ -491,7 +491,7 @@
&mss_pil {
status = "okay";
- firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mbn";
+ firmware-name = "/*(DEBLOBBED)*/", "/*(DEBLOBBED)*/";
};
&pcie0 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/sdm845-mtp.dts linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
--- linux-5.11.5/arch/arm64/boot/dts/qcom/sdm845-mtp.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sdm845-mtp.dts 2021-03-09 21:53:50.000000000 +0100
@@ -50,7 +50,7 @@
&adsp_pas {
status = "okay";
- firmware-name = "qcom/sdm845/adsp.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&apps_rsc {
@@ -351,7 +351,7 @@
&cdsp_pas {
status = "okay";
- firmware-name = "qcom/sdm845/cdsp.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&dsi0 {
@@ -439,7 +439,7 @@
&gpu {
zap-shader {
memory-region = <&gpu_mem>;
- firmware-name = "qcom/sdm845/a630_zap.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
};
@@ -458,7 +458,7 @@
&mss_pil {
status = "okay";
- firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mbn";
+ firmware-name = "/*(DEBLOBBED)*/", "/*(DEBLOBBED)*/";
};
&qupv3_id_1 {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts
--- linux-5.11.5/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts 2021-03-09 21:53:50.000000000 +0100
@@ -119,7 +119,7 @@
&adsp_pas {
status = "okay";
- firmware-name = "qcom/sdm845/adsp.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&apps_rsc {
@@ -197,7 +197,7 @@
&cdsp_pas {
status = "okay";
- firmware-name = "qcom/sdm845/cdsp.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&gcc {
@@ -211,13 +211,13 @@
&gpu {
zap-shader {
memory-region = <&gpu_mem>;
- firmware-name = "qcom/sdm845/a630_zap.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
};
&mss_pil {
status = "okay";
- firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mdt";
+ firmware-name = "/*(DEBLOBBED)*/", "/*(DEBLOBBED)*/";
};
&pm8998_gpio {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
--- linux-5.11.5/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts 2021-03-09 21:53:50.000000000 +0100
@@ -67,7 +67,7 @@
};
&adsp_pas {
- firmware-name = "qcom/LENOVO/81JL/qcadsp850.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
status = "okay";
};
@@ -276,7 +276,7 @@
};
&cdsp_pas {
- firmware-name = "qcom/LENOVO/81JL/qccdsp850.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
status = "okay";
};
@@ -310,7 +310,7 @@
&gpu {
zap-shader {
memory-region = <&gpu_mem>;
- firmware-name = "qcom/LENOVO/81JL/qcdxkmsuc850.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
};
@@ -422,7 +422,7 @@
};
&mss_pil {
- firmware-name = "qcom/LENOVO/81JL/qcdsp1v2850.mbn", "qcom/LENOVO/81JL/qcdsp2850.mbn";
+ firmware-name = "/*(DEBLOBBED)*/", "/*(DEBLOBBED)*/";
};
&qup_i2c10_default {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/sm8150-hdk.dts linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
--- linux-5.11.5/arch/arm64/boot/dts/qcom/sm8150-hdk.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sm8150-hdk.dts 2021-03-09 21:53:50.000000000 +0100
@@ -375,19 +375,19 @@
&remoteproc_adsp {
status = "okay";
- firmware-name = "qcom/sm8150/adsp.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&remoteproc_cdsp {
status = "okay";
- firmware-name = "qcom/sm8150/cdsp.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&remoteproc_slpi {
status = "okay";
- firmware-name = "qcom/sm8150/slpi.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&tlmm {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/sm8150-mtp.dts linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
--- linux-5.11.5/arch/arm64/boot/dts/qcom/sm8150-mtp.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sm8150-mtp.dts 2021-03-09 21:53:50.000000000 +0100
@@ -369,22 +369,22 @@
&remoteproc_adsp {
status = "okay";
- firmware-name = "qcom/sm8150/adsp.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&remoteproc_cdsp {
status = "okay";
- firmware-name = "qcom/sm8150/cdsp.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&remoteproc_mpss {
status = "okay";
- firmware-name = "qcom/sm8150/modem.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&remoteproc_slpi {
status = "okay";
- firmware-name = "qcom/sm8150/slpi.mdt";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&tlmm {
diff -ruN linux-5.11.5/arch/arm64/boot/dts/qcom/sm8250-mtp.dts linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
--- linux-5.11.5/arch/arm64/boot/dts/qcom/sm8250-mtp.dts 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/arm64/boot/dts/qcom/sm8250-mtp.dts 2021-03-09 21:53:50.000000000 +0100
@@ -57,7 +57,7 @@
&adsp {
status = "okay";
- firmware-name = "qcom/sm8250/adsp.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&apps_rsc {
@@ -355,7 +355,7 @@
&cdsp {
status = "okay";
- firmware-name = "qcom/sm8250/cdsp.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&i2c1 {
@@ -396,7 +396,7 @@
&slpi {
status = "okay";
- firmware-name = "qcom/sm8250/slpi.mbn";
+ firmware-name = "/*(DEBLOBBED)*/";
};
&tlmm {
diff -ruN linux-5.11.5/arch/x86/events/intel/core.c linux-5.11.5-gnu/arch/x86/events/intel/core.c
--- linux-5.11.5/arch/x86/events/intel/core.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/x86/events/intel/core.c 2021-03-09 21:53:50.000000000 +0100
@@ -4450,7 +4450,7 @@
pr_info("PEBS enabled due to microcode update\n");
x86_pmu.pebs_broken = 0;
} else {
- pr_info("PEBS disabled due to CPU errata, please upgrade microcode\n");
+ pr_info("PEBS disabled due to CPU errata/*(DEBLOBBED)*/\n");
x86_pmu.pebs_broken = 1;
}
}
@@ -4591,7 +4591,7 @@
*/
if (intel_counter_freezing_broken()) {
pr_info("PMU counter freezing disabled due to CPU errata,"
- "please upgrade microcode\n");
+ "please /*(DEBLOBBED)*/\n");
x86_pmu.counter_freezing = false;
x86_pmu.handle_irq = intel_pmu_handle_irq;
}
diff -ruN linux-5.11.5/arch/x86/kernel/apic/apic.c linux-5.11.5-gnu/arch/x86/kernel/apic/apic.c
--- linux-5.11.5/arch/x86/kernel/apic/apic.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/x86/kernel/apic/apic.c 2021-03-09 21:53:50.000000000 +0100
@@ -605,7 +605,7 @@
setup_clear_cpu_cap(X86_FEATURE_TSC_DEADLINE_TIMER);
pr_err(FW_BUG "TSC_DEADLINE disabled due to Errata; "
- "please update microcode to version: 0x%x (or later)\n", rev);
+ "/*(DEBLOBBED)*/\n", rev);
return false;
}
diff -ruN linux-5.11.5/arch/x86/kernel/cpu/microcode/amd.c linux-5.11.5-gnu/arch/x86/kernel/cpu/microcode/amd.c
--- linux-5.11.5/arch/x86/kernel/cpu/microcode/amd.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/x86/kernel/cpu/microcode/amd.c 2021-03-09 21:53:50.000000000 +0100
@@ -62,7 +62,7 @@
* format. See Documentation/x86/microcode.rst
*/
static const char
-ucode_path[] __maybe_unused = "kernel/x86/microcode/AuthenticAMD.bin";
+ucode_path[] __maybe_unused = "/*(DEBLOBBED)*/";
static u16 find_equiv_id(struct equiv_cpu_table *et, u32 sig)
{
@@ -457,11 +457,11 @@
static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family)
{
#ifdef CONFIG_X86_64
- char fw_name[36] = "amd-ucode/microcode_amd.bin";
+ char fw_name[36] = "/*(DEBLOBBED)*/";
if (family >= 0x15)
snprintf(fw_name, sizeof(fw_name),
- "amd-ucode/microcode_amd_fam%.2xh.bin", family);
+ "/*(DEBLOBBED)*/", family);
return get_builtin_firmware(cp, fw_name);
#else
@@ -868,26 +868,11 @@
return ret;
}
-/*
- * AMD microcode firmware naming convention, up to family 15h they are in
- * the legacy file:
- *
- * amd-ucode/microcode_amd.bin
- *
- * This legacy file is always smaller than 2K in size.
- *
- * Beginning with family 15h, they are in family-specific firmware files:
- *
- * amd-ucode/microcode_amd_fam15h.bin
- * amd-ucode/microcode_amd_fam16h.bin
- * ...
- *
- * These might be larger than 2K.
- */
+/*(DEBLOBBED)*/
static enum ucode_state request_microcode_amd(int cpu, struct device *device,
bool refresh_fw)
{
- char fw_name[36] = "amd-ucode/microcode_amd.bin";
+ char fw_name[36] = "/*(DEBLOBBED)*/";
struct cpuinfo_x86 *c = &cpu_data(cpu);
bool bsp = c->cpu_index == boot_cpu_data.cpu_index;
enum ucode_state ret = UCODE_NFOUND;
@@ -898,9 +883,9 @@
return UCODE_OK;
if (c->x86 >= 0x15)
- snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
+ snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", c->x86);
- if (request_firmware_direct(&fw, (const char *)fw_name, device)) {
+ if (reject_firmware_direct(&fw, (const char *)fw_name, device)) {
pr_debug("failed to load file %s\n", fw_name);
goto out;
}
diff -ruN linux-5.11.5/arch/x86/kernel/cpu/microcode/intel.c linux-5.11.5-gnu/arch/x86/kernel/cpu/microcode/intel.c
--- linux-5.11.5/arch/x86/kernel/cpu/microcode/intel.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/arch/x86/kernel/cpu/microcode/intel.c 2021-03-09 21:53:50.000000000 +0100
@@ -37,7 +37,7 @@
#include <asm/setup.h>
#include <asm/msr.h>
-static const char ucode_path[] = "kernel/x86/microcode/GenuineIntel.bin";
+static const char ucode_path[] = "/*(DEBLOBBED)*/";
/* Current microcode patch used in early patching on the APs. */
static struct microcode_intel *intel_ucode_patch;
@@ -463,7 +463,7 @@
native_cpuid(&eax, &ebx, &ecx, &edx);
- sprintf(name, "intel-ucode/%02x-%02x-%02x",
+ sprintf(name, "/*(DEBLOBBED)*/",
x86_family(eax), x86_model(eax), x86_stepping(eax));
return get_builtin_firmware(cp, name);
@@ -936,10 +936,10 @@
if (is_blacklisted(cpu))
return UCODE_NFOUND;
- sprintf(name, "intel-ucode/%02x-%02x-%02x",
+ sprintf(name, "/*(DEBLOBBED)*/",
c->x86, c->x86_model, c->x86_stepping);
- if (request_firmware_direct(&firmware, name, device)) {
+ if (reject_firmware_direct(&firmware, name, device)) {
pr_debug("data file %s load failed\n", name);
return UCODE_NFOUND;
}
diff -ruN linux-5.11.5/Documentation/admin-guide/btmrvl.rst linux-5.11.5-gnu/Documentation/admin-guide/btmrvl.rst
--- linux-5.11.5/Documentation/admin-guide/btmrvl.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/admin-guide/btmrvl.rst 2021-03-09 21:53:50.000000000 +0100
@@ -110,15 +110,4 @@
hcitool cmd 0x3f 0x5b 0xf5 0x00 0x01 --Disable Wlan interface
hcitool cmd 0x3f 0x5b 0xf5 0x00 0x02 --Disable BT interface
-SD8688 firmware
-===============
-
-Images:
-
-- /lib/firmware/sd8688_helper.bin
-- /lib/firmware/sd8688.bin
-
-
-The images can be downloaded from:
-
-git.infradead.org/users/dwmw2/linux-firmware.git/libertas/
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/Documentation/admin-guide/media/avermedia.rst linux-5.11.5-gnu/Documentation/admin-guide/media/avermedia.rst
--- linux-5.11.5/Documentation/admin-guide/media/avermedia.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/admin-guide/media/avermedia.rst 2021-03-09 21:53:50.000000000 +0100
@@ -62,9 +62,7 @@
dvbstream etc.
The frontend module sp887x.o, requires an external firmware.
-Please use the command "get_dvb_firmware sp887x" to download
-it. Then copy it to /usr/lib/hotplug/firmware or /lib/firmware/
-(depending on configuration of firmware hotplug).
+/*(DEBLOBBED)*/
Known Limitations
~~~~~~~~~~~~~~~~~
diff -ruN linux-5.11.5/Documentation/admin-guide/media/bttv.rst linux-5.11.5-gnu/Documentation/admin-guide/media/bttv.rst
--- linux-5.11.5/Documentation/admin-guide/media/bttv.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/admin-guide/media/bttv.rst 2021-03-09 21:53:50.000000000 +0100
@@ -50,12 +50,7 @@
options i2c-algo-bit bit_test=1
Some cards may require an extra firmware file to work. For example,
-for the WinTV/PVR you need one firmware file from its driver CD,
-called: ``hcwamc.rbf``. It is inside a self-extracting zip file
-called ``pvr45xxx.exe``. Just placing it at the ``/etc/firmware``
-directory should be enough for it to be autoload during the driver's
-probing mode (e. g. when the Kernel boots or when the driver is
-manually loaded via ``modprobe`` command).
+/*(DEBLOBBED)*/
If your card isn't listed in :doc:`bttv-cardlist` or if you have
trouble making audio work, please read :ref:`still_doesnt_work`.
diff -ruN linux-5.11.5/Documentation/admin-guide/media/ivtv.rst linux-5.11.5-gnu/Documentation/admin-guide/media/ivtv.rst
--- linux-5.11.5/Documentation/admin-guide/media/ivtv.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/admin-guide/media/ivtv.rst 2021-03-09 21:53:50.000000000 +0100
@@ -15,7 +15,7 @@
#) This driver requires the latest encoder firmware (version 2.06.039, size
376836 bytes). Get the firmware from here:
- https://linuxtv.org/downloads/firmware/#conexant
+ /*(DEBLOBBED)*/
#) 'normal' TV applications do not work with this driver, you need
an application that can handle MPEG input such as mplayer, xine, MythTV,
diff -ruN linux-5.11.5/Documentation/admin-guide/media/lmedm04.rst linux-5.11.5-gnu/Documentation/admin-guide/media/lmedm04.rst
--- linux-5.11.5/Documentation/admin-guide/media/lmedm04.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/admin-guide/media/lmedm04.rst 1970-01-01 01:00:00.000000000 +0100
@@ -1,107 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0
-
-Firmware files for lmedm04 cards
-================================
-
-To extract firmware for the DM04/QQBOX you need to copy the
-following file(s) to this directory.
-
-For DM04+/QQBOX LME2510C (Sharp 7395 Tuner)
--------------------------------------------
-
-The Sharp 7395 driver can be found in windows/system32/drivers
-
-US2A0D.sys (dated 17 Mar 2009)
-
-
-and run:
-
-.. code-block:: none
-
- scripts/get_dvb_firmware lme2510c_s7395
-
-will produce dvb-usb-lme2510c-s7395.fw
-
-An alternative but older firmware can be found on the driver
-disk DVB-S_EN_3.5A in BDADriver/driver
-
-LMEBDA_DVBS7395C.sys (dated 18 Jan 2008)
-
-and run:
-
-.. code-block:: none
-
- ./get_dvb_firmware lme2510c_s7395_old
-
-will produce dvb-usb-lme2510c-s7395.fw
-
-The LG firmware can be found on the driver
-disk DM04+_5.1A[LG] in BDADriver/driver
-
-For DM04 LME2510 (LG Tuner)
----------------------------
-
-LMEBDA_DVBS.sys (dated 13 Nov 2007)
-
-and run:
-
-
-.. code-block:: none
-
- ./get_dvb_firmware lme2510_lg
-
-will produce dvb-usb-lme2510-lg.fw
-
-
-Other LG firmware can be extracted manually from US280D.sys
-only found in windows/system32/drivers
-
-dd if=US280D.sys ibs=1 skip=42360 count=3924 of=dvb-usb-lme2510-lg.fw
-
-For DM04 LME2510C (LG Tuner)
-----------------------------
-
-.. code-block:: none
-
- dd if=US280D.sys ibs=1 skip=35200 count=3850 of=dvb-usb-lme2510c-lg.fw
-
-
-The Sharp 0194 tuner driver can be found in windows/system32/drivers
-
-US290D.sys (dated 09 Apr 2009)
-
-For LME2510
------------
-
-.. code-block:: none
-
- dd if=US290D.sys ibs=1 skip=36856 count=3976 of=dvb-usb-lme2510-s0194.fw
-
-
-For LME2510C
-------------
-
-
-.. code-block:: none
-
- dd if=US290D.sys ibs=1 skip=33152 count=3697 of=dvb-usb-lme2510c-s0194.fw
-
-
-The m88rs2000 tuner driver can be found in windows/system32/drivers
-
-US2B0D.sys (dated 29 Jun 2010)
-
-
-.. code-block:: none
-
- dd if=US2B0D.sys ibs=1 skip=34432 count=3871 of=dvb-usb-lme2510c-rs2000.fw
-
-We need to modify id of rs2000 firmware or it will warm boot id 3344:1120.
-
-
-.. code-block:: none
-
-
- echo -ne \\xF0\\x22 | dd conv=notrunc bs=1 count=2 seek=266 of=dvb-usb-lme2510c-rs2000.fw
-
-Copy the firmware file(s) to /lib/firmware
diff -ruN linux-5.11.5/Documentation/admin-guide/media/opera-firmware.rst linux-5.11.5-gnu/Documentation/admin-guide/media/opera-firmware.rst
--- linux-5.11.5/Documentation/admin-guide/media/opera-firmware.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/admin-guide/media/opera-firmware.rst 2021-03-09 21:53:50.000000000 +0100
@@ -5,28 +5,7 @@
Author: Marco Gittler <g.marco@freenet.de>
-To extract the firmware for the Opera DVB-S1 USB-Box
-you need to copy the files:
-
-2830SCap2.sys
-2830SLoad2.sys
-
-from the windriver disk into this directory.
-
-Then run:
-
-.. code-block:: none
-
- scripts/get_dvb_firmware opera1
-
-and after that you have 2 files:
-
-dvb-usb-opera-01.fw
-dvb-usb-opera1-fpga-01.fw
-
-in here.
-
-Copy them into /lib/firmware/ .
+/*(DEBLOBBED)*/
After that the driver can load the firmware
(if you have enabled firmware loading
diff -ruN linux-5.11.5/Documentation/admin-guide/media/ttusb-dec.rst linux-5.11.5-gnu/Documentation/admin-guide/media/ttusb-dec.rst
--- linux-5.11.5/Documentation/admin-guide/media/ttusb-dec.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/admin-guide/media/ttusb-dec.rst 2021-03-09 21:53:50.000000000 +0100
@@ -24,9 +24,7 @@
- Streaming video PC->DEC
- Conax support for 2450-t
-Getting the Firmware
---------------------
-To download the firmware, use the following commands:
+/*(DEBLOBBED)*/
.. code-block:: none
diff -ruN linux-5.11.5/Documentation/admin-guide/README.rst linux-5.11.5-gnu/Documentation/admin-guide/README.rst
--- linux-5.11.5/Documentation/admin-guide/README.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/admin-guide/README.rst 2021-03-09 21:53:50.000000000 +0100
@@ -1,20 +1,52 @@
.. _readme:
-Linux kernel release 5.x <http://kernel.org/>
-=============================================
+GNU Linux-libre <http://linux-libre.fsfla.org>
+==============================================
-These are the release notes for Linux version 5. Read them carefully,
+These are the release notes for GNU Linux-libre. Read them carefully,
as they tell you what this is all about, explain how to install the
kernel, and what to do if something goes wrong.
+What is GNU Linux-libre?
+------------------------
+
+ GNU Linux-libre is a Free version of the kernel Linux (see below),
+ suitable for use with the GNU Operating System in 100% Free
+ GNU/Linux-libre System Distributions.
+ http://www.gnu.org/distros/
+
+ It removes non-Free components from Linux, that are disguised as
+ source code or distributed in separate files. It also disables
+ run-time requests for non-Free components, shipped separately or as
+ part of Linux, and documentation pointing to them, so as to avoid
+ (Free-)baiting users into the trap of non-Free Software.
+ http://www.fsfla.org/anuncio/2010-11-Linux-2.6.36-libre-debait
+
+ Linux-libre started within the gNewSense GNU/Linux distribution.
+ It was later adopted by Jeff Moe, who coined its name, and in 2008
+ it became a project maintained by FSF Latin America. In 2012, it
+ became part of the GNU Project.
+
+ The GNU Linux-libre project takes a minimal-changes approach to
+ cleaning up Linux, making no effort to substitute components that
+ need to be removed with functionally equivalent Free ones.
+ Nevertheless, we encourage and support efforts towards doing so.
+ http://libreplanet.org/wiki/LinuxLibre:Devices_that_require_non-free_firmware
+
+ Our mascot is Freedo, a light-blue penguin that has just come out
+ of the shower. Although we like penguins, GNU is a much greater
+ contribution to the entire system, so its mascot deserves more
+ promotion. See our web page for their images.
+ http://linux-libre.fsfla.org/
+
What is Linux?
--------------
- Linux is a clone of the operating system Unix, written from scratch by
+ Linux is a clone of the Unix kernel, written from scratch by
Linus Torvalds with assistance from a loosely-knit team of hackers across
the Net. It aims towards POSIX and Single UNIX Specification compliance.
- It has all the features you would expect in a modern fully-fledged Unix,
+ It has all the features you would expect in a modern fully-fledged Unix kernel,
including true multitasking, virtual memory, shared libraries, demand
loading, shared copy-on-write executables, proper memory management,
and multistack networking including IPv4 and IPv6.
diff -ruN linux-5.11.5/Documentation/arm/ixp4xx.rst linux-5.11.5-gnu/Documentation/arm/ixp4xx.rst
--- linux-5.11.5/Documentation/arm/ixp4xx.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/arm/ixp4xx.rst 2021-03-09 21:53:50.000000000 +0100
@@ -35,17 +35,13 @@
See arch/arm/mach-ixp4xx/include/mach/platform.h for access functions.
- Timers (watchdog, OS)
-The following components of the chips are not supported by Linux and
-require the use of Intel's proprietary CSR software:
+The following components of the chips are not supported by Linux /*(DEBLOBBED)*/:
- USB device interface
- Network interfaces (HSS, Utopia, NPEs, etc)
- Network offload functionality
-If you need to use any of the above, you need to download Intel's
-software from:
-
- http://developer.intel.com/design/network/products/npfamily/ixp425.htm
+/*(DEBLOBBED)*/
DO NOT POST QUESTIONS TO THE LINUX MAILING LISTS REGARDING THE PROPRIETARY
SOFTWARE.
diff -ruN linux-5.11.5/Documentation/arm/keystone/knav-qmss.rst linux-5.11.5-gnu/Documentation/arm/keystone/knav-qmss.rst
--- linux-5.11.5/Documentation/arm/keystone/knav-qmss.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/arm/keystone/knav-qmss.rst 2021-03-09 21:53:50.000000000 +0100
@@ -34,27 +34,4 @@
queue or multiple contiguous queues. drivers/soc/ti/knav_qmss_acc.c is the
driver that interface with the accumulator PDSP. This configures
accumulator channels defined in DTS (example in DT documentation) to monitor
-1 or 32 queues per channel. More description on the firmware is available in
-CPPI/QMSS Low Level Driver document (docs/CPPI_QMSS_LLD_SDS.pdf) at
-
- git://git.ti.com/keystone-rtos/qmss-lld.git
-
-k2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin firmware supports upto 48 accumulator
-channels. This firmware is available under ti-keystone folder of
-firmware.git at
-
- git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-
-To use copy the firmware image to lib/firmware folder of the initramfs or
-ubifs file system and provide a sym link to k2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin
-in the file system and boot up the kernel. User would see
-
- "firmware file ks2_qmss_pdsp_acc48.bin downloaded for PDSP"
-
-in the boot up log if loading of firmware to PDSP is successful.
-
-Use of accumulated queues requires the firmware image to be present in the
-file system. The driver doesn't acc queues to the supported queue range if
-PDSP is not running in the SoC. The API call fails if there is a queue open
-request to an acc queue and PDSP is not running. So make sure to copy firmware
-to file system before using these queue types.
+1 or 32 queues per channel. /*(DEBLOBBED)*/
diff -ruN linux-5.11.5/Documentation/devicetree/bindings/display/msm/gpu.txt linux-5.11.5-gnu/Documentation/devicetree/bindings/display/msm/gpu.txt
--- linux-5.11.5/Documentation/devicetree/bindings/display/msm/gpu.txt 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/devicetree/bindings/display/msm/gpu.txt 2021-03-09 21:53:50.000000000 +0100
@@ -151,7 +151,7 @@
zap-shader {
memory-region = <&zap_shader_region>;
- firmware-name = "qcom/LENOVO/81JL/qcdxkmsuc850.mbn"
+ firmware-name = "/*(DEBLOBBED)*/"
};
};
};
diff -ruN linux-5.11.5/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt linux-5.11.5-gnu/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
--- linux-5.11.5/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt 2021-03-09 21:53:50.000000000 +0100
@@ -79,7 +79,7 @@
reg = <0x83fb0000 0x4000>;
interrupts = <6>;
#dma-cells = <3>;
- fsl,sdma-ram-script-name = "sdma-imx51.bin";
+ fsl,sdma-ram-script-name = "/*(DEBLOBBED)*/";
};
DMA clients connected to the i.MX SDMA controller must use the format
diff -ruN linux-5.11.5/Documentation/devicetree/bindings/mfd/iqs62x.yaml linux-5.11.5-gnu/Documentation/devicetree/bindings/mfd/iqs62x.yaml
--- linux-5.11.5/Documentation/devicetree/bindings/mfd/iqs62x.yaml 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/devicetree/bindings/mfd/iqs62x.yaml 2021-03-09 21:53:50.000000000 +0100
@@ -35,7 +35,7 @@
description:
Specifies the name of the calibration and configuration file selected by
the driver. If this property is omitted, the name is chosen based on the
- device name with ".bin" as the extension (e.g. iqs620a.bin for IQS620A).
+ device name with ".bin" as the extension (e.g. /*(DEBLOBBED)*/ for IQS620A).
keys:
$ref: ../input/iqs62x-keys.yaml
@@ -114,7 +114,7 @@
interrupt-parent = <&gpio>;
interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
- firmware-name = "iqs620a_coil.bin";
+ firmware-name = "/*(DEBLOBBED)*/";
keys {
compatible = "azoteq,iqs620a-keys";
diff -ruN linux-5.11.5/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt linux-5.11.5-gnu/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
--- linux-5.11.5/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt 2021-03-09 21:53:50.000000000 +0100
@@ -50,7 +50,7 @@
enable-gpios = <&pm8994_gpios 19 GPIO_ACTIVE_HIGH>;
clocks = <&divclk4>;
- firmware-name = "nvm_00440302.bin";
+ firmware-name = "/*(DEBLOBBED)*/";
};
};
@@ -63,7 +63,7 @@
vddrf-supply = <&vreg_l17a_1p3>;
vddch0-supply = <&vreg_l25a_3p3>;
max-speed = <3200000>;
- firmware-name = "crnv21.bin";
+ firmware-name = "/*(DEBLOBBED)*/";
clocks = <&rpmhcc RPMH_RF_CLK2>;
};
};
diff -ruN linux-5.11.5/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt linux-5.11.5-gnu/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
--- linux-5.11.5/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt 2021-03-09 21:53:50.000000000 +0100
@@ -55,7 +55,7 @@
- qcom,msi_addr: MSI interrupt address.
- qcom,msi_base: Base value to add before writing MSI data into
MSI address register.
-- qcom,ath10k-calibration-variant: string to search for in the board-2.bin
+- qcom,ath10k-calibration-variant: string to search for in the /*(DEBLOBBED)*/
variant list with the same bus and device
specific ids
- qcom,ath10k-calibration-data : calibration data + board specific data
diff -ruN linux-5.11.5/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml linux-5.11.5-gnu/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
--- linux-5.11.5/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml 2021-03-09 21:53:50.000000000 +0100
@@ -148,7 +148,7 @@
$ref: /schemas/types.yaml#/definitions/string
description:
string to uniquely identify variant of the calibration data in the
- board-2.bin for designs with colliding bus and device specific ids
+ /*(DEBLOBBED)*/ for designs with colliding bus and device specific ids
required:
- compatible
diff -ruN linux-5.11.5/Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt linux-5.11.5-gnu/Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt
--- linux-5.11.5/Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt 2021-03-09 21:53:50.000000000 +0100
@@ -44,7 +44,7 @@
<0x180000 0x2000>;
reg-names = "umem", "dmem";
ti,hwmods = "wkup_m3";
- ti,pm-firmware = "am335x-pm-firmware.elf";
+ ti,pm-firmware = "/*(DEBLOBBED)*/";
};
};
diff -ruN linux-5.11.5/Documentation/devicetree/bindings/sound/fsl,easrc.yaml linux-5.11.5-gnu/Documentation/devicetree/bindings/sound/fsl,easrc.yaml
--- linux-5.11.5/Documentation/devicetree/bindings/sound/fsl,easrc.yaml 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/devicetree/bindings/sound/fsl,easrc.yaml 2021-03-09 21:53:50.000000000 +0100
@@ -46,7 +46,7 @@
firmware-name:
$ref: /schemas/types.yaml#/definitions/string
- const: imx/easrc/easrc-imx8mn.bin
+ const: /*(DEBLOBBED)*/
description: The coefficient table for the filters
fsl,asrc-rate:
@@ -94,7 +94,7 @@
"ctx1_rx", "ctx1_tx",
"ctx2_rx", "ctx2_tx",
"ctx3_rx", "ctx3_tx";
- firmware-name = "imx/easrc/easrc-imx8mn.bin";
+ firmware-name = "/*(DEBLOBBED)*/";
fsl,asrc-rate = <8000>;
fsl,asrc-format = <2>;
};
diff -ruN linux-5.11.5/Documentation/dontdiff linux-5.11.5-gnu/Documentation/dontdiff
--- linux-5.11.5/Documentation/dontdiff 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/dontdiff 2021-03-09 21:53:50.000000000 +0100
@@ -192,8 +192,8 @@
parse.c
parse.h
patches*
-pca200e.bin
-pca200e_ecd.bin2
+/*(DEBLOBBED)*/
+/*(DEBLOBBED)*/
perf.data
perf.data.old
perf-archive
diff -ruN linux-5.11.5/Documentation/driver-api/ptp.rst linux-5.11.5-gnu/Documentation/driver-api/ptp.rst
--- linux-5.11.5/Documentation/driver-api/ptp.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/driver-api/ptp.rst 2021-03-09 21:53:50.000000000 +0100
@@ -102,7 +102,7 @@
- Integrated low pass filter (LPF), access via .adjPhase (compliant to ITU-T G.8273.2)
- Programmable output periodic signals
- Programmable inputs can time stamp external triggers
- - Driver and/or hardware configuration through firmware (idtcm.bin)
+ - Driver and/or hardware configuration through firmware (/*(DEBLOBBED)*/)
- LPF settings (bandwidth, phase limiting, automatic holdover, physical layer assist (per ITU-T G.8273.2))
- Programmable output PTP clocks, any frequency up to 1GHz (to other PHY/MAC time stampers, refclk to ASSPs/SoCs/FPGAs)
- Lock to GNSS input, automatic switching between GNSS and user-space PHC control (optional)
diff -ruN linux-5.11.5/Documentation/networking/device_drivers/atm/fore200e.rst linux-5.11.5-gnu/Documentation/networking/device_drivers/atm/fore200e.rst
--- linux-5.11.5/Documentation/networking/device_drivers/atm/fore200e.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/networking/device_drivers/atm/fore200e.rst 2021-03-09 21:53:50.000000000 +0100
@@ -31,32 +31,7 @@
The FORE Systems 200E-series driver is shipped with firmware data being
uploaded to the ATM adapters at system boot time or at module loading time.
-The supplied firmware images should work with all adapters.
-
-However, if you encounter problems (the firmware doesn't start or the driver
-is unable to read the PROM data), you may consider trying another firmware
-version. Alternative binary firmware images can be found somewhere on the
-ForeThought CD-ROM supplied with your adapter by FORE Systems.
-
-You can also get the latest firmware images from FORE Systems at
-https://en.wikipedia.org/wiki/FORE_Systems. Register TACTics Online and go to
-the 'software updates' pages. The firmware binaries are part of
-the various ForeThought software distributions.
-
-Notice that different versions of the PCA-200E firmware exist, depending
-on the endianness of the host architecture. The driver is shipped with
-both little and big endian PCA firmware images.
-
-Name and location of the new firmware images can be set at kernel
-configuration time:
-
-1. Copy the new firmware binary files (with .bin, .bin1 or .bin2 suffix)
- to some directory, such as linux/drivers/atm.
-
-2. Reconfigure your kernel to set the new firmware name and location.
- Expected pathnames are absolute or relative to the drivers/atm directory.
-
-3. Rebuild and re-install your kernel or your module.
+/*(DEBLOBBED)*/
Feedback
diff -ruN linux-5.11.5/Documentation/networking/device_drivers/ethernet/netronome/nfp.rst linux-5.11.5-gnu/Documentation/networking/device_drivers/ethernet/netronome/nfp.rst
--- linux-5.11.5/Documentation/networking/device_drivers/ethernet/netronome/nfp.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/networking/device_drivers/ethernet/netronome/nfp.rst 2021-03-09 21:53:50.000000000 +0100
@@ -33,7 +33,7 @@
load firmware from the host file system.
Firmware for basic NIC operation is available in the upstream
-`linux-firmware.git` repository.
+`/*(DEBLOBBED)*/` repository.
Firmware in NVRAM
-----------------
@@ -94,12 +94,12 @@
which files it's looking for when it recognizes a NFP device::
nfp: Looking for firmware file in order of priority:
- nfp: netronome/serial-00-12-34-aa-bb-cc-10-ff.nffw: not found
- nfp: netronome/pci-0000:02:00.0.nffw: not found
- nfp: netronome/nic_AMDA0081-0001_1x40.nffw: found, loading...
+ nfp: /*(DEBLOBBED)*/: not found
+ nfp: /*(DEBLOBBED)*/: not found
+ nfp: /*(DEBLOBBED)*/: found, loading...
-In this case if file (or link) called *serial-00-12-34-aa-bb-5d-10-ff.nffw*
-or *pci-0000:02:00.0.nffw* is present in `/lib/firmware/netronome` this
+In this case if file (or link) called */*(DEBLOBBED)*/*
+or */*(DEBLOBBED)*/* is present in `/lib/firmware/netronome` this
firmware file will take precedence over `nic_AMDA*` files.
Note that `serial-*` and `pci-*` files are **not** automatically included
diff -ruN linux-5.11.5/Documentation/scsi/wd719x.rst linux-5.11.5-gnu/Documentation/scsi/wd719x.rst
--- linux-5.11.5/Documentation/scsi/wd719x.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/scsi/wd719x.rst 2021-03-09 21:53:50.000000000 +0100
@@ -4,21 +4,4 @@
Driver for Western Digital WD7193, WD7197 and WD7296 SCSI cards
===============================================================
-The card requires firmware that can be cut out of the Windows NT driver that
-can be downloaded from WD at:
-http://support.wdc.com/product/download.asp?groupid=801&sid=27&lang=en
-
-There is no license anywhere in the file or on the page - so the firmware
-probably cannot be added to linux-firmware.
-
-This script downloads and extracts the firmware, creating wd719x-risc.bin and
-d719x-wcs.bin files. Put them in /lib/firmware/::
-
- #!/bin/sh
- wget http://support.wdc.com/download/archive/pciscsi.exe
- lha xi pciscsi.exe pci-scsi.exe
- lha xi pci-scsi.exe nt/wd7296a.sys
- rm pci-scsi.exe
- dd if=wd7296a.sys of=wd719x-risc.bin bs=1 skip=5760 count=14336
- dd if=wd7296a.sys of=wd719x-wcs.bin bs=1 skip=20096 count=514
- rm wd7296a.sys
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/Documentation/sound/alsa-configuration.rst linux-5.11.5-gnu/Documentation/sound/alsa-configuration.rst
--- linux-5.11.5/Documentation/sound/alsa-configuration.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/sound/alsa-configuration.rst 2021-03-09 21:53:50.000000000 +0100
@@ -1568,8 +1568,8 @@
joystick_io
Joystick I/O port
-The driver requires firmware files ``turtlebeach/msndinit.bin`` and
-``turtlebeach/msndperm.bin`` in the proper firmware directory.
+The driver requires firmware files ``/*(DEBLOBBED)*/`` and
+``/*(DEBLOBBED)*/`` in the proper firmware directory.
See Documentation/sound/cards/multisound.sh for important information
about this driver. Note that it has been discontinued, but the
@@ -1595,8 +1595,8 @@
isapnp
ISA PnP detection - 0 = disable, 1 = enable (default)
-The driver requires firmware files ``turtlebeach/pndspini.bin`` and
-``turtlebeach/pndsperm.bin`` in the proper firmware directory.
+The driver requires firmware files ``/*(DEBLOBBED)*/`` and
+``/*(DEBLOBBED)*/`` in the proper firmware directory.
Module snd-mtpav
----------------
@@ -1882,7 +1882,7 @@
This module supports multiple cards.
The driver requires the firmware loader support on kernel.
-You need to install the firmware file ``riptide.hex`` to the standard
+You need to install the firmware file ``/*(DEBLOBBED)*/`` to the standard
firmware path (e.g. /lib/firmware).
Module snd-rme32
@@ -2113,7 +2113,7 @@
sleep_tries
How many times to try sleeping during a wait (default: 50)
ospath
- Pathname to processed ICS2115 OS firmware (default:wavefront.os);
+ Pathname to processed ICS2115 OS firmware (default:/*(DEBLOBBED)*/);
The path name of the ISC2115 OS firmware. In the recent
version, it's handled via firmware loader framework, so it
must be installed in the proper path, typically,
@@ -2127,7 +2127,7 @@
This module supports multiple cards and ISA PnP.
-Note: the firmware file ``wavefront.os`` was located in the earlier
+Note: the firmware file ``/*(DEBLOBBED)*/`` was located in the earlier
version in /etc. Now it's loaded via firmware loader, and
must be in the proper firmware path, such as /lib/firmware.
Copy (or symlink) the file appropriately if you get an error
diff -ruN linux-5.11.5/Documentation/sound/cards/multisound.sh linux-5.11.5-gnu/Documentation/sound/cards/multisound.sh
--- linux-5.11.5/Documentation/sound/cards/multisound.sh 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/sound/cards/multisound.sh 2021-03-09 21:53:50.000000000 +0100
@@ -42,20 +42,7 @@
# snd-msnd-pinnacle - Base audio/mixer support for Pinnacle and Fiji cards
#
#
-# Important Notes - Read Before Using
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# The firmware files are not included (may change in future). You
-# must obtain these images from Turtle Beach (they are included in
-# the MultiSound Development Kits), and place them in /etc/sound for
-# example, and give the full paths in the Linux configuration. If
-# you are compiling in support for the MultiSound driver rather than
-# using it as a module, these firmware files must be accessible
-# during kernel compilation.
-#
-# Please note these files must be binary files, not assembler. See
-# the section later in this document for instructions to obtain these
-# files.
+# /*(DEBLOBBED)*/
#
#
# Configuring Card Resources
@@ -280,66 +267,7 @@
# joystick_io I/O port of joystick
#
#
-# Obtaining and Creating Firmware Files
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# For the Classic/Tahiti/Monterey
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# Download to /tmp and unzip the following file from Turtle Beach:
-#
-# ftp://ftp.voyetra.com/pub/tbs/msndcl/msndvkit.zip
-#
-# When unzipped, unzip the file named MsndFiles.zip. Then copy the
-# following firmware files to /etc/sound (note the file renaming):
-#
-# cp DSPCODE/MSNDINIT.BIN /etc/sound/msndinit.bin
-# cp DSPCODE/MSNDPERM.REB /etc/sound/msndperm.bin
-#
-# When configuring the Linux kernel, specify /etc/sound/msndinit.bin and
-# /etc/sound/msndperm.bin for the two firmware files (Linux kernel
-# versions older than 2.2 do not ask for firmware paths, and are
-# hardcoded to /etc/sound).
-#
-# If you are compiling the driver into the kernel, these files must
-# be accessible during compilation, but will not be needed later.
-# The files must remain, however, if the driver is used as a module.
-#
-#
-# For the Pinnacle/Fiji
-# ~~~~~~~~~~~~~~~~~~~~~
-#
-# Download to /tmp and unzip the following file from Turtle Beach (be
-# sure to use the entire URL; some have had trouble navigating to the
-# URL):
-#
-# ftp://ftp.voyetra.com/pub/tbs/pinn/pnddk100.zip
-#
-# Unpack this shell archive, and run make in the created directory
-# (you need a C compiler and flex to build the utilities). This
-# should give you the executables conv, pinnaclecfg and setdigital.
-# conv is only used temporarily here to create the firmware files,
-# while pinnaclecfg is used to configure the Pinnacle or Fiji card in
-# non-PnP mode, and setdigital can be used to set the S/PDIF input on
-# the mixer (pinnaclecfg and setdigital should be copied to a
-# convenient place, possibly run during system initialization).
-#
-# To generating the firmware files with the `conv' program, we create
-# the binary firmware files by doing the following conversion
-# (assuming the archive unpacked into a directory named PINNDDK):
-#
-# ./conv < PINNDDK/dspcode/pndspini.asm > /etc/sound/pndspini.bin
-# ./conv < PINNDDK/dspcode/pndsperm.asm > /etc/sound/pndsperm.bin
-#
-# The conv (and conv.l) program is not needed after conversion and can
-# be safely deleted. Then, when configuring the Linux kernel, specify
-# /etc/sound/pndspini.bin and /etc/sound/pndsperm.bin for the two
-# firmware files (Linux kernel versions older than 2.2 do not ask for
-# firmware paths, and are hardcoded to /etc/sound).
-#
-# If you are compiling the driver into the kernel, these files must
-# be accessible during compilation, but will not be needed later.
-# The files must remain, however, if the driver is used as a module.
+# /*(DEBLOBBED)*/
#
#
# Using Digital I/O with the S/PDIF Port
diff -ruN linux-5.11.5/Documentation/x86/microcode.rst linux-5.11.5-gnu/Documentation/x86/microcode.rst
--- linux-5.11.5/Documentation/x86/microcode.rst 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/Documentation/x86/microcode.rst 2021-03-09 21:53:50.000000000 +0100
@@ -31,9 +31,9 @@
The microcode files in cpio name space are:
on Intel:
- kernel/x86/microcode/GenuineIntel.bin
+ /*(DEBLOBBED)*/
on AMD :
- kernel/x86/microcode/AuthenticAMD.bin
+ /*(DEBLOBBED)*/
During BSP (BootStrapping Processor) boot (pre-SMP), the kernel
scans the microcode file in the initrd. If microcode matching the
@@ -69,7 +69,7 @@
mkdir -p $DSTDIR
if [ -d /lib/firmware/amd-ucode ]; then
- cat /lib/firmware/amd-ucode/microcode_amd*.bin > $DSTDIR/AuthenticAMD.bin
+ cat /lib/firmware//*(DEBLOBBED)*/ > $DSTDIR//*(DEBLOBBED)*/
fi
if [ -d /lib/firmware/intel-ucode ]; then
@@ -119,20 +119,12 @@
Here's an example::
- CONFIG_EXTRA_FIRMWARE="intel-ucode/06-3a-09 amd-ucode/microcode_amd_fam15h.bin"
+ CONFIG_EXTRA_FIRMWARE="/*(DEBLOBBED)*/ /*(DEBLOBBED)*/"
CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware"
This basically means, you have the following tree structure locally::
- /lib/firmware/
- |-- amd-ucode
- ...
- | |-- microcode_amd_fam15h.bin
- ...
- |-- intel-ucode
- ...
- | |-- 06-3a-09
- ...
+ /*(DEBLOBBED)*/
so that the build system can find those files and integrate them into
the final kernel image. The early loader finds them and applies them.
diff -ruN linux-5.11.5/drivers/atm/ambassador.c linux-5.11.5-gnu/drivers/atm/ambassador.c
--- linux-5.11.5/drivers/atm/ambassador.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/atm/ambassador.c 2021-03-09 21:53:50.000000000 +0100
@@ -1913,7 +1913,7 @@
const char *errmsg = NULL;
int res;
- res = request_ihex_firmware(&fw, "atmsar11.fw", &dev->pci_dev->dev);
+ res = reject_firmware(&fw, "/*(DEBLOBBED)*/", &dev->pci_dev->dev);
if (res) {
PRINTK (KERN_ERR, "Cannot load microcode data");
return res;
@@ -2340,7 +2340,7 @@
MODULE_AUTHOR(maintainer_string);
MODULE_DESCRIPTION(description_string);
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("atmsar11.fw");
+/*(DEBLOBBED)*/
module_param(debug, ushort, 0644);
module_param(cmds, uint, 0);
module_param(txs, uint, 0);
diff -ruN linux-5.11.5/drivers/atm/fore200e.c linux-5.11.5-gnu/drivers/atm/fore200e.c
--- linux-5.11.5/drivers/atm/fore200e.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/atm/fore200e.c 2021-03-09 21:53:50.000000000 +0100
@@ -2383,11 +2383,7 @@
while (fore200e_monitor_getc(fore200e) >= 0);
}
-#ifdef __LITTLE_ENDIAN
-#define FW_EXT ".bin"
-#else
-#define FW_EXT "_ecd.bin2"
-#endif
+/*(DEBLOBBED)*/
static int fore200e_load_and_start_fw(struct fore200e *fore200e)
{
@@ -2399,8 +2395,8 @@
char buf[48];
int err;
- sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT);
- if ((err = request_firmware(&firmware, buf, fore200e->dev)) < 0) {
+ /*(DEBLOBBED)*/
+ if ((err = reject_firmware(&firmware, buf, fore200e->dev)) < 0) {
printk(FORE200E "problem loading firmware image %s\n", fore200e->bus->model_name);
return err;
}
@@ -3010,11 +3006,11 @@
MODULE_LICENSE("GPL");
#ifdef CONFIG_PCI
#ifdef __LITTLE_ENDIAN__
-MODULE_FIRMWARE("pca200e.bin");
+/*(DEBLOBBED)*/
#else
-MODULE_FIRMWARE("pca200e_ecd.bin2");
+/*(DEBLOBBED)*/
#endif
#endif /* CONFIG_PCI */
#ifdef CONFIG_SBUS
-MODULE_FIRMWARE("sba200e_ecd.bin2");
+/*(DEBLOBBED)*/
#endif
diff -ruN linux-5.11.5/drivers/atm/.gitignore linux-5.11.5-gnu/drivers/atm/.gitignore
--- linux-5.11.5/drivers/atm/.gitignore 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/atm/.gitignore 2021-03-09 21:53:50.000000000 +0100
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
fore200e_mkfirm
fore200e_pca_fw.c
-pca200e.bin
-pca200e_ecd.bin2
+/*(DEBLOBBED)*/
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/atm/solos-pci.c linux-5.11.5-gnu/drivers/atm/solos-pci.c
--- linux-5.11.5/drivers/atm/solos-pci.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/atm/solos-pci.c 2021-03-09 21:53:50.000000000 +0100
@@ -143,9 +143,7 @@
MODULE_DESCRIPTION("Solos PCI driver");
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("solos-FPGA.bin");
-MODULE_FIRMWARE("solos-Firmware.bin");
-MODULE_FIRMWARE("solos-db-FPGA.bin");
+/*(DEBLOBBED)*/
MODULE_PARM_DESC(reset, "Reset Solos chips on startup");
MODULE_PARM_DESC(atmdebug, "Print ATM data");
MODULE_PARM_DESC(firmware_upgrade, "Initiate Solos firmware upgrade");
@@ -631,14 +629,14 @@
switch (chip) {
case 0:
- fw_name = "solos-FPGA.bin";
+ fw_name = "/*(DEBLOBBED)*/";
if (card->atmel_flash)
blocksize = ATMEL_FPGA_BLOCK;
else
blocksize = SPI_FLASH_BLOCK;
break;
case 1:
- fw_name = "solos-Firmware.bin";
+ fw_name = "/*(DEBLOBBED)*/";
if (card->atmel_flash)
blocksize = ATMEL_SOLOS_BLOCK;
else
@@ -646,7 +644,7 @@
break;
case 2:
if (card->fpga_version > LEGACY_BUFFERS){
- fw_name = "solos-db-FPGA.bin";
+ fw_name = "/*(DEBLOBBED)*/";
if (card->atmel_flash)
blocksize = ATMEL_FPGA_BLOCK;
else
@@ -659,7 +657,7 @@
break;
case 3:
if (card->fpga_version > LEGACY_BUFFERS){
- fw_name = "solos-Firmware.bin";
+ fw_name = "/*(DEBLOBBED)*/";
if (card->atmel_flash)
blocksize = ATMEL_SOLOS_BLOCK;
else
@@ -674,7 +672,7 @@
return -ENODEV;
}
- if (request_firmware(&fw, fw_name, &card->dev->dev))
+ if (reject_firmware(&fw, fw_name, &card->dev->dev))
return -ENOENT;
dev_info(&card->dev->dev, "Flash upgrade starting\n");
diff -ruN linux-5.11.5/drivers/base/firmware_loader/fallback.c linux-5.11.5-gnu/drivers/base/firmware_loader/fallback.c
--- linux-5.11.5/drivers/base/firmware_loader/fallback.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/base/firmware_loader/fallback.c 2021-03-09 21:53:50.000000000 +0100
@@ -554,7 +554,7 @@
long timeout;
int ret;
- timeout = firmware_loading_timeout();
+ timeout = is_nonfree_firmware(name) ? 1 : firmware_loading_timeout();
if (opt_flags & FW_OPT_NOWAIT) {
timeout = usermodehelper_read_lock_wait(timeout);
if (!timeout) {
diff -ruN linux-5.11.5/drivers/base/firmware_loader/Kconfig linux-5.11.5-gnu/drivers/base/firmware_loader/Kconfig
--- linux-5.11.5/drivers/base/firmware_loader/Kconfig 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/base/firmware_loader/Kconfig 2021-03-09 21:53:50.000000000 +0100
@@ -49,9 +49,9 @@
the directory specified by the EXTRA_FIRMWARE_DIR option, which is
/lib/firmware by default.
- For example, you might set CONFIG_EXTRA_FIRMWARE="usb8388.bin", copy
- the usb8388.bin file into /lib/firmware, and build the kernel. Then
- any request_firmware("usb8388.bin") will be satisfied internally
+ For example, you might set CONFIG_EXTRA_FIRMWARE="whatever.bin", copy
+ the whatever.bin file into /lib/firmware, and build the kernel. Then
+ any request_firmware("whatever.bin") will be satisfied internally
inside the kernel without ever looking at your filesystem at runtime.
WARNING: If you include additional firmware files into your binary
diff -ruN linux-5.11.5/drivers/bluetooth/ath3k.c linux-5.11.5-gnu/drivers/bluetooth/ath3k.c
--- linux-5.11.5/drivers/bluetooth/ath3k.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/ath3k.c 2021-03-09 21:53:50.000000000 +0100
@@ -17,7 +17,7 @@
#include <net/bluetooth/bluetooth.h>
#define VERSION "1.0"
-#define ATH3K_FIRMWARE "ath3k-1.fw"
+#define ATH3K_FIRMWARE "/*(DEBLOBBED)*/"
#define ATH3K_DNLOAD 0x01
#define ATH3K_GETSTATE 0x05
@@ -378,10 +378,10 @@
return ret;
}
- snprintf(filename, ATH3K_NAME_LEN, "ar3k/AthrBT_0x%08x.dfu",
+ snprintf(filename, ATH3K_NAME_LEN, "/*(DEBLOBBED)*/",
le32_to_cpu(fw_version.rom_version));
- ret = request_firmware(&firmware, filename, &udev->dev);
+ ret = reject_firmware(&firmware, filename, &udev->dev);
if (ret < 0) {
BT_ERR("Patch file not found %s", filename);
return ret;
@@ -441,10 +441,10 @@
break;
}
- snprintf(filename, ATH3K_NAME_LEN, "ar3k/ramps_0x%08x_%d%s",
+ snprintf(filename, ATH3K_NAME_LEN, "/*(DEBLOBBED)*/",
le32_to_cpu(fw_version.rom_version), clk_value, ".dfu");
- ret = request_firmware(&firmware, filename, &udev->dev);
+ ret = reject_firmware(&firmware, filename, &udev->dev);
if (ret < 0) {
BT_ERR("Configuration file not found %s", filename);
return ret;
@@ -502,7 +502,7 @@
return 0;
}
- ret = request_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev);
+ ret = reject_firmware(&firmware, ATH3K_FIRMWARE, &udev->dev);
if (ret < 0) {
if (ret == -ENOENT)
BT_ERR("Firmware file \"%s\" not found",
@@ -538,4 +538,4 @@
MODULE_DESCRIPTION("Atheros AR30xx firmware driver");
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE(ATH3K_FIRMWARE);
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/bluetooth/bcm203x.c linux-5.11.5-gnu/drivers/bluetooth/bcm203x.c
--- linux-5.11.5/drivers/bluetooth/bcm203x.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/bcm203x.c 2021-03-09 21:53:50.000000000 +0100
@@ -173,7 +173,7 @@
if (!data->urb)
return -ENOMEM;
- if (request_firmware(&firmware, "BCM2033-MD.hex", &udev->dev) < 0) {
+ if (reject_firmware(&firmware, "/*(DEBLOBBED)*/", &udev->dev) < 0) {
BT_ERR("Mini driver request failed");
usb_free_urb(data->urb);
return -EIO;
@@ -198,7 +198,7 @@
release_firmware(firmware);
- if (request_firmware(&firmware, "BCM2033-FW.bin", &udev->dev) < 0) {
+ if (reject_firmware(&firmware, "/*(DEBLOBBED)*/", &udev->dev) < 0) {
BT_ERR("Firmware request failed");
usb_free_urb(data->urb);
kfree(data->buffer);
@@ -263,5 +263,4 @@
MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("BCM2033-MD.hex");
-MODULE_FIRMWARE("BCM2033-FW.bin");
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/bluetooth/bfusb.c linux-5.11.5-gnu/drivers/bluetooth/bfusb.c
--- linux-5.11.5/drivers/bluetooth/bfusb.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/bfusb.c 2021-03-09 21:53:50.000000000 +0100
@@ -636,7 +636,7 @@
skb_queue_head_init(&data->pending_q);
skb_queue_head_init(&data->completed_q);
- if (request_firmware(&firmware, "bfubase.frm", &udev->dev) < 0) {
+ if (reject_firmware(&firmware, "/*(DEBLOBBED)*/", &udev->dev) < 0) {
BT_ERR("Firmware request failed");
goto done;
}
@@ -719,4 +719,4 @@
MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("bfubase.frm");
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/bluetooth/bt3c_cs.c linux-5.11.5-gnu/drivers/bluetooth/bt3c_cs.c
--- linux-5.11.5/drivers/bluetooth/bt3c_cs.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/bt3c_cs.c 2021-03-09 21:53:50.000000000 +0100
@@ -60,7 +60,7 @@
MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("Bluetooth driver for the 3Com Bluetooth PCMCIA card");
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("BT3CPCC.bin");
+/*(DEBLOBBED)*/
@@ -568,7 +568,7 @@
hdev->send = bt3c_hci_send_frame;
/* Load firmware */
- err = request_firmware(&firmware, "BT3CPCC.bin", &info->p_dev->dev);
+ err = reject_firmware(&firmware, "/*(DEBLOBBED)*/", &info->p_dev->dev);
if (err < 0) {
BT_ERR("Firmware request failed");
goto error;
diff -ruN linux-5.11.5/drivers/bluetooth/btbcm.c linux-5.11.5-gnu/drivers/bluetooth/btbcm.c
--- linux-5.11.5/drivers/bluetooth/btbcm.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/btbcm.c 2021-03-09 21:53:50.000000000 +0100
@@ -497,16 +497,16 @@
if (hw_name) {
snprintf(fw_name[fw_name_count], BCM_FW_NAME_LEN,
- "brcm/%s%s.hcd", hw_name, postfix);
+ "/*(DEBLOBBED)*/", hw_name, postfix);
fw_name_count++;
}
snprintf(fw_name[fw_name_count], BCM_FW_NAME_LEN,
- "brcm/BCM%s.hcd", postfix);
+ "/*(DEBLOBBED)*/", postfix);
fw_name_count++;
for (i = 0; i < fw_name_count; i++) {
- err = firmware_request_nowarn(&fw, fw_name[i], &hdev->dev);
+ err = firmware_reject_nowarn(&fw, fw_name[i], &hdev->dev);
if (err == 0) {
bt_dev_info(hdev, "%s '%s' Patch",
hw_name ? hw_name : "BCM", fw_name[i]);
diff -ruN linux-5.11.5/drivers/bluetooth/btintel.c linux-5.11.5-gnu/drivers/bluetooth/btintel.c
--- linux-5.11.5/drivers/bluetooth/btintel.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/btintel.c 2021-03-09 21:53:50.000000000 +0100
@@ -262,7 +262,7 @@
const u8 *fw_ptr;
int err;
- err = request_firmware_direct(&fw, ddc_name, &hdev->dev);
+ err = reject_firmware_direct(&fw, ddc_name, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to load Intel DDC file %s (%d)",
ddc_name, err);
@@ -1103,7 +1103,4 @@
MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("intel/ibt-11-5.sfi");
-MODULE_FIRMWARE("intel/ibt-11-5.ddc");
-MODULE_FIRMWARE("intel/ibt-12-16.sfi");
-MODULE_FIRMWARE("intel/ibt-12-16.ddc");
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/bluetooth/btmrvl_sdio.c linux-5.11.5-gnu/drivers/bluetooth/btmrvl_sdio.c
--- linux-5.11.5/drivers/bluetooth/btmrvl_sdio.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/btmrvl_sdio.c 2021-03-09 21:53:50.000000000 +0100
@@ -239,8 +239,8 @@
};
static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
- .helper = "mrvl/sd8688_helper.bin",
- .firmware = "mrvl/sd8688.bin",
+ .helper = "/*(DEBLOBBED)*/",
+ .firmware = "/*(DEBLOBBED)*/",
.reg = &btmrvl_reg_8688,
.support_pscan_win_report = false,
.sd_blksz_fw_dl = 64,
@@ -249,7 +249,7 @@
static const struct btmrvl_sdio_device btmrvl_sdio_sd8787 = {
.helper = NULL,
- .firmware = "mrvl/sd8787_uapsta.bin",
+ .firmware = "/*(DEBLOBBED)*/",
.reg = &btmrvl_reg_87xx,
.support_pscan_win_report = false,
.sd_blksz_fw_dl = 256,
@@ -258,7 +258,7 @@
static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = {
.helper = NULL,
- .firmware = "mrvl/sd8797_uapsta.bin",
+ .firmware = "/*(DEBLOBBED)*/",
.reg = &btmrvl_reg_87xx,
.support_pscan_win_report = false,
.sd_blksz_fw_dl = 256,
@@ -267,7 +267,7 @@
static const struct btmrvl_sdio_device btmrvl_sdio_sd8887 = {
.helper = NULL,
- .firmware = "mrvl/sd8887_uapsta.bin",
+ .firmware = "/*(DEBLOBBED)*/",
.reg = &btmrvl_reg_8887,
.support_pscan_win_report = true,
.sd_blksz_fw_dl = 256,
@@ -276,7 +276,7 @@
static const struct btmrvl_sdio_device btmrvl_sdio_sd8897 = {
.helper = NULL,
- .firmware = "mrvl/sd8897_uapsta.bin",
+ .firmware = "/*(DEBLOBBED)*/",
.reg = &btmrvl_reg_8897,
.support_pscan_win_report = true,
.sd_blksz_fw_dl = 256,
@@ -285,7 +285,7 @@
static const struct btmrvl_sdio_device btmrvl_sdio_sd8977 = {
.helper = NULL,
- .firmware = "mrvl/sdsd8977_combo_v2.bin",
+ .firmware = "/*(DEBLOBBED)*/",
.reg = &btmrvl_reg_89xx,
.support_pscan_win_report = true,
.sd_blksz_fw_dl = 256,
@@ -294,7 +294,7 @@
static const struct btmrvl_sdio_device btmrvl_sdio_sd8987 = {
.helper = NULL,
- .firmware = "mrvl/sd8987_uapsta.bin",
+ .firmware = "/*(DEBLOBBED)*/",
.reg = &btmrvl_reg_89xx,
.support_pscan_win_report = true,
.sd_blksz_fw_dl = 256,
@@ -303,7 +303,7 @@
static const struct btmrvl_sdio_device btmrvl_sdio_sd8997 = {
.helper = NULL,
- .firmware = "mrvl/sdsd8997_combo_v4.bin",
+ .firmware = "/*(DEBLOBBED)*/",
.reg = &btmrvl_reg_89xx,
.support_pscan_win_report = true,
.sd_blksz_fw_dl = 256,
@@ -480,10 +480,10 @@
u8 *helperbuf;
u32 tx_len;
- ret = request_firmware(&fw_helper, card->helper,
+ ret = reject_firmware(&fw_helper, card->helper,
&card->func->dev);
if ((ret < 0) || !fw_helper) {
- BT_ERR("request_firmware(helper) failed, error code = %d",
+ BT_ERR("reject_firmware(helper) failed, error code = %d",
ret);
ret = -ENOENT;
goto done;
@@ -580,10 +580,10 @@
u16 len, blksz_dl = card->sd_blksz_fw_dl;
int txlen = 0, tx_blocks = 0, count = 0;
- ret = request_firmware(&fw_firmware, card->firmware,
+ ret = reject_firmware(&fw_firmware, card->firmware,
&card->func->dev);
if ((ret < 0) || !fw_firmware) {
- BT_ERR("request_firmware(firmware) failed, error code = %d",
+ BT_ERR("reject_firmware(firmware) failed, error code = %d",
ret);
ret = -ENOENT;
goto done;
@@ -1786,12 +1786,4 @@
MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL v2");
-MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
-MODULE_FIRMWARE("mrvl/sd8688.bin");
-MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
-MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
-MODULE_FIRMWARE("mrvl/sd8887_uapsta.bin");
-MODULE_FIRMWARE("mrvl/sd8897_uapsta.bin");
-MODULE_FIRMWARE("mrvl/sdsd8977_combo_v2.bin");
-MODULE_FIRMWARE("mrvl/sd8987_uapsta.bin");
-MODULE_FIRMWARE("mrvl/sdsd8997_combo_v4.bin");
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/bluetooth/btmtksdio.c linux-5.11.5-gnu/drivers/bluetooth/btmtksdio.c
--- linux-5.11.5/drivers/bluetooth/btmtksdio.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/btmtksdio.c 2021-03-09 21:53:50.000000000 +0100
@@ -31,8 +31,8 @@
#define VERSION "0.1"
-#define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin"
-#define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin"
+#define FIRMWARE_MT7663 "/*(DEBLOBBED)*/"
+#define FIRMWARE_MT7668 "/*(DEBLOBBED)*/"
#define MTKBTSDIO_AUTOSUSPEND_DELAY 8000
@@ -687,7 +687,7 @@
int err, dlen;
u8 flag, param;
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to load firmware file (%d)", err);
return err;
@@ -1112,5 +1112,4 @@
MODULE_DESCRIPTION("MediaTek Bluetooth SDIO driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE(FIRMWARE_MT7663);
-MODULE_FIRMWARE(FIRMWARE_MT7668);
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/bluetooth/btmtkuart.c linux-5.11.5-gnu/drivers/bluetooth/btmtkuart.c
--- linux-5.11.5/drivers/bluetooth/btmtkuart.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/btmtkuart.c 2021-03-09 21:53:50.000000000 +0100
@@ -31,9 +31,9 @@
#define VERSION "0.2"
-#define FIRMWARE_MT7622 "mediatek/mt7622pr2h.bin"
-#define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin"
-#define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin"
+#define FIRMWARE_MT7622 "/*(DEBLOBBED)*/"
+#define FIRMWARE_MT7663 "/*(DEBLOBBED)*/"
+#define FIRMWARE_MT7668 "/*(DEBLOBBED)*/"
#define MTK_STP_TLR_SIZE 2
@@ -245,7 +245,7 @@
int err, dlen;
u8 flag;
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to load firmware file (%d)", err);
return err;
@@ -1130,6 +1130,4 @@
MODULE_DESCRIPTION("MediaTek Bluetooth Serial driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE(FIRMWARE_MT7622);
-MODULE_FIRMWARE(FIRMWARE_MT7663);
-MODULE_FIRMWARE(FIRMWARE_MT7668);
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/bluetooth/btqca.c linux-5.11.5-gnu/drivers/bluetooth/btqca.c
--- linux-5.11.5/drivers/bluetooth/btqca.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/btqca.c 2021-03-09 21:53:50.000000000 +0100
@@ -348,7 +348,7 @@
bt_dev_info(hdev, "QCA Downloading %s", config->fwname);
- ret = request_firmware(&fw, config->fwname, &hdev->dev);
+ ret = reject_firmware(&fw, config->fwname, &hdev->dev);
if (ret) {
bt_dev_err(hdev, "QCA Failed to request file: %s (%d)",
config->fwname, ret);
@@ -464,15 +464,15 @@
rom_ver = ((soc_ver & 0x00000f00) >> 0x04) |
(soc_ver & 0x0000000f);
snprintf(config.fwname, sizeof(config.fwname),
- "qca/crbtfw%02x.tlv", rom_ver);
+ "/*(DEBLOBBED)*/", rom_ver);
} else if (soc_type == QCA_QCA6390) {
rom_ver = ((soc_ver & 0x00000f00) >> 0x04) |
(soc_ver & 0x0000000f);
snprintf(config.fwname, sizeof(config.fwname),
- "qca/htbtfw%02x.tlv", rom_ver);
+ "/*(DEBLOBBED)*/", rom_ver);
} else {
snprintf(config.fwname, sizeof(config.fwname),
- "qca/rampatch_%08x.bin", soc_ver);
+ "/*(DEBLOBBED)*/", soc_ver);
}
err = qca_download_firmware(hdev, &config, soc_type);
@@ -488,22 +488,22 @@
config.type = TLV_TYPE_NVM;
if (firmware_name)
snprintf(config.fwname, sizeof(config.fwname),
- "qca/%s", firmware_name);
+ "/*(DEBLOBBED)*/", firmware_name);
else if (qca_is_wcn399x(soc_type)) {
if (ver.soc_id == QCA_WCN3991_SOC_ID) {
snprintf(config.fwname, sizeof(config.fwname),
- "qca/crnv%02xu.bin", rom_ver);
+ "/*(DEBLOBBED)*/", rom_ver);
} else {
snprintf(config.fwname, sizeof(config.fwname),
- "qca/crnv%02x.bin", rom_ver);
+ "/*(DEBLOBBED)*/", rom_ver);
}
}
else if (soc_type == QCA_QCA6390)
snprintf(config.fwname, sizeof(config.fwname),
- "qca/htnv%02x.bin", rom_ver);
+ "/*(DEBLOBBED)*/", rom_ver);
else
snprintf(config.fwname, sizeof(config.fwname),
- "qca/nvm_%08x.bin", soc_ver);
+ "/*(DEBLOBBED)*/", soc_ver);
err = qca_download_firmware(hdev, &config, soc_type);
if (err < 0) {
diff -ruN linux-5.11.5/drivers/bluetooth/btrtl.c linux-5.11.5-gnu/drivers/bluetooth/btrtl.c
--- linux-5.11.5/drivers/bluetooth/btrtl.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/btrtl.c 2021-03-09 21:53:50.000000000 +0100
@@ -65,91 +65,91 @@
{ IC_INFO(RTL_ROM_LMP_8723A, 0xb, 0x6, HCI_USB),
.config_needed = false,
.has_rom_version = false,
- .fw_name = "rtl_bt/rtl8723a_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = NULL },
/* 8723BS */
{ IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_UART),
.config_needed = true,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8723bs_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8723bs_config" },
/* 8723B */
{ IC_INFO(RTL_ROM_LMP_8723B, 0xb, 0x6, HCI_USB),
.config_needed = false,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8723b_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8723b_config" },
/* 8723D */
{ IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_USB),
.config_needed = true,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8723d_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8723d_config" },
/* 8723DS */
{ IC_INFO(RTL_ROM_LMP_8723B, 0xd, 0x8, HCI_UART),
.config_needed = true,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8723ds_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8723ds_config" },
/* 8821A */
{ IC_INFO(RTL_ROM_LMP_8821A, 0xa, 0x6, HCI_USB),
.config_needed = false,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8821a_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8821a_config" },
/* 8821C */
{ IC_INFO(RTL_ROM_LMP_8821A, 0xc, 0x8, HCI_USB),
.config_needed = false,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8821c_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8821c_config" },
/* 8761A */
{ IC_INFO(RTL_ROM_LMP_8761A, 0xa, 0x6, HCI_USB),
.config_needed = false,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8761a_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8761a_config" },
/* 8761B */
{ IC_INFO(RTL_ROM_LMP_8761A, 0xb, 0xa, HCI_USB),
.config_needed = false,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8761b_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8761b_config" },
/* 8822C with UART interface */
{ IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0xa, HCI_UART),
.config_needed = true,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8822cs_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8822cs_config" },
/* 8822C with USB interface */
{ IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0xa, HCI_USB),
.config_needed = false,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8822cu_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8822cu_config" },
/* 8822B */
{ IC_INFO(RTL_ROM_LMP_8822B, 0xb, 0x7, HCI_USB),
.config_needed = true,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8822b_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8822b_config" },
/* 8852A */
{ IC_INFO(RTL_ROM_LMP_8852A, 0xa, 0xb, HCI_USB),
.config_needed = false,
.has_rom_version = true,
- .fw_name = "rtl_bt/rtl8852au_fw.bin",
+ .fw_name = "/*(DEBLOBBED)*/",
.cfg_name = "rtl_bt/rtl8852au_config" },
};
@@ -460,7 +460,7 @@
int ret;
rtl_dev_info(hdev, "loading %s", name);
- ret = request_firmware(&fw, name, &hdev->dev);
+ ret = reject_firmware(&fw, name, &hdev->dev);
if (ret < 0)
return ret;
ret = fw->size;
@@ -641,10 +641,10 @@
if (btrtl_dev->ic_info->cfg_name) {
if (postfix) {
- snprintf(cfg_name, sizeof(cfg_name), "%s-%s.bin",
+ snprintf(cfg_name, sizeof(cfg_name), "/*(DEBLOBBED)*/",
btrtl_dev->ic_info->cfg_name, postfix);
} else {
- snprintf(cfg_name, sizeof(cfg_name), "%s.bin",
+ snprintf(cfg_name, sizeof(cfg_name), "/*(DEBLOBBED)*/",
btrtl_dev->ic_info->cfg_name);
}
btrtl_dev->cfg_len = rtl_load_file(hdev, cfg_name,
@@ -851,18 +851,4 @@
MODULE_DESCRIPTION("Bluetooth support for Realtek devices ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
-MODULE_FIRMWARE("rtl_bt/rtl8723a_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8723b_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8723b_config.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8723bs_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8723bs_config.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8723ds_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8723ds_config.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8761a_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8761a_config.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8821a_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8821a_config.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8822b_config.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8852au_fw.bin");
-MODULE_FIRMWARE("rtl_bt/rtl8852au_config.bin");
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/bluetooth/btusb.c linux-5.11.5-gnu/drivers/bluetooth/btusb.c
--- linux-5.11.5/drivers/bluetooth/btusb.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/btusb.c 2021-03-09 21:53:50.000000000 +0100
@@ -1931,12 +1931,12 @@
int ret;
snprintf(fwname, sizeof(fwname),
- "intel/ibt-hw-%x.%x.%x-fw-%x.%x.%x.%x.%x.bseq",
+ "/*(DEBLOBBED)*/",
ver->hw_platform, ver->hw_variant, ver->hw_revision,
ver->fw_variant, ver->fw_revision, ver->fw_build_num,
ver->fw_build_ww, ver->fw_build_yy);
- ret = request_firmware(&fw, fwname, &hdev->dev);
+ ret = reject_firmware(&fw, fwname, &hdev->dev);
if (ret < 0) {
if (ret == -EINVAL) {
bt_dev_err(hdev, "Intel firmware file request failed (%d)",
@@ -1950,9 +1950,9 @@
/* If the correct firmware patch file is not found, use the
* default firmware patch file instead
*/
- snprintf(fwname, sizeof(fwname), "intel/ibt-hw-%x.%x.bseq",
+ snprintf(fwname, sizeof(fwname), "/*(DEBLOBBED)*/",
ver->hw_platform, ver->hw_variant);
- if (request_firmware(&fw, fwname, &hdev->dev) < 0) {
+ if (reject_firmware(&fw, fwname, &hdev->dev) < 0) {
bt_dev_err(hdev, "failed to open default fw file: %s",
fwname);
return NULL;
@@ -2534,7 +2534,7 @@
}
btusb_setup_intel_newgen_get_fw_name(ver, fwname, sizeof(fwname), "sfi");
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to load Intel firmware file (%d)", err);
return err;
@@ -2728,7 +2728,7 @@
return -EINVAL;
}
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to load Intel firmware file (%d)", err);
return err;
@@ -3119,8 +3119,8 @@
return 0;
}
-#define FIRMWARE_MT7663 "mediatek/mt7663pr2h.bin"
-#define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin"
+#define FIRMWARE_MT7663 "/*(DEBLOBBED)*/"
+#define FIRMWARE_MT7668 "/*(DEBLOBBED)*/"
#define HCI_WMT_MAX_EVENT_SIZE 64
@@ -3422,7 +3422,7 @@
int err, dlen;
u8 flag, param;
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to load firmware file (%d)", err);
return err;
@@ -3692,8 +3692,7 @@
return 0;
}
-MODULE_FIRMWARE(FIRMWARE_MT7663);
-MODULE_FIRMWARE(FIRMWARE_MT7668);
+/*(DEBLOBBED)*/
#ifdef CONFIG_PM
/* Configure an out-of-band gpio as wake-up pin, if specified in device tree */
@@ -3958,9 +3957,9 @@
ver_rom = le32_to_cpu(ver->rom_version);
ver_patch = le32_to_cpu(ver->patch_version);
- snprintf(fwname, sizeof(fwname), "qca/rampatch_usb_%08x.bin", ver_rom);
+ snprintf(fwname, sizeof(fwname), "/*(DEBLOBBED)*/", ver_rom);
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err) {
bt_dev_err(hdev, "failed to request rampatch file: %s (%d)",
fwname, err);
@@ -4007,15 +4006,15 @@
int err;
if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
- snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
+ snprintf(fwname, sizeof(fwname), "/*(DEBLOBBED)*/",
le32_to_cpu(ver->rom_version),
le16_to_cpu(ver->board_id));
} else {
- snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
+ snprintf(fwname, sizeof(fwname), "/*(DEBLOBBED)*/",
le32_to_cpu(ver->rom_version));
}
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err) {
bt_dev_err(hdev, "failed to request NVM file: %s (%d)",
fwname, err);
diff -ruN linux-5.11.5/drivers/bluetooth/hci_ag6xx.c linux-5.11.5-gnu/drivers/bluetooth/hci_ag6xx.c
--- linux-5.11.5/drivers/bluetooth/hci_ag6xx.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/hci_ag6xx.c 2021-03-09 21:53:50.000000000 +0100
@@ -190,10 +190,10 @@
return -EINVAL;
}
- snprintf(fwname, sizeof(fwname), "intel/ibt-hw-%x.%x.bddata",
+ snprintf(fwname, sizeof(fwname), "/*(DEBLOBBED)*/",
ver.hw_platform, ver.hw_variant);
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to open Intel bddata file: %s (%d)",
fwname, err);
@@ -226,12 +226,12 @@
}
snprintf(fwname, sizeof(fwname),
- "intel/ibt-hw-%x.%x.%x-fw-%x.%x.%x.%x.%x.pbn",
+ "/*(DEBLOBBED)*/",
ver.hw_platform, ver.hw_variant, ver.hw_revision,
ver.fw_variant, ver.fw_revision, ver.fw_build_num,
ver.fw_build_ww, ver.fw_build_yy);
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to open Intel patch file: %s(%d)",
fwname, err);
diff -ruN linux-5.11.5/drivers/bluetooth/hci_intel.c linux-5.11.5-gnu/drivers/bluetooth/hci_intel.c
--- linux-5.11.5/drivers/bluetooth/hci_intel.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/hci_intel.c 2021-03-09 21:53:50.000000000 +0100
@@ -686,11 +686,11 @@
switch (ver.hw_variant) {
case 0x0b: /* SfP */
case 0x0c: /* WsP */
- snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.sfi",
+ snprintf(fwname, sizeof(fwname), "/*(DEBLOBBED)*/",
ver.hw_variant, le16_to_cpu(params.dev_revid));
break;
case 0x12: /* ThP */
- snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u-%u.sfi",
+ snprintf(fwname, sizeof(fwname), "/*(DEBLOBBED)*/",
ver.hw_variant, ver.hw_revision, ver.fw_revision);
break;
default:
@@ -699,7 +699,7 @@
return -EINVAL;
}
- err = request_firmware(&fw, fwname, &hdev->dev);
+ err = reject_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to load Intel firmware file (%d)",
err);
diff -ruN linux-5.11.5/drivers/bluetooth/hci_ll.c linux-5.11.5-gnu/drivers/bluetooth/hci_ll.c
--- linux-5.11.5/drivers/bluetooth/hci_ll.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/hci_ll.c 2021-03-09 21:53:50.000000000 +0100
@@ -534,10 +534,10 @@
maj_ver |= 0x0008;
snprintf(bts_scr_name, sizeof(bts_scr_name),
- "ti-connectivity/TIInit_%d.%d.%d.bts",
+ "/*(DEBLOBBED)*/",
chip, maj_ver, min_ver);
- err = request_firmware(&fw, bts_scr_name, &lldev->serdev->dev);
+ err = reject_firmware(&fw, bts_scr_name, &lldev->serdev->dev);
if (err || !fw->data || !fw->size) {
bt_dev_err(lldev->hu.hdev, "request_firmware failed(errno %d) for %s",
err, bts_scr_name);
diff -ruN linux-5.11.5/drivers/bluetooth/hci_mrvl.c linux-5.11.5-gnu/drivers/bluetooth/hci_mrvl.c
--- linux-5.11.5/drivers/bluetooth/hci_mrvl.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/hci_mrvl.c 2021-03-09 21:53:50.000000000 +0100
@@ -275,7 +275,7 @@
const u8 *fw_ptr, *fw_max;
int err;
- err = request_firmware(&fw, name, &hdev->dev);
+ err = reject_firmware(&fw, name, &hdev->dev);
if (err < 0) {
bt_dev_err(hdev, "Failed to load firmware file %s", name);
return err;
@@ -357,7 +357,7 @@
hci_uart_set_flow_control(hu, true);
- err = mrvl_load_firmware(hu->hdev, "mrvl/helper_uart_3000000.bin");
+ err = mrvl_load_firmware(hu->hdev, "/*(DEBLOBBED)*/");
if (err) {
bt_dev_err(hu->hdev, "Unable to download firmware helper");
return -EINVAL;
@@ -373,7 +373,7 @@
hci_uart_set_flow_control(hu, false);
- err = mrvl_load_firmware(hu->hdev, "mrvl/uart8897_bt.bin");
+ err = mrvl_load_firmware(hu->hdev, "/*(DEBLOBBED)*/");
if (err)
return err;
diff -ruN linux-5.11.5/drivers/bluetooth/hci_nokia.c linux-5.11.5-gnu/drivers/bluetooth/hci_nokia.c
--- linux-5.11.5/drivers/bluetooth/hci_nokia.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bluetooth/hci_nokia.c 2021-03-09 21:53:50.000000000 +0100
@@ -32,8 +32,8 @@
#define NOKIA_ID_BCM2048 0x04
#define NOKIA_ID_TI1271 0x31
-#define FIRMWARE_BCM2048 "nokia/bcmfw.bin"
-#define FIRMWARE_TI1271 "nokia/ti1273.bin"
+#define FIRMWARE_BCM2048 "/*(DEBLOBBED)*/"
+#define FIRMWARE_TI1271 "/*(DEBLOBBED)*/"
#define HCI_NOKIA_NEG_PKT 0x06
#define HCI_NOKIA_ALIVE_PKT 0x07
@@ -342,7 +342,7 @@
return -ENODEV;
}
- err = request_firmware(&fw, fwname, dev);
+ err = reject_firmware(&fw, fwname, dev);
if (err < 0) {
dev_err(dev, "%s: Failed to load Nokia firmware file (%d)",
hu->hdev->name, err);
diff -ruN linux-5.11.5/drivers/bus/mhi/core/boot.c linux-5.11.5-gnu/drivers/bus/mhi/core/boot.c
--- linux-5.11.5/drivers/bus/mhi/core/boot.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bus/mhi/core/boot.c 2021-03-09 21:53:50.000000000 +0100
@@ -431,7 +431,7 @@
goto error_fw_load;
}
- ret = request_firmware(&firmware, fw_name, dev);
+ ret = reject_firmware(&firmware, fw_name, dev);
if (ret) {
dev_err(dev, "Error loading firmware: %d\n", ret);
goto error_fw_load;
diff -ruN linux-5.11.5/drivers/bus/mhi/pci_generic.c linux-5.11.5-gnu/drivers/bus/mhi/pci_generic.c
--- linux-5.11.5/drivers/bus/mhi/pci_generic.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/bus/mhi/pci_generic.c 2021-03-09 21:53:50.000000000 +0100
@@ -133,8 +133,8 @@
static const struct mhi_pci_dev_info mhi_qcom_sdx55_info = {
.name = "qcom-sdx55m",
- .fw = "qcom/sdx55m/sbl1.mbn",
- .edl = "qcom/sdx55m/edl.mbn",
+ .fw = "/*(DEBLOBBED)*/",
+ .edl = "/*(DEBLOBBED)*/",
.config = &modem_qcom_v1_mhiv_config,
.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
.dma_data_width = 32
diff -ruN linux-5.11.5/drivers/crypto/cavium/cpt/cptpf_main.c linux-5.11.5-gnu/drivers/crypto/cavium/cpt/cptpf_main.c
--- linux-5.11.5/drivers/crypto/cavium/cpt/cptpf_main.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/cavium/cpt/cptpf_main.c 2021-03-09 21:53:50.000000000 +0100
@@ -257,7 +257,7 @@
struct microcode *mcode;
int j, ret = 0;
- ret = request_firmware(&fw_entry, fw, dev);
+ ret = reject_firmware(&fw_entry, fw, dev);
if (ret)
return ret;
@@ -320,12 +320,12 @@
int ret = 0;
struct device *dev = &cpt->pdev->dev;
- ret = cpt_ucode_load_fw(cpt, "cpt8x-mc-ae.out", true);
+ ret = cpt_ucode_load_fw(cpt, "/*(DEBLOBBED)*/", true);
if (ret) {
dev_err(dev, "ae:cpt_ucode_load failed with ret: %d\n", ret);
return ret;
}
- ret = cpt_ucode_load_fw(cpt, "cpt8x-mc-se.out", false);
+ ret = cpt_ucode_load_fw(cpt, "/*(DEBLOBBED)*/", false);
if (ret) {
dev_err(dev, "se:cpt_ucode_load failed with ret: %d\n", ret);
return ret;
diff -ruN linux-5.11.5/drivers/crypto/cavium/nitrox/nitrox_main.c linux-5.11.5-gnu/drivers/crypto/cavium/nitrox/nitrox_main.c
--- linux-5.11.5/drivers/crypto/cavium/nitrox/nitrox_main.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/cavium/nitrox/nitrox_main.c 2021-03-09 21:53:50.000000000 +0100
@@ -25,9 +25,9 @@
#define CNN55XX_MAX_UCODE_SIZE (CNN55XX_UCD_BLOCK_SIZE * 2)
#define FW_DIR "cavium/"
/* SE microcode */
-#define SE_FW FW_DIR "cnn55xx_se.fw"
+#define SE_FW FW_DIR "/*(DEBLOBBED)*/"
/* AE microcode */
-#define AE_FW FW_DIR "cnn55xx_ae.fw"
+#define AE_FW FW_DIR "/*(DEBLOBBED)*/"
static const char nitrox_driver_name[] = "CNN55XX";
@@ -123,7 +123,7 @@
fw_name = SE_FW;
dev_info(DEV(ndev), "Loading firmware \"%s\"\n", fw_name);
- ret = request_firmware(&fw, fw_name, DEV(ndev));
+ ret = reject_firmware(&fw, fw_name, DEV(ndev));
if (ret < 0) {
dev_err(DEV(ndev), "failed to get firmware %s\n", fw_name);
return ret;
@@ -174,7 +174,7 @@
fw_name = AE_FW;
dev_info(DEV(ndev), "Loading firmware \"%s\"\n", fw_name);
- ret = request_firmware(&fw, fw_name, DEV(ndev));
+ ret = reject_firmware(&fw, fw_name, DEV(ndev));
if (ret < 0) {
dev_err(DEV(ndev), "failed to get firmware %s\n", fw_name);
return ret;
@@ -582,4 +582,4 @@
MODULE_DESCRIPTION("Cavium CNN55XX PF Driver" DRIVER_VERSION " ");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRIVER_VERSION);
-MODULE_FIRMWARE(SE_FW);
+/*(DEBLOBBED)*/
diff -ruN linux-5.11.5/drivers/crypto/ccp/sev-dev.c linux-5.11.5-gnu/drivers/crypto/ccp/sev-dev.c
--- linux-5.11.5/drivers/crypto/ccp/sev-dev.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/ccp/sev-dev.c 2021-03-09 21:53:50.000000000 +0100
@@ -28,7 +28,7 @@
#include "sev-dev.h"
#define DEVICE_NAME "sev"
-#define SEV_FW_FILE "amd/sev.fw"
+#define SEV_FW_FILE "/*(DEBLOBBED)*/"
#define SEV_FW_NAME_SIZE 64
static DEFINE_MUTEX(sev_cmd_mutex);
@@ -501,9 +501,9 @@
*
* Fall-back to using generic name: sev.fw
*/
- if ((firmware_request_nowarn(firmware, fw_name_specific, dev) >= 0) ||
- (firmware_request_nowarn(firmware, fw_name_subset, dev) >= 0) ||
- (firmware_request_nowarn(firmware, SEV_FW_FILE, dev) >= 0))
+ if ((firmware_reject_nowarn(firmware, fw_name_specific, dev) >= 0) ||
+ (firmware_reject_nowarn(firmware, fw_name_subset, dev) >= 0) ||
+ (firmware_reject_nowarn(firmware, SEV_FW_FILE, dev) >= 0))
return 0;
return -ENOENT;
diff -ruN linux-5.11.5/drivers/crypto/inside-secure/safexcel.c linux-5.11.5-gnu/drivers/crypto/inside-secure/safexcel.c
--- linux-5.11.5/drivers/crypto/inside-secure/safexcel.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/inside-secure/safexcel.c 2021-03-09 21:53:50.000000000 +0100
@@ -404,7 +404,7 @@
static int eip197_load_firmwares(struct safexcel_crypto_priv *priv)
{
- const char *fw_name[] = {"ifpp.bin", "ipue.bin"};
+ const char *fw_name[] = {"/*(DEBLOBBED)*/", "/*(DEBLOBBED)*/"};
const struct firmware *fw[FW_NB];
char fw_path[37], *dir = NULL;
int i, j, ret = 0, pe;
@@ -420,8 +420,8 @@
retry_fw:
for (i = 0; i < FW_NB; i++) {
- snprintf(fw_path, 37, "inside-secure/%s/%s", dir, fw_name[i]);
- ret = firmware_request_nowarn(&fw[i], fw_path, priv->dev);
+ snprintf(fw_path, 37, "/*(DEBLOBBED)*/", dir, fw_name[i]);
+ ret = firmware_reject_nowarn(&fw[i], fw_path, priv->dev);
if (ret) {
if (minifw || priv->version != EIP197B_MRVL)
goto release_fw;
@@ -429,7 +429,7 @@
/* Fallback to the old firmware location for the
* EIP197b.
*/
- ret = firmware_request_nowarn(&fw[i], fw_name[i],
+ ret = firmware_reject_nowarn(&fw[i], fw_name[i],
priv->dev);
if (ret)
goto release_fw;
diff -ruN linux-5.11.5/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c linux-5.11.5-gnu/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c
--- linux-5.11.5/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c 2021-03-09 21:53:50.000000000 +0100
@@ -412,7 +412,7 @@
INIT_LIST_HEAD(&tar_arch->ucodes);
/* Load tar archive */
- ret = request_firmware(&tar_arch->fw, tar_filename, dev);
+ ret = reject_firmware(&tar_arch->fw, tar_filename, dev);
if (ret)
goto release_tar_arch;
@@ -889,7 +889,7 @@
int ret;
set_ucode_filename(ucode, ucode_filename);
- ret = request_firmware(&fw, ucode->filename, dev);
+ ret = reject_firmware(&fw, ucode->filename, dev);
if (ret)
return ret;
diff -ruN linux-5.11.5/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h linux-5.11.5-gnu/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h
--- linux-5.11.5/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h 2021-03-09 21:53:50.000000000 +0100
@@ -25,7 +25,7 @@
#define OTX_CPT_MAX_ETYPES_PER_GRP 1
/* Default tar archive file names */
-#define OTX_CPT_UCODE_TAR_FILE_NAME "cpt8x-mc.tar"
+#define OTX_CPT_UCODE_TAR_FILE_NAME "/*(DEBLOBBED)*/"
/* CPT ucode alignment */
#define OTX_CPT_UCODE_ALIGNMENT 128
diff -ruN linux-5.11.5/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h linux-5.11.5-gnu/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h
--- linux-5.11.5/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h 2021-03-09 21:53:50.000000000 +0100
@@ -63,11 +63,11 @@
#define ADF_4XXX_MAILBOX_BASE_OFFSET (0x600970)
/* Firmware Binaries */
-#define ADF_4XXX_FW "qat_4xxx.bin"
-#define ADF_4XXX_MMP "qat_4xxx_mmp.bin"
-#define ADF_4XXX_SYM_OBJ "qat_4xxx_sym.bin"
-#define ADF_4XXX_ASYM_OBJ "qat_4xxx_asym.bin"
-#define ADF_4XXX_ADMIN_OBJ "qat_4xxx_admin.bin"
+#define ADF_4XXX_FW "/*(DEBLOBBED)*/"
+#define ADF_4XXX_MMP "/*(DEBLOBBED)*/"
+#define ADF_4XXX_SYM_OBJ "/*(DEBLOBBED)*/"
+#define ADF_4XXX_ASYM_OBJ "/*(DEBLOBBED)*/"
+#define ADF_4XXX_ADMIN_OBJ "/*(DEBLOBBED)*/"
/* qat_4xxx fuse bits are different from old GENs, redefine them */
enum icp_qat_4xxx_slice_mask {
diff -ruN linux-5.11.5/drivers/crypto/qat/qat_4xxx/adf_drv.c linux-5.11.5-gnu/drivers/crypto/qat/qat_4xxx/adf_drv.c
--- linux-5.11.5/drivers/crypto/qat/qat_4xxx/adf_drv.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/qat/qat_4xxx/adf_drv.c 2021-03-09 21:53:50.000000000 +0100
@@ -316,8 +316,7 @@
MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Intel");
-MODULE_FIRMWARE(ADF_4XXX_FW);
-MODULE_FIRMWARE(ADF_4XXX_MMP);
+/*(DEBLOBBED)*/
MODULE_DESCRIPTION("Intel(R) QuickAssist Technology");
MODULE_VERSION(ADF_DRV_VERSION);
MODULE_SOFTDEP("pre: crypto-intel_qat");
diff -ruN linux-5.11.5/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h linux-5.11.5-gnu/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h
--- linux-5.11.5/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h 2021-03-09 21:53:50.000000000 +0100
@@ -36,8 +36,8 @@
#define ADF_C3XXX_AE2FUNC_MAP_GRP_B_NUM_REGS 6
/* Firmware Binary */
-#define ADF_C3XXX_FW "qat_c3xxx.bin"
-#define ADF_C3XXX_MMP "qat_c3xxx_mmp.bin"
+#define ADF_C3XXX_FW "/*(DEBLOBBED)*/"
+#define ADF_C3XXX_MMP "/*(DEBLOBBED)*/"
void adf_init_hw_data_c3xxx(struct adf_hw_device_data *hw_data);
void adf_clean_hw_data_c3xxx(struct adf_hw_device_data *hw_data);
diff -ruN linux-5.11.5/drivers/crypto/qat/qat_c3xxx/adf_drv.c linux-5.11.5-gnu/drivers/crypto/qat/qat_c3xxx/adf_drv.c
--- linux-5.11.5/drivers/crypto/qat/qat_c3xxx/adf_drv.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/qat/qat_c3xxx/adf_drv.c 2021-03-09 21:53:50.000000000 +0100
@@ -276,7 +276,6 @@
MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Intel");
-MODULE_FIRMWARE(ADF_C3XXX_FW);
-MODULE_FIRMWARE(ADF_C3XXX_MMP);
+/*(DEBLOBBED)*/
MODULE_DESCRIPTION("Intel(R) QuickAssist Technology");
MODULE_VERSION(ADF_DRV_VERSION);
diff -ruN linux-5.11.5/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h linux-5.11.5-gnu/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h
--- linux-5.11.5/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h 2021-03-09 21:53:50.000000000 +0100
@@ -37,8 +37,8 @@
#define ADF_C62X_AE2FUNC_MAP_GRP_B_NUM_REGS 10
/* Firmware Binary */
-#define ADF_C62X_FW "qat_c62x.bin"
-#define ADF_C62X_MMP "qat_c62x_mmp.bin"
+#define ADF_C62X_FW "/*(DEBLOBBED)*/"
+#define ADF_C62X_MMP "/*(DEBLOBBED)*/"
void adf_init_hw_data_c62x(struct adf_hw_device_data *hw_data);
void adf_clean_hw_data_c62x(struct adf_hw_device_data *hw_data);
diff -ruN linux-5.11.5/drivers/crypto/qat/qat_c62x/adf_drv.c linux-5.11.5-gnu/drivers/crypto/qat/qat_c62x/adf_drv.c
--- linux-5.11.5/drivers/crypto/qat/qat_c62x/adf_drv.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/qat/qat_c62x/adf_drv.c 2021-03-09 21:53:50.000000000 +0100
@@ -276,7 +276,6 @@
MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Intel");
-MODULE_FIRMWARE(ADF_C62X_FW);
-MODULE_FIRMWARE(ADF_C62X_MMP);
+/*(DEBLOBBED)*/
MODULE_DESCRIPTION("Intel(R) QuickAssist Technology");
MODULE_VERSION(ADF_DRV_VERSION);
diff -ruN linux-5.11.5/drivers/crypto/qat/qat_common/adf_accel_engine.c linux-5.11.5-gnu/drivers/crypto/qat/qat_common/adf_accel_engine.c
--- linux-5.11.5/drivers/crypto/qat/qat_common/adf_accel_engine.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/qat/qat_common/adf_accel_engine.c 2021-03-09 21:53:50.000000000 +0100
@@ -60,13 +60,13 @@
if (!hw_device->fw_name)
return 0;
- if (request_firmware(&loader_data->mmp_fw, hw_device->fw_mmp_name,
+ if (reject_firmware(&loader_data->mmp_fw, hw_device->fw_mmp_name,
&accel_dev->accel_pci_dev.pci_dev->dev)) {
dev_err(&GET_DEV(accel_dev), "Failed to load MMP firmware %s\n",
hw_device->fw_mmp_name);
return -EFAULT;
}
- if (request_firmware(&loader_data->uof_fw, hw_device->fw_name,
+ if (reject_firmware(&loader_data->uof_fw, hw_device->fw_name,
&accel_dev->accel_pci_dev.pci_dev->dev)) {
dev_err(&GET_DEV(accel_dev), "Failed to load UOF firmware %s\n",
hw_device->fw_name);
diff -ruN linux-5.11.5/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h linux-5.11.5-gnu/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
--- linux-5.11.5/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h 2021-03-09 21:53:50.000000000 +0100
@@ -42,8 +42,8 @@
#define ADF_DH895XCC_AE2FUNC_MAP_GRP_B_NUM_REGS 12
/* FW names */
-#define ADF_DH895XCC_FW "qat_895xcc.bin"
-#define ADF_DH895XCC_MMP "qat_895xcc_mmp.bin"
+#define ADF_DH895XCC_FW "/*(DEBLOBBED)*/"
+#define ADF_DH895XCC_MMP "/*(DEBLOBBED)*/"
void adf_init_hw_data_dh895xcc(struct adf_hw_device_data *hw_data);
void adf_clean_hw_data_dh895xcc(struct adf_hw_device_data *hw_data);
diff -ruN linux-5.11.5/drivers/crypto/qat/qat_dh895xcc/adf_drv.c linux-5.11.5-gnu/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
--- linux-5.11.5/drivers/crypto/qat/qat_dh895xcc/adf_drv.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/crypto/qat/qat_dh895xcc/adf_drv.c 2021-03-09 21:53:50.000000000 +0100
@@ -276,7 +276,6 @@
MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Intel");
-MODULE_FIRMWARE(ADF_DH895XCC_FW);
-MODULE_FIRMWARE(ADF_DH895XCC_MMP);
+/*(DEBLOBBED)*/
MODULE_DESCRIPTION("Intel(R) QuickAssist Technology");
MODULE_VERSION(ADF_DRV_VERSION);
diff -ruN linux-5.11.5/drivers/dma/imx-sdma.c linux-5.11.5-gnu/drivers/dma/imx-sdma.c
--- linux-5.11.5/drivers/dma/imx-sdma.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/dma/imx-sdma.c 2021-03-09 21:53:50.000000000 +0100
@@ -1828,7 +1828,7 @@
{
int ret;
- ret = request_firmware_nowait(THIS_MODULE,
+ ret = reject_firmware_nowait(THIS_MODULE,
FW_ACTION_HOTPLUG, fw_name, sdma->dev,
GFP_KERNEL, sdma, sdma_load_firmware);
@@ -2185,9 +2185,9 @@
MODULE_AUTHOR("Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>");
MODULE_DESCRIPTION("i.MX SDMA driver");
#if IS_ENABLED(CONFIG_SOC_IMX6Q)
-MODULE_FIRMWARE("imx/sdma/sdma-imx6q.bin");
+/*(DEBLOBBED)*/
#endif
#if IS_ENABLED(CONFIG_SOC_IMX7D)
-MODULE_FIRMWARE("imx/sdma/sdma-imx7d.bin");
+/*(DEBLOBBED)*/
#endif
MODULE_LICENSE("GPL");
diff -ruN linux-5.11.5/drivers/dma/st_fdma.c linux-5.11.5-gnu/drivers/dma/st_fdma.c
--- linux-5.11.5/drivers/dma/st_fdma.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/dma/st_fdma.c 2021-03-09 21:53:50.000000000 +0100
@@ -713,7 +713,7 @@
const struct st_fdma_driverdata *drvdata,
struct st_fdma_dev *fdev)
{
- snprintf(fdev->fw_name, FW_NAME_SIZE, "fdma_%s_%d.elf",
+ snprintf(fdev->fw_name, FW_NAME_SIZE, "/*(DEBLOBBED)*/",
drvdata->name, drvdata->id);
return of_property_read_u32(pdev->dev.of_node, "dma-channels",
diff -ruN linux-5.11.5/drivers/fsi/fsi-master-ast-cf.c linux-5.11.5-gnu/drivers/fsi/fsi-master-ast-cf.c
--- linux-5.11.5/drivers/fsi/fsi-master-ast-cf.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/fsi/fsi-master-ast-cf.c 2021-03-09 21:53:50.000000000 +0100
@@ -25,7 +25,7 @@
#include "fsi-master.h"
#include "cf-fsi-fw.h"
-#define FW_FILE_NAME "cf-fsi-fw.bin"
+#define FW_FILE_NAME "/*(DEBLOBBED)*/"
/* Common SCU based coprocessor control registers */
#define SCU_COPRO_CTRL 0x100
@@ -835,7 +835,7 @@
int rc;
/* Get the binary */
- rc = request_firmware(&fw, FW_FILE_NAME, master->dev);
+ rc = reject_firmware(&fw, FW_FILE_NAME, master->dev);
if (rc) {
dev_err(
master->dev, "Error %d to load firmware '%s' !\n",
diff -ruN linux-5.11.5/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c linux-5.11.5-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
--- linux-5.11.5/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c 2021-03-09 21:53:50.000000000 +0100
@@ -250,16 +250,16 @@
if (!adev->pm.fw) {
switch (adev->asic_type) {
case CHIP_TAHITI:
- strcpy(fw_name, "radeon/tahiti_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
break;
case CHIP_PITCAIRN:
if ((adev->pdev->revision == 0x81) &&
((adev->pdev->device == 0x6810) ||
(adev->pdev->device == 0x6811))) {
info->is_kicker = true;
- strcpy(fw_name, "radeon/pitcairn_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else {
- strcpy(fw_name, "radeon/pitcairn_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
break;
case CHIP_VERDE:
@@ -273,9 +273,9 @@
((adev->pdev->device == 0x6823) ||
(adev->pdev->device == 0x682b)))) {
info->is_kicker = true;
- strcpy(fw_name, "radeon/verde_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else {
- strcpy(fw_name, "radeon/verde_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
break;
case CHIP_OLAND:
@@ -287,9 +287,9 @@
((adev->pdev->revision == 0x83) &&
(adev->pdev->device == 0x6610))) {
info->is_kicker = true;
- strcpy(fw_name, "radeon/oland_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else {
- strcpy(fw_name, "radeon/oland_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
break;
case CHIP_HAINAN:
@@ -301,13 +301,13 @@
(adev->pdev->device == 0x6665) ||
(adev->pdev->device == 0x6667)))) {
info->is_kicker = true;
- strcpy(fw_name, "radeon/hainan_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else if ((adev->pdev->revision == 0xc3) &&
(adev->pdev->device == 0x6665)) {
info->is_kicker = true;
- strcpy(fw_name, "radeon/banks_k_2_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else {
- strcpy(fw_name, "radeon/hainan_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
break;
case CHIP_BONAIRE:
@@ -315,17 +315,17 @@
(adev->pdev->revision == 0x81) ||
(adev->pdev->device == 0x665f)) {
info->is_kicker = true;
- strcpy(fw_name, "amdgpu/bonaire_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else {
- strcpy(fw_name, "amdgpu/bonaire_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
break;
case CHIP_HAWAII:
if (adev->pdev->revision == 0x80) {
info->is_kicker = true;
- strcpy(fw_name, "amdgpu/hawaii_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else {
- strcpy(fw_name, "amdgpu/hawaii_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
break;
case CHIP_TOPAZ:
@@ -335,83 +335,83 @@
((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0xD1)) ||
((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0xD3))) {
info->is_kicker = true;
- strcpy(fw_name, "amdgpu/topaz_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else
- strcpy(fw_name, "amdgpu/topaz_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
break;
case CHIP_TONGA:
if (((adev->pdev->device == 0x6939) && (adev->pdev->revision == 0xf1)) ||
((adev->pdev->device == 0x6938) && (adev->pdev->revision == 0xf1))) {
info->is_kicker = true;
- strcpy(fw_name, "amdgpu/tonga_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else
- strcpy(fw_name, "amdgpu/tonga_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
break;
case CHIP_FIJI:
- strcpy(fw_name, "amdgpu/fiji_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
break;
case CHIP_POLARIS11:
if (type == CGS_UCODE_ID_SMU) {
if (ASICID_IS_P21(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
- strcpy(fw_name, "amdgpu/polaris11_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else if (ASICID_IS_P31(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
- strcpy(fw_name, "amdgpu/polaris11_k2_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else {
- strcpy(fw_name, "amdgpu/polaris11_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
} else if (type == CGS_UCODE_ID_SMU_SK) {
- strcpy(fw_name, "amdgpu/polaris11_smc_sk.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
break;
case CHIP_POLARIS10:
if (type == CGS_UCODE_ID_SMU) {
if (ASICID_IS_P20(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
- strcpy(fw_name, "amdgpu/polaris10_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else if (ASICID_IS_P30(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
- strcpy(fw_name, "amdgpu/polaris10_k2_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else {
- strcpy(fw_name, "amdgpu/polaris10_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
} else if (type == CGS_UCODE_ID_SMU_SK) {
- strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
break;
case CHIP_POLARIS12:
if (ASICID_IS_P23(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
- strcpy(fw_name, "amdgpu/polaris12_k_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
} else {
- strcpy(fw_name, "amdgpu/polaris12_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
}
break;
case CHIP_VEGAM:
- strcpy(fw_name, "amdgpu/vegam_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
break;
case CHIP_VEGA10:
if ((adev->pdev->device == 0x687f) &&
((adev->pdev->revision == 0xc0) ||
(adev->pdev->revision == 0xc1) ||
(adev->pdev->revision == 0xc3)))
- strcpy(fw_name, "amdgpu/vega10_acg_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
else
- strcpy(fw_name, "amdgpu/vega10_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
break;
case CHIP_VEGA12:
- strcpy(fw_name, "amdgpu/vega12_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
break;
case CHIP_VEGA20:
- strcpy(fw_name, "amdgpu/vega20_smc.bin");
+ strcpy(fw_name, "/*(DEBLOBBED)*/");
break;
default:
DRM_ERROR("SMC firmware not supported\n");
return -EINVAL;
}
- err = request_firmware(&adev->pm.fw, fw_name, adev->dev);
+ err = reject_firmware(&adev->pm.fw, fw_name, adev->dev);
if (err) {
DRM_ERROR("Failed to request firmware\n");
return err;
diff -ruN linux-5.11.5/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c linux-5.11.5-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
--- linux-5.11.5/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2021-03-09 21:53:50.000000000 +0100
@@ -70,17 +70,7 @@
#include <drm/task_barrier.h>
#include <linux/pm_runtime.h>
-MODULE_FIRMWARE("amdgpu/vega10_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/vega12_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/raven2_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/arcturus_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
-MODULE_FIRMWARE("amdgpu/vangogh_gpu_info.bin");
+/*(DEBLOBBED)*/
#define AMDGPU_RESUME_MS 2000
@@ -1197,7 +1187,7 @@
if (adev->asic_type == CHIP_FIJI) {
int err;
uint32_t fw_ver;
- err = request_firmware(&adev->pm.fw, "amdgpu/fiji_smc.bin", adev->dev);
+ err = reject_firmware(&adev->pm.fw, "/*(DEBLOBBED)*/", adev->dev);
/* force vPost if error occured */
if (err)
return true;
@@ -1840,8 +1830,8 @@
break;
}
- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);
- err = request_firmware(&adev->firmware.gpu_info_fw, fw_name, adev->dev);
+ snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name);
+ err = reject_firmware(&adev->firmware.gpu_info_fw, fw_name, adev->dev);
if (err) {
dev_err(adev->dev,
"Failed to load gpu_info firmware \"%s\"\n",
diff -ruN linux-5.11.5/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c linux-5.11.5-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
--- linux-5.11.5/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 2021-03-09 21:53:50.000000000 +0100
@@ -2442,8 +2442,8 @@
return -EINVAL;
}
- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_asd.bin", chip_name);
- err = request_firmware(&adev->psp.asd_fw, fw_name, adev->dev);
+ snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name);
+ err = reject_firmware(&adev->psp.asd_fw, fw_name, adev->dev);
if (err)
goto out;
@@ -2478,8 +2478,8 @@
return -EINVAL;
}
- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_toc.bin", chip_name);
- err = request_firmware(&adev->psp.toc_fw, fw_name, adev->dev);
+ snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name);
+ err = reject_firmware(&adev->psp.toc_fw, fw_name, adev->dev);
if (err)
goto out;
@@ -2517,8 +2517,8 @@
return -EINVAL;
}
- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name);
- err = request_firmware(&adev->psp.sos_fw, fw_name, adev->dev);
+ snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name);
+ err = reject_firmware(&adev->psp.sos_fw, fw_name, adev->dev);
if (err)
goto out;
@@ -2651,8 +2651,8 @@
return -EINVAL;
}
- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);
- err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
+ snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name);
+ err = reject_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
if (err)
goto out;
@@ -2746,8 +2746,8 @@
return -EBUSY;
}
- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s", buf);
- ret = request_firmware(&usbc_pd_fw, fw_name, adev->dev);
+ snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", buf);
+ ret = reject_firmware(&usbc_pd_fw, fw_name, adev->dev);
if (ret)
goto fail;
diff -ruN linux-5.11.5/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c linux-5.11.5-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
--- linux-5.11.5/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2021-03-09 11:21:23.000000000 +0100
+++ linux-5.11.5-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 2021-03-09 21:53:50.000000000 +0100
@@ -55,30 +55,30 @@
/* Firmware Names */
#ifdef CONFIG_DRM_AMDGPU_SI
-#define FIRMWARE_TAHITI "amdgpu/tahiti_uvd.bin"
-#define FIRMWARE_VERDE "amdgpu/verde_uvd.bin"
-#define FIRMWARE_PITCAIRN "amdgpu/pitcairn_uvd.bin"
-#define FIRMWARE_OLAND "amdgpu/oland_uvd.bin"
+#define FIRMWARE_TAHITI "/*(DEBLOBBED)*/"
+#define FIRMWARE_VERDE "/*(DEBLOBBED)*/"
+#define FIRMWARE_PITCAIRN "/*(DEBLOBBED)*/"
+#define FIRMWARE_OLAND "/*(DEBLOBBED)*/"
#endif
#ifdef CONFIG_DRM_AMDGPU_CIK
-#define FIRMWARE_BONAIRE "amdgpu/bonaire_uvd.bin"
-#define FIRMWARE_KABINI "amdgpu/kabini_uvd.bin"
-#define FIRMWARE_KAVERI "amdgpu/kaveri_uvd.bin"
-#define FIRMWARE_HAWAII "amdgpu/hawaii_uvd.bin"
-#define FIRMWARE_MULLINS "amdgpu/mullins_uvd.bin"
-#endif
-#define FIRMWARE_TONGA "amdgpu/tonga_uvd.bin"
-#define FIRMWARE_CARRIZO "amdgpu/carrizo_uvd.bin"
-#define FIRMWARE_FIJI "amdgpu/fiji_uvd.bin"
-#define FIRMWARE_STONEY "amdgpu/stoney_uvd.bin"
-#define FIRMWARE_POLARIS10 "amdgpu/polaris10_uvd.bin"
-#define FIRMWARE_POLARIS11 "amdgpu/polaris11_uvd.bin"
-#define FIRMWARE_POLARIS12 "amdgpu/polaris12_uvd.bin"
-#define FIRMWARE_VEGAM "amdgpu/vegam_uvd.bin"
-
-#define FIRMWARE_VEGA10 "amdgpu/vega10_uvd.bin"
-#define FIRMWARE_VEGA12 "amdgpu/vega12_uvd.bin"
-#define FIRMWARE_VEGA20 "amdgpu/vega20_uvd.bin"
+#define FIRMWARE_BONAIRE "/*(DEBLOBBED)*/"
+#define FIRMWARE_KABINI "/*(DEBLOBBED)*/"
+#define FIRMWARE_KAVERI "/*(DEBLOBBED)*/"
+#define FIRMWARE_HAWAII "/*(DEBLOBBED)*/"
+#define FIRMWARE_MULLINS "/*(DEBLOBBED)*/"
+#endif
+#define FIRMWARE_TONGA "/*(DEBLOBBED)*/"
+#define FIRMWARE_CARRIZO "/*(DEBLOBBED)*/"
+#define FIRMWARE_FIJI "/*(DEBLOBBED)*/"
+#define FIRMWARE_STONEY "/*(DEBLOBBED)*/"
+#define FIRMWARE_POLARIS10 "/*(DEBLOBBED)*/"
+#define FIRMWARE_POLARIS11 "/*(DEBLOBBED)*/"
+#define FIRMWARE_POLARIS12 "/*(DEBLOBBED)*/"
+#define FIRMWARE_VEGAM "/*(DEBLOBBED)*/"
+
+#define FIRMWARE_VEGA10 "/*(DEBLOBBED)*/"
+#define FIRMWARE_VEGA12 "/*(DEBLOBBED)*/"
+#define FIRMWARE_VEGA20 "/*(DEBLOBBED)*/"
/* These are common relative offsets for all asics, from uvd_7_0_offset.h, */
#define UVD_GPCOM_VCPU_CMD 0x03c3
@@ -107,30 +107,12 @@
};
#ifdef CONFIG_DRM_AMDGPU_SI
-MODULE_FIRMWARE(FIRMWARE_TAHITI);
-MODULE_FIRMWARE(FIRMWARE_VERDE);
-MODULE_FIRMWARE(FIRMWARE_PITCAIRN);
-MODULE_FIRMWARE(FIRMWARE_OLAND);