Update fpv profiles (#1536)

OpenIPC · Aug 27, 2024 · 64228b6 · 64228b6
1 parent 55269cf
commit 64228b6
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -62,7 +62,7 @@ distclean:
 
 deps:
 	sudo apt-get install -y automake autotools-dev bc build-essential cpio \
-		curl file fzf git libncurses-dev libtool lzop make rsync unzip wget
+		curl file fzf git libncurses-dev libtool lzop make rsync unzip wget libssl-dev
 
 timer:
 	@echo - Build time: $(shell date -d @$(shell expr $(shell date +%s) - $(TIMER)) -u +%M:%S)

diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig
@@ -95,11 +95,12 @@ BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
 BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_RTL8812AU_OPENIPC=y
+BR2_PACKAGE_RTL88X2EU_OPENIPC=y
 
 # FPV
 BR2_PACKAGE_DATALINK=y
 BR2_PACKAGE_WIFIBROADCAST=y
-BR2_PACKAGE_MAVLINK_ROUTER=y
+# BR2_PACKAGE_MAVLINK_ROUTER is not set
 BR2_PACKAGE_MAVFWD=y
 
 # Debug

diff --git a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
@@ -99,13 +99,14 @@ 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_OPENIPC=y
+# BR2_PACKAGE_RTL8733BU_OPENIPC is not set
 BR2_PACKAGE_RTL8812AU_OPENIPC=y
+BR2_PACKAGE_RTL88X2EU_OPENIPC=y
 
 # FPV
 BR2_PACKAGE_DATALINK=y
 BR2_PACKAGE_WIFIBROADCAST=y
-BR2_PACKAGE_MAVLINK_ROUTER=y
+# BR2_PACKAGE_MAVLINK_ROUTER is not set
 BR2_PACKAGE_MAVFWD=y
 
 # Debug

diff --git a/br-ext-chip-sigmastar/configs/ssc377de_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc377de_fpv_defconfig
@@ -97,11 +97,12 @@ BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
 BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_PACKAGE_RTL8812AU_OPENIPC=y
+BR2_PACKAGE_RTL88X2EU_OPENIPC=y
 
 # FPV
 BR2_PACKAGE_DATALINK=y
 BR2_PACKAGE_WIFIBROADCAST=y
-BR2_PACKAGE_MAVLINK_ROUTER=y
+# BR2_PACKAGE_MAVLINK_ROUTER is not set
 BR2_PACKAGE_MAVFWD=y
 
 # Debug

diff --git a/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch b/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch
@@ -1,27 +1,29 @@
---- a/Makefile	2024-08-27 14:13:17.943312156 +0300
-+++ b/Makefile	2024-08-27 14:16:02.378077178 +0300
-@@ -49,7 +49,7 @@
+--- a/Makefile	2023-12-28 12:04:57.820353449 +0300
++++ b/Makefile	2023-12-28 12:31:56.636201729 +0300
+@@ -39,8 +39,8 @@
 
  ########################## WIFI IC ############################
  CONFIG_RTL8812A = y
 -CONFIG_RTL8821A = y
+-CONFIG_RTL8814A = y
 +CONFIG_RTL8821A = n
- CONFIG_RTL8814A = n
++CONFIG_RTL8814A = n
  ######################### Interface ###########################
  CONFIG_USB_HCI = y
-@@ -216,9 +216,9 @@
+ ########################## Features ###########################
+@@ -206,9 +206,9 @@
  EXTRA_CFLAGS += -DDBG=0
  endif
 
--ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), y_y)
-+ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), y_n)
+-ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
++ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_n_n)
 
 -EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau_wfb\"
 +EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\"
  ifeq ($(CONFIG_USB_HCI), y)
  USER_MODULE_NAME = 88XXau
  endif
-@@ -301,7 +301,7 @@
+@@ -291,7 +291,7 @@
  				hal/btc/halbtc8821c2ant.o
  endif
 
@@ -30,7 +32,7 @@
 
  ########### HAL_RTL8812A_RTL8821A #################################
  ifneq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), n_n)
-@@ -1533,7 +1533,7 @@
+@@ -1523,7 +1523,7 @@
 
  USER_MODULE_NAME ?=
  ifneq ($(USER_MODULE_NAME),)

diff --git a/general/package/rtl8812au-openipc/0002-old_kernel_fix.patch b/general/package/rtl8812au-openipc/0002-old_kernel_fix.patch
@@ -1,15 +1,15 @@
 diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
---- a/os_dep/linux/ioctl_cfg80211.c	2024-08-27 14:35:02.331289685 +0300
-+++ b/os_dep/linux/ioctl_cfg80211.c	2024-08-27 14:37:53.039690680 +0300
-@@ -4937,6 +4937,7 @@
+--- a/os_dep/linux/ioctl_cfg80211.c	2023-12-28 04:55:44.047232205 +0300
++++ b/os_dep/linux/ioctl_cfg80211.c	2023-12-28 04:58:01.223544721 +0300
+@@ -4921,6 +4921,7 @@
        //RTW_INFO("%s dvobj null\n", __func__);
      }
      switch(pHalData->current_channel_bw){
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
        case CHANNEL_WIDTH_5:
  	//RTW_INFO("%s width 5\n", __func__);
  	width = NL80211_CHAN_WIDTH_5;
-@@ -4947,6 +4948,7 @@
+@@ -4931,6 +4932,7 @@
  	width = NL80211_CHAN_WIDTH_10;
  	center_freq = control_freq;
  	break;
@@ -18,8 +18,8 @@ diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
  	//RTW_INFO("%s width 20\n", __func__);
  	width = NL80211_CHAN_WIDTH_20;
 diff -Naur a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c
---- a/os_dep/linux/wifi_regd.c	2024-08-27 14:35:13.051313467 +0300
-+++ b/os_dep/linux/wifi_regd.c	2024-08-27 14:38:18.297753594 +0300
+--- a/os_dep/linux/wifi_regd.c	2023-11-08 03:19:52.064089100 +0300
++++ b/os_dep/linux/wifi_regd.c	2023-12-28 04:57:52.047523712 +0300
 @@ -334,11 +334,11 @@
  				if (ch)
  					ch->flags &= ~(IEEE80211_CHAN_DISABLED|IEEE80211_CHAN_NO_HT40PLUS|

diff --git a/general/package/rtl8812au-openipc/rtl8812au-openipc.mk b/general/package/rtl8812au-openipc/rtl8812au-openipc.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 RTL8812AU_OPENIPC_SITE = $(call github,svpcom,rtl8812au,$(RTL8812AU_OPENIPC_VERSION))
-RTL8812AU_OPENIPC_VERSION = f1f447e2e184167b70bed4884534a2c27f4aa16e
+RTL8812AU_OPENIPC_VERSION = dc9993dd6e7de738de8437add043747a6bfc475c
 
 RTL8812AU_OPENIPC_LICENSE = GPL-2.0
 RTL8812AU_OPENIPC_LICENSE_FILES = COPYING

diff --git a/general/scripts/excludes/ssc30kq_fpv.list b/general/scripts/excludes/ssc30kq_fpv.list
@@ -0,0 +1 @@
+ssc338q_fpv.list
diff --git a/general/scripts/excludes/ssc338q_fpv.list b/general/scripts/excludes/ssc338q_fpv.list
@@ -0,0 +1,16 @@
+/etc/sensors/imx307.bin
+/etc/sensors/gc2053.bin
+/etc/sensors/gc4653.bin
+/etc/sensors/sc501ai.bin
+#
+/lib/modules/4.9.84/kernel/fs/lockd/*.ko
+/lib/modules/4.9.84/kernel/fs/nfs/*.ko
+/lib/modules/4.9.84/kernel/fs/nfs_common/*.ko
+/lib/modules/4.9.84/kernel/net/sunrpc/*.ko
+/lib/modules/4.9.84/sigmastar/sensor_gc2053_mipi.ko
+/lib/modules/4.9.84/sigmastar/sensor_gc4653_mipi.ko
+/lib/modules/4.9.84/sigmastar/sensor_imx307_mipi.ko
+/lib/modules/4.9.84/sigmastar/sensor_imx347_mipi.ko
+/lib/modules/4.9.84/sigmastar/sensor_os04c10_mipi.ko
+/lib/modules/4.9.84/sigmastar/sensor_sc501ai_mipi.ko
+/lib/modules/4.9.84/sigmastar/sensor_sc8235_mipi.ko
diff --git a/general/scripts/excludes/ssc377de_fpv.list b/general/scripts/excludes/ssc377de_fpv.list
@@ -0,0 +1,14 @@
+/etc/sensors/sc401ai.bin
+/etc/sensors/os04a10.bin
+/etc/sensors/gc4653.bin
+/etc/sensors/sc830ai.bin
+#
+/lib/modules/5.10.61/kernel/fs/lockd/*.ko
+/lib/modules/5.10.61/kernel/fs/nfs/*.ko
+/lib/modules/5.10.61/kernel/fs/nfs_common/*.ko
+/lib/modules/5.10.61/kernel/net/sunrpc/*.ko
+/lib/modules/5.10.61/sigmastar/sensor_gc4653_mipi.ko
+/lib/modules/5.10.61/sigmastar/sensor_os04a10_mipi.ko
+/lib/modules/5.10.61/sigmastar/sensor_sc401ai_mipi.ko
+/lib/modules/5.10.61/sigmastar/sensor_sc501ai_mipi.ko
+/lib/modules/5.10.61/sigmastar/sensor_sc830ai_mipi.ko.ko