From 3ac5aedb377a8ea8d650f4ca063125dc1564f38b Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Sat, 16 Mar 2024 03:18:25 +0100
Subject: [PATCH] change driver dir and cleanup workflow

---
 .github/workflows/buildForOpenHD.yaml |  4 +--
 scripts/patches/openhd_utils.patch    |  4 +--
 scripts/patches/openhd_wifi.patch     | 41 +++++++++++++++++++--------
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/buildForOpenHD.yaml b/.github/workflows/buildForOpenHD.yaml
index 7dd5389ced0b2..8d39f467e87f2 100644
--- a/.github/workflows/buildForOpenHD.yaml
+++ b/.github/workflows/buildForOpenHD.yaml
@@ -43,10 +43,8 @@ jobs:
           cd bsp
           ./bsp --long-version -r radxa linux rk356x
 
-      - name: little hack for github uploads
+      - name: prepare for Upload
         run: |
-          echo "dir______________________________________"
-          tree /home/runner/work/
           cp -r /home/runner/work/linux-rock/linux-rock/bsp/*.deb /home/runner/work/linux-rock/linux-rock/
 
       - name: Upload to Github
diff --git a/scripts/patches/openhd_utils.patch b/scripts/patches/openhd_utils.patch
index 9c3102cacb170..25627aa3bbe56 100644
--- a/scripts/patches/openhd_utils.patch
+++ b/scripts/patches/openhd_utils.patch
@@ -15,7 +15,7 @@ index bdb1bcd..2b5dd86 100644
 +
 +	    #openhd-update-wifi-card-drivers
 +            echo "________OpenHD Part_________"
-+            cd drivers/net/wireless/realtek/
++            cd drivers/net/wireless/
 +            rm -Rf rtl8812au
 +            rm -Rf rtl88x2bu
 +            git clone https://github.com/openhd/rtl8812au/
@@ -31,7 +31,7 @@ index bdb1bcd..2b5dd86 100644
 +            cd ..
 +            cd rtl8852bu
 +            sed -i 's/aarch64\.l/arm64/' Makefile
-+            cd ../../../../../
++            cd ../../../../
 +            patch -p1 -i scripts/patches/openhd_drm.patch
 +            patch -p1 -i scripts/patches/openhd_wifi.patch
 +            patch -p1 -i scripts/patches/openhd_keyboard.patch
diff --git a/scripts/patches/openhd_wifi.patch b/scripts/patches/openhd_wifi.patch
index 0dfc51fd0d24d..e228e9901a743 100644
--- a/scripts/patches/openhd_wifi.patch
+++ b/scripts/patches/openhd_wifi.patch
@@ -4,32 +4,49 @@ Date:   Fri Mar 15 22:50:06 2024 +0100
 
     add openhd drivers and disable realtek ones
 
+diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
+index 46f5cc40788a..c00af2f6ac00 100644
+--- a/drivers/net/wireless/Kconfig
++++ b/drivers/net/wireless/Kconfig
+@@ -49,6 +49,8 @@ source "drivers/net/wireless/ti/Kconfig"
+ source "drivers/net/wireless/zydas/Kconfig"
+ source "drivers/net/wireless/quantenna/Kconfig"
+ source "drivers/net/wireless/rockchip_wlan/Kconfig"
++source "drivers/net/wireless/rtl8812au/Kconfig"
++source "drivers/net/wireless/rtl88x2bu/Kconfig"
+ 
+ config PCMCIA_RAYCS
+ 	tristate "Aviator/Raytheon 2.4GHz wireless support"
+diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
+index 5671364ae98d..bff5de684f50 100644
+--- a/drivers/net/wireless/Makefile
++++ b/drivers/net/wireless/Makefile
+@@ -31,3 +31,5 @@ obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
+ 
+ obj-$(CONFIG_VIRT_WIFI)	+= virt_wifi.o
+ obj-$(CONFIG_WL_ROCKCHIP)	+= rockchip_wlan/
++obj-m += rtl8812au/
++obj-m += rtl88x2bu/
 diff --git a/drivers/net/wireless/realtek/Kconfig b/drivers/net/wireless/realtek/Kconfig
-index 474843277..b7538ac26 100644
+index 474843277fa1..d8dbd0596395 100644
 --- a/drivers/net/wireless/realtek/Kconfig
 +++ b/drivers/net/wireless/realtek/Kconfig
-@@ -14,7 +14,7 @@ if WLAN_VENDOR_REALTEK
+@@ -14,7 +14,5 @@ if WLAN_VENDOR_REALTEK
  
  source "drivers/net/wireless/realtek/rtl818x/Kconfig"
  source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
 -source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
 -source "drivers/net/wireless/realtek/rtw88/Kconfig"
-+source "drivers/net/wireless/realtek/rtl8812au/Kconfig"
-+source "drivers/net/wireless/realtek/rtl88x2bu/Kconfig"
  
  endif # WLAN_VENDOR_REALTEK
 diff --git a/drivers/net/wireless/realtek/Makefile b/drivers/net/wireless/realtek/Makefile
-index 888b5d594..2f1dd6d9e 100644
+index 888b5d594e79..d5f822166ec7 100644
 --- a/drivers/net/wireless/realtek/Makefile
 +++ b/drivers/net/wireless/realtek/Makefile
-@@ -5,7 +5,7 @@
- 
+@@ -6,6 +6,3 @@
  obj-$(CONFIG_RTL8180)		+= rtl818x/
  obj-$(CONFIG_RTL8187)		+= rtl818x/
--obj-$(CONFIG_RTLWIFI)		+= rtlwifi/
+ obj-$(CONFIG_RTLWIFI)		+= rtlwifi/
 -obj-$(CONFIG_RTL8XXXU)		+= rtl8xxxu/
 -obj-$(CONFIG_RTW88)		+= rtw88/
-+obj-$(CONFIG_RTL8187)		+= rtl88x2bu/
-+obj-$(CONFIG_RTL8187)		+= rtl8812au/
-+
- 
+-