From dc5d461c950239570e05d2159347d827fa1cf47a Mon Sep 17 00:00:00 2001 From: Igor Date: Tue, 14 Nov 2023 12:04:15 +0100 Subject: [PATCH] Move Makefile section from patch (#5909) There are many changes in this file and its impossible to cover this with a patch for now current and all kernels back We are using same hack in UWE drivers. --- lib/functions/compilation/patch/drivers_network.sh | 4 ++++ ...a-new-driver-v5.12.2-7-g2de5ec386.20201013_beta.patch | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index 5d5e132ba..8f135ade6 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -691,6 +691,10 @@ driver_rtl8723cs() { fi if linux-version compare "${version}" ge 6.1; then + + # Add to section Makefile + echo "obj-\$(CONFIG_RTL8723CS) += rtl8723cs/" >> "$kerneldir/drivers/net/wireless/Makefile" + process_patch_file "${SRC}/patch/misc/wireless-rtl8723cs/8723cs-Add-a-new-driver-v5.12.2-7-g2de5ec386.20201013_beta.patch" "applying" process_patch_file "${SRC}/patch/misc/wireless-rtl8723cs/8723cs-Make-the-driver-compile-and-probe-drop-rockchip-platform.patch" "applying" process_patch_file "${SRC}/patch/misc/wireless-rtl8723cs/8723cs-Enable-OOB-interrupt.patch" "applying" diff --git a/patch/misc/wireless-rtl8723cs/8723cs-Add-a-new-driver-v5.12.2-7-g2de5ec386.20201013_beta.patch b/patch/misc/wireless-rtl8723cs/8723cs-Add-a-new-driver-v5.12.2-7-g2de5ec386.20201013_beta.patch index cb7759e5c..c96e95701 100644 --- a/patch/misc/wireless-rtl8723cs/8723cs-Add-a-new-driver-v5.12.2-7-g2de5ec386.20201013_beta.patch +++ b/patch/misc/wireless-rtl8723cs/8723cs-Add-a-new-driver-v5.12.2-7-g2de5ec386.20201013_beta.patch @@ -1189,15 +1189,6 @@ index 5cfabd5376cc..1645e5222ce6 100644 +source "drivers/staging/rtl8723cs/Kconfig" + endif # STAGING -diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile -index f8c3aa9c2418..7409022ac76d 100644 ---- a/drivers/staging/Makefile -+++ b/drivers/staging/Makefile -@@ -29,3 +29,4 @@ obj-$(CONFIG_PI433) += pi433/ - obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ - obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ - obj-$(CONFIG_QLGE) += qlge/ -+obj-$(CONFIG_RTL8723CS) += rtl8723cs/ diff --git a/drivers/staging/rtl8723cs/Kconfig b/drivers/staging/rtl8723cs/Kconfig new file mode 100644 index 000000000000..78e5f124ca80