remove some patches

This commit is contained in:
wangbin 2020-01-09 15:39:17 +08:00
parent fe2c9d1f08
commit eba01bbd76
3 changed files with 4 additions and 85 deletions

View File

@ -1,25 +0,0 @@
From 94ee3042ad924d2ef8383dcde511a99660c23732 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 21 Jan 2019 07:41:41 +0000
Subject: [PATCH 1/2] brcm: Raspberry Pi 3A+ WiFi NVRAM support
The Raspberry Pi 3A+ uses the same WiFi module as the 3B+ so we
just symlink the expected NVRAM file to the 3B+ one.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt | 1 +
1 file changed, 1 insertion(+)
create mode 120000 brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
new file mode 120000
index 0000000..36b5530
--- /dev/null
+++ b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
@@ -0,0 +1 @@
+brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
\ No newline at end of file
--
2.20.1

View File

@ -1,57 +0,0 @@
From 46e39557221d5eec381c99b9002f9208f71f7128 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 21 Jan 2019 08:12:49 +0000
Subject: [PATCH 2/2] brcm: Raspberry Pi: Update ccode to X2
As per the docs [1] the X2 ccode allows the use of channels above
11 if the firmware detects appropriate other traffic on those
channels. The ALL option appears to restrict the use to the US
channel options without passively checking so X2 is overall better.
Also fix a trailling space in the config while we're at it.
[1] https://wireless.wiki.kernel.org/en/users/Drivers/brcm80211#regulatory_implementation_for_brcmsmac
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt | 4 ++--
brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
index 732c19b..38a99db 100644
--- a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+++ b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
@@ -15,7 +15,7 @@ btc_params1=0x7530
btc_params8=0x4e20
cckbw202gpo=0
cckpwroffset0=5
-ccode=ALL
+ccode=X2
# cldo_pwm is not set
deadman_to=0xffffffff
devid=0x43e2
@@ -39,7 +39,7 @@ papdmode=1
papdvalidtest=1
prodid=0x0726
propbw202gpo=0xdd
-spurconfig=0x3
+spurconfig=0x3
sromrev=11
txpwrbckof=6
vendid=0x14e4
diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
index ba94f54..8d01fcf 100644
--- a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+++ b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
@@ -16,6 +16,7 @@ btc_params8=0x4e20
cbfilttype=1
cckPwrIdxCorr=3
cckTssiDelay=150
+ccode=X2
deadman_to=481500000
devid=0x43ab
dot11agofdmhrbw202gpo=0x4442
--
2.20.1

View File

@ -1,6 +1,6 @@
%define _binaries_in_noarch_packages_terminate_build 0
%global release 2
%global release 3
%global _lib_path /usr/lib/firmware
%global _license_path /usr/share/licenses
@ -13,8 +13,6 @@ URL: http://www.kernel.org/
BuildArch: noarch
Source0: %{name}-%{version}.tar.gz
Patch1: 0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch
Patch2: 0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch
Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
Provides: iwl100-firmware = 39.31.5.1-87
@ -93,6 +91,9 @@ rm %{buildroot}/%{_lib_path}/{WHENCE,LICENCE.*,LICENSE.*}
%{_lib_path}/*
%changelog
* Thu Jan 9 2020 wangbin <wangbin224@huawei.com> - 20190815-3
- Remove some patches
* Thu Dec 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 20190815-2
- Fix upgrade problem