From 49d7841eace2c411582024d6b1dfd6809685ed01 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Thu, 20 Jul 2023 12:49:21 +0200 Subject: [PATCH] Package: update realtek wlan drivers --- .../configs/hi3516ev300_ultimate_defconfig | 2 +- .../configs/hi3518ev200_ultimate_defconfig | 2 +- .../configs/ssc337de_ultimate_defconfig | 2 +- .../configs/ssc338q_initramfs_defconfig | 2 +- .../configs/ssc338q_ultimate_defconfig | 2 +- general/package/Config.in | 4 +-- .../rtl8188fu-openipc/0001-optimization.patch | 19 -------------- .../rtl8188fu-openipc/0002-ieee80211.patch | 24 ------------------ general/package/rtl8188fu-openipc/Config.in | 7 +----- .../rtl8188fu-openipc/rtl8188fu-openipc.mk | 11 +++----- general/package/rtl8188fu/Config.in | 5 ---- general/package/rtl8188fu/rtl8188fu.mk | 25 ------------------- .../Config.in | 4 +-- .../rtl8733bu-openipc/rtl8733bu-openipc.mk | 20 +++++++++++++++ general/package/rtl8733bu/rtl8733bu.mk | 25 ------------------- 15 files changed, 33 insertions(+), 121 deletions(-) delete mode 100644 general/package/rtl8188fu-openipc/0001-optimization.patch delete mode 100644 general/package/rtl8188fu-openipc/0002-ieee80211.patch delete mode 100644 general/package/rtl8188fu/Config.in delete mode 100644 general/package/rtl8188fu/rtl8188fu.mk rename general/package/{rtl8733bu => rtl8733bu-openipc}/Config.in (50%) create mode 100644 general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk delete mode 100644 general/package/rtl8733bu/rtl8733bu.mk diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig index 43033303..af24ac20 100644 --- a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig @@ -109,7 +109,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL_8188EU=y # BR2_PACKAGE_RTL8188EU is not set -BR2_PACKAGE_RTL8188FU=y +BR2_PACKAGE_RTL8188FU_OPENIPC=y BR2_PACKAGE_MT7601U_OPENIPC=y # WIREGUARD diff --git a/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig index 6cf15eb4..27a4806c 100644 --- a/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig @@ -105,7 +105,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL_8188EU=y # BR2_PACKAGE_RTL8188EU is not set -BR2_PACKAGE_RTL8188FU=y +BR2_PACKAGE_RTL8188FU_OPENIPC=y # WIREGUARD BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y diff --git a/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig index 838e0aa7..8607ff6f 100644 --- a/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig @@ -99,7 +99,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y # BR2_PACKAGE_RTL8188EU is not set -BR2_PACKAGE_RTL8188FU=y +BR2_PACKAGE_RTL8188FU_OPENIPC=y # BR2_PACKAGE_RTL8192EU_OPENIPC is not set # WIREGUARD diff --git a/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig index f2fdc981..79657765 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_initramfs_defconfig @@ -96,7 +96,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y -BR2_PACKAGE_RTL8733BU=y +BR2_PACKAGE_RTL8733BU_OPENIPC=y # Debug # BR2_PACKAGE_HOST_GDB is not set diff --git a/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig index c8f44456..faf55d52 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_ultimate_defconfig @@ -101,7 +101,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y -BR2_PACKAGE_RTL8733BU=y +BR2_PACKAGE_RTL8733BU_OPENIPC=y # Debug # BR2_PACKAGE_HOST_GDB is not set diff --git a/general/package/Config.in b/general/package/Config.in index bbd05615..6c7fdb7b 100644 --- a/general/package/Config.in +++ b/general/package/Config.in @@ -74,11 +74,11 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/quirc-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rcjoystick/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rockchip-osdrv-rv11xx/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8188eus-openipc/Config.in" -source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8188fu/Config.in" +source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8188fu-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8188fu-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8189fs-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8192eu-openipc/Config.in" -source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8733bu/Config.in" +source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8733bu-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8812au-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtw-hostapd/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/sigmastar-osdrv-infinity6b0/Config.in" diff --git a/general/package/rtl8188fu-openipc/0001-optimization.patch b/general/package/rtl8188fu-openipc/0001-optimization.patch deleted file mode 100644 index 1da38902..00000000 --- a/general/package/rtl8188fu-openipc/0001-optimization.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Makefile 2020-09-14 06:45:19.000000000 +0300 -+++ b/Makefile 2021-11-11 21:58:55.719826716 +0300 -@@ -1,6 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) --EXTRA_CFLAGS += -O1 -+EXTRA_CFLAGS += -Os - #EXTRA_CFLAGS += -O3 - #EXTRA_CFLAGS += -Wall - #EXTRA_CFLAGS += -Wextra -@@ -51,7 +51,7 @@ - CONFIG_RTW_ADAPTIVITY_EN = disable - CONFIG_RTW_ADAPTIVITY_MODE = normal - CONFIG_SIGNAL_SCALE_MAPPING = n --CONFIG_80211W = n -+CONFIG_80211W = y - CONFIG_REDUCE_TX_CPU_LOADING = n - CONFIG_BR_EXT = y - CONFIG_ANTENNA_DIVERSITY = n diff --git a/general/package/rtl8188fu-openipc/0002-ieee80211.patch b/general/package/rtl8188fu-openipc/0002-ieee80211.patch deleted file mode 100644 index b071db2d..00000000 --- a/general/package/rtl8188fu-openipc/0002-ieee80211.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/include/ieee80211.h 2022-12-22 15:36:48.901228321 +0300 -+++ b/include/ieee80211.h 2022-12-22 15:37:11.989263430 +0300 -@@ -1390,18 +1390,18 @@ - (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ - (((Addr[5]) & 0xff) == 0xff)) - #else --extern __inline int is_multicast_mac_addr(const u8 *addr) -+static inline int is_multicast_mac_addr(const u8 *addr) - { - return ((addr[0] != 0xff) && (0x01 & addr[0])); - } - --extern __inline int is_broadcast_mac_addr(const u8 *addr) -+static inline int is_broadcast_mac_addr(const u8 *addr) - { - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); - } - --extern __inline int is_zero_mac_addr(const u8 *addr) -+static inline int is_zero_mac_addr(const u8 *addr) - { - return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ - (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); diff --git a/general/package/rtl8188fu-openipc/Config.in b/general/package/rtl8188fu-openipc/Config.in index beb56c13..03520df2 100644 --- a/general/package/rtl8188fu-openipc/Config.in +++ b/general/package/rtl8188fu-openipc/Config.in @@ -2,9 +2,4 @@ config BR2_PACKAGE_RTL8188FU_OPENIPC bool "rtl8188fu-openipc" depends on BR2_LINUX_KERNEL help - Wireless driver rtl8188fu. - - https://github.com/ulli-kroll/rtl8188fu - -comment "RTL8188FU needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL + RTL8188FU wireless driver diff --git a/general/package/rtl8188fu-openipc/rtl8188fu-openipc.mk b/general/package/rtl8188fu-openipc/rtl8188fu-openipc.mk index 194ecdaf..a0f80e79 100644 --- a/general/package/rtl8188fu-openipc/rtl8188fu-openipc.mk +++ b/general/package/rtl8188fu-openipc/rtl8188fu-openipc.mk @@ -5,21 +5,16 @@ ################################################################################ RTL8188FU_OPENIPC_SITE_METHOD = git -RTL8188FU_OPENIPC_SITE = https://github.com/ulli-kroll/rtl8188fu -RTL8188FU_OPENIPC_VERSION = e2d69b2b0c911c1b59daaf59a582ccdbb73fd97d +RTL8188FU_OPENIPC_SITE = https://github.com/openipc/realtek-wlan +RTL8188FU_OPENIPC_VERSION = $(shell git ls-remote $(RTL8188FU_OPENIPC_SITE) rtl8188fu | head -1 | cut -f1) RTL8188FU_OPENIPC_LICENSE = GPL-2.0 +RTL8188FU_OPENIPC_LICENSE_FILES = COPYING RTL8188FU_OPENIPC_MODULE_MAKE_OPTS = \ CONFIG_RTL8188FU=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) -define RTL8188FU_OPENIPC_INSTALL_FIRMWARE - $(INSTALL) -D -m 644 $(@D)/firmware/rtl8188fufw.bin \ - $(TARGET_DIR)/lib/firmware/rtlwifi/rtl8188fufw.bin -endef -RTL8188FU_OPENIPC_POST_INSTALL_TARGET_HOOKS += RTL8188FU_OPENIPC_INSTALL_FIRMWARE - $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/general/package/rtl8188fu/Config.in b/general/package/rtl8188fu/Config.in deleted file mode 100644 index dcb54519..00000000 --- a/general/package/rtl8188fu/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_RTL8188FU - bool "rtl8188fu" - depends on BR2_LINUX_KERNEL - help - RTL8188FU wireless driver diff --git a/general/package/rtl8188fu/rtl8188fu.mk b/general/package/rtl8188fu/rtl8188fu.mk deleted file mode 100644 index a4530539..00000000 --- a/general/package/rtl8188fu/rtl8188fu.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# rtl8188fu -# -################################################################################ - -ifeq ($(LOCAL_DOWNLOAD),y) -RTL8188FU_SITE_METHOD = git -RTL8188FU_SITE = https://github.com/viktorxda/realtek_wlan -RTL8188FU_VERSION = $(shell git ls-remote $(RTL8188FU_SITE) rtl8188fu | head -1 | cut -f1) -else -RTL8188FU_SITE = https://github.com/viktorxda/realtek_wlan/archive -RTL8188FU_SOURCE = rtl8188fu.tar.gz -endif - -RTL8188FU_LICENSE = GPL-2.0 -RTL8188FU_LICENSE_FILES = COPYING - -RTL8188FU_MODULE_MAKE_OPTS = \ - CONFIG_RTL8188FU=m \ - KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/general/package/rtl8733bu/Config.in b/general/package/rtl8733bu-openipc/Config.in similarity index 50% rename from general/package/rtl8733bu/Config.in rename to general/package/rtl8733bu-openipc/Config.in index 84847b05..605c0647 100644 --- a/general/package/rtl8733bu/Config.in +++ b/general/package/rtl8733bu-openipc/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_RTL8733BU - bool "rtl8733bu" +config BR2_PACKAGE_RTL8733BU_OPENIPC + bool "rtl8733bu-openipc" depends on BR2_LINUX_KERNEL help RTL8733BU wireless driver diff --git a/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk b/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk new file mode 100644 index 00000000..1eb66b8e --- /dev/null +++ b/general/package/rtl8733bu-openipc/rtl8733bu-openipc.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# rtl8733bu-openipc +# +################################################################################ + +RTL8733BU_OPENIPC_SITE_METHOD = git +RTL8733BU_OPENIPC_SITE = https://github.com/openipc/realtek-wlan +RTL8733BU_OPENIPC_VERSION = $(shell git ls-remote $(RTL8733BU_OPENIPC_SITE) rtl8733bu | head -1 | cut -f1) + +RTL8733BU_OPENIPC_LICENSE = GPL-2.0 +RTL8733BU_OPENIPC_LICENSE_FILES = COPYING + +RTL8733BU_OPENIPC_MODULE_MAKE_OPTS = \ + CONFIG_RTL8733BU=m \ + KVER=$(LINUX_VERSION_PROBED) \ + KSRC=$(LINUX_DIR) + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/general/package/rtl8733bu/rtl8733bu.mk b/general/package/rtl8733bu/rtl8733bu.mk deleted file mode 100644 index d118c806..00000000 --- a/general/package/rtl8733bu/rtl8733bu.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# rtl8733bu -# -################################################################################ - -ifeq ($(LOCAL_DOWNLOAD),y) -RTL8733BU_SITE_METHOD = git -RTL8733BU_SITE = https://github.com/viktorxda/realtek_wlan -RTL8733BU_VERSION = $(shell git ls-remote $(RTL8733BU_SITE) rtl8733bu | head -1 | cut -f1) -else -RTL8733BU_SITE = https://github.com/viktorxda/realtek_wlan/archive -RTL8733BU_SOURCE = rtl8733bu.tar.gz -endif - -RTL8733BU_LICENSE = GPL-2.0 -RTL8733BU_LICENSE_FILES = COPYING - -RTL8733BU_MODULE_MAKE_OPTS = \ - CONFIG_RTL8733BU=m \ - KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) - -$(eval $(kernel-module)) -$(eval $(generic-package))