From 811d112dd3d22475f261dfb363ef3ea0d4caca29 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 14 Mar 2022 12:11:30 +0000 Subject: [PATCH 1/3] linux: add support for Realtek RTL8XXXU mainline kernel driver replace out-of-tree 8192CU and 8192DU drivers --- distributions/LibreELEC/options | 2 +- projects/Allwinner/linux/linux.aarch64.conf | 3 ++- projects/Allwinner/linux/linux.arm.conf | 3 ++- projects/Amlogic/linux/linux.aarch64.conf | 2 +- projects/Generic/linux/linux.x86_64.conf | 3 ++- projects/NXP/devices/iMX8/linux/linux.aarch64.conf | 3 ++- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 3 ++- projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf | 3 ++- .../Rockchip/devices/RK3328/linux/default/linux.aarch64.conf | 3 ++- .../Rockchip/devices/RK3399/linux/default/linux.aarch64.conf | 3 ++- projects/Samsung/linux/linux.arm.conf | 3 ++- 13 files changed, 24 insertions(+), 13 deletions(-) diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 7f955898e2..eb89ffbb78 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -48,7 +48,7 @@ # for a list of additional drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8192EU RTL8812AU" + ADDITIONAL_DRIVERS="RTL8192DU RTL8812AU" # Default size of system partition, in MB, eg. 512 SYSTEM_SIZE=512 diff --git a/projects/Allwinner/linux/linux.aarch64.conf b/projects/Allwinner/linux/linux.aarch64.conf index 5b054d6feb..fe172a953e 100644 --- a/projects/Allwinner/linux/linux.aarch64.conf +++ b/projects/Allwinner/linux/linux.aarch64.conf @@ -2145,7 +2145,8 @@ CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y CONFIG_RTL_CARDS=m # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y # CONFIG_RTW88 is not set # CONFIG_RTW89 is not set # CONFIG_WLAN_VENDOR_RSI is not set diff --git a/projects/Allwinner/linux/linux.arm.conf b/projects/Allwinner/linux/linux.arm.conf index 38fc3ae874..bbe7886370 100644 --- a/projects/Allwinner/linux/linux.arm.conf +++ b/projects/Allwinner/linux/linux.arm.conf @@ -1960,7 +1960,8 @@ CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y CONFIG_RTL_CARDS=m # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y # CONFIG_RTW88 is not set # CONFIG_RTW89 is not set # CONFIG_WLAN_VENDOR_RSI is not set diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index e8b4016cba..f25e5182a3 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -2345,7 +2345,7 @@ CONFIG_RTL_CARDS=m # CONFIG_RTL8188EE is not set # CONFIG_RTL8192EE is not set # CONFIG_RTL8821AE is not set -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTLWIFI=m CONFIG_RTLWIFI_USB=m # CONFIG_RTLWIFI_DEBUG is not set diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index dda0ec6cc1..ada1fca621 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -2443,7 +2443,8 @@ CONFIG_RTLWIFI_PCI=m CONFIG_RTL8192C_COMMON=m CONFIG_RTL8723_COMMON=m CONFIG_RTLBTCOEXIST=m -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y CONFIG_RTW88=m CONFIG_RTW88_CORE=m CONFIG_RTW88_PCI=m diff --git a/projects/NXP/devices/iMX8/linux/linux.aarch64.conf b/projects/NXP/devices/iMX8/linux/linux.aarch64.conf index 1309eca700..d9b4f48b18 100644 --- a/projects/NXP/devices/iMX8/linux/linux.aarch64.conf +++ b/projects/NXP/devices/iMX8/linux/linux.aarch64.conf @@ -2052,7 +2052,8 @@ CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y CONFIG_RTL_CARDS=m # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y # CONFIG_RTW88 is not set # CONFIG_RTW89 is not set CONFIG_WLAN_VENDOR_RSI=y diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 6614fd426b..2919cb92c9 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1663,7 +1663,8 @@ CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y CONFIG_RTL_CARDS=m # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y CONFIG_RTW88=m CONFIG_WLAN_VENDOR_RSI=y # CONFIG_RSI_91X is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 4c807ef319..106a779d72 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1792,7 +1792,8 @@ CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y CONFIG_RTL_CARDS=m # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y CONFIG_RTW88=m CONFIG_WLAN_VENDOR_RSI=y # CONFIG_RSI_91X is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index ed68cf0e33..2a3040908a 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -2263,7 +2263,8 @@ CONFIG_RTL_CARDS=m # CONFIG_RTL8192EE is not set # CONFIG_RTL8821AE is not set # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y # CONFIG_RTW88 is not set CONFIG_WLAN_VENDOR_RSI=y # CONFIG_RSI_91X is not set diff --git a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf index 86b7364139..f3dcc85e92 100644 --- a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf +++ b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf @@ -1785,7 +1785,8 @@ CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y CONFIG_RTL_CARDS=m # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y # CONFIG_RTW88 is not set # CONFIG_RTW89 is not set CONFIG_WLAN_VENDOR_RSI=y diff --git a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf index a51b3a58ad..7fe395edf4 100644 --- a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf @@ -1985,7 +1985,8 @@ CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y CONFIG_RTL_CARDS=m # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y # CONFIG_RTW88 is not set # CONFIG_RTW89 is not set CONFIG_WLAN_VENDOR_RSI=y diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index ca04640f1b..3e5b74fd19 100644 --- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf @@ -2370,7 +2370,8 @@ CONFIG_RTL_CARDS=m # CONFIG_RTL8192EE is not set # CONFIG_RTL8821AE is not set # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y # CONFIG_RTW88 is not set # CONFIG_RTW89 is not set CONFIG_WLAN_VENDOR_RSI=y diff --git a/projects/Samsung/linux/linux.arm.conf b/projects/Samsung/linux/linux.arm.conf index b22f5100d5..7874e47170 100644 --- a/projects/Samsung/linux/linux.arm.conf +++ b/projects/Samsung/linux/linux.arm.conf @@ -1591,7 +1591,8 @@ CONFIG_RTL8187=m CONFIG_RTL8187_LEDS=y CONFIG_RTL_CARDS=m # CONFIG_RTL8192CU is not set -# CONFIG_RTL8XXXU is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y CONFIG_RTW88=m # CONFIG_RTW89 is not set # CONFIG_WLAN_VENDOR_RSI is not set From 66041c9456d3b2581c21fb23f5c5c358151e3b61 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 14 Mar 2022 12:14:24 +0000 Subject: [PATCH 2/3] RTL8192CU: drop obsolete out-of-tree driver Replaced by Realtek RTL8XXXU mainline kernel driver --- packages/linux-drivers/RTL8192CU/package.mk | 29 ------------------- .../RTL8192CU-0001-add_device_ID_330d.patch | 12 -------- 2 files changed, 41 deletions(-) delete mode 100644 packages/linux-drivers/RTL8192CU/package.mk delete mode 100644 packages/linux-drivers/RTL8192CU/patches/RTL8192CU-0001-add_device_ID_330d.patch diff --git a/packages/linux-drivers/RTL8192CU/package.mk b/packages/linux-drivers/RTL8192CU/package.mk deleted file mode 100644 index fd193573e1..0000000000 --- a/packages/linux-drivers/RTL8192CU/package.mk +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="RTL8192CU" -PKG_VERSION="e5c01a328d2a17f6e6553e30c9cf546076d61021" -PKG_SHA256="af3a5272564cb4c3238a65954b7f4ecf402bf6665e32f3ec1fd424a63193b9aa" -PKG_LICENSE="GPL" -PKG_SITE="https://github.com/pvaret/rtl8192cu-fixes" -PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" -PKG_LONGDESC="Realtek RTL81xxCU Linux 3.x driver" -PKG_IS_KERNEL_PKG="yes" - -pre_make_target() { - unset LDFLAGS -} - -make_target() { - make V=1 \ - ARCH=${TARGET_KERNEL_ARCH} \ - KSRC=$(kernel_path) \ - CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \ - CONFIG_POWER_SAVING=n -} - -makeinstall_target() { - mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} - cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} -} diff --git a/packages/linux-drivers/RTL8192CU/patches/RTL8192CU-0001-add_device_ID_330d.patch b/packages/linux-drivers/RTL8192CU/patches/RTL8192CU-0001-add_device_ID_330d.patch deleted file mode 100644 index f318ddd448..0000000000 --- a/packages/linux-drivers/RTL8192CU/patches/RTL8192CU-0001-add_device_ID_330d.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur RTL8192CU-v4.0.2_9000.20130911/hal/rtl8192c/usb/usb_halinit.c RTL8192CU-v4.0.2_9000.20130911.patch/hal/rtl8192c/usb/usb_halinit.c ---- RTL8192CU-v4.0.2_9000.20130911/hal/rtl8192c/usb/usb_halinit.c 2013-09-11 05:56:55.000000000 +0200 -+++ RTL8192CU-v4.0.2_9000.20130911.patch/hal/rtl8192c/usb/usb_halinit.c 2014-04-01 20:17:59.270739417 +0200 -@@ -3509,6 +3509,8 @@ - pHalData->CustomerID = RT_CID_DLINK; - else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330a)) - pHalData->CustomerID = RT_CID_DLINK; -+ else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330d)) -+ pHalData->CustomerID = RT_CID_DLINK; - break; - case EEPROM_CID_WHQL: - /* From c4022db98122b9089c345ced4b3b8ec53074cd26 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 14 Mar 2022 12:15:39 +0000 Subject: [PATCH 3/3] RTL8192EU: drop obsolete out-of-tree driver Replaceealtek RTL8XXXU mainline kernel driver --- packages/linux-drivers/RTL8192EU/package.mk | 30 --------------------- 1 file changed, 30 deletions(-) delete mode 100644 packages/linux-drivers/RTL8192EU/package.mk diff --git a/packages/linux-drivers/RTL8192EU/package.mk b/packages/linux-drivers/RTL8192EU/package.mk deleted file mode 100644 index a519e8b470..0000000000 --- a/packages/linux-drivers/RTL8192EU/package.mk +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="RTL8192EU" -PKG_VERSION="e0f967cea1d0037c730246c572f7fef000865ff7" -PKG_SHA256="2e11e26fccba644e4e5576948dbc1a5dd3ccd22f89be3d45eaa7c4276b8e766a" -PKG_LICENSE="GPL" -PKG_SITE="https://github.com/Mange/rtl8192eu-linux-driver" -PKG_URL="https://github.com/Mange/rtl8192eu-linux-driver/archive/${PKG_VERSION}.tar.gz" -PKG_LONGDESC="Realtek RTL8192EU Linux driver" -PKG_IS_KERNEL_PKG="yes" - -pre_make_target() { - unset LDFLAGS -} - -make_target() { - make V=1 \ - ARCH=${TARGET_KERNEL_ARCH} \ - KSRC=$(kernel_path) \ - CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \ - CONFIG_POWER_SAVING=n \ - USER_EXTRA_CFLAGS="-Wno-error=date-time" -} - -makeinstall_target() { - mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} - cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} -}