diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 574f8c50..67843bb6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -92,7 +92,7 @@ jobs:
           - platform: gk7205v300
             release: venc
           - platform: ssc338q
-            release: initramfs
+            release: fpv
 
           # MVP
           - platform: fh8852v100
@@ -236,11 +236,6 @@ jobs:
             echo NANDFW=${NANDFW} >> ${GITHUB_ENV}
           fi
 
-          RAMFS=${GITHUB_WORKSPACE}/output/images/openipc.${{matrix.platform}}-initramfs-${{matrix.release}}.tgz
-          if [ -e ${RAMFS} ]; then
-            echo RAMFS=${RAMFS} >> ${GITHUB_ENV}
-          fi
-
       - name: Upload firmware
         if: github.event_name != 'pull_request' && matrix.custom != 'onlyci'
         uses: softprops/action-gh-release@v1
@@ -249,7 +244,6 @@ jobs:
           files: |
             ${{env.NORFW}}
             ${{env.NANDFW}}
-            ${{env.RAMFS}}
 
       - name: Send binary
         if: github.event_name != 'pull_request' && matrix.custom != 'onlyci' && env.NORFW
diff --git a/br-ext-chip-hisilicon/configs/hi3516cv100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv100_lite_defconfig
index 3716646f..347ad640 100644
--- a/br-ext-chip-hisilicon/configs/hi3516cv100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3516cv100_lite_defconfig
@@ -97,6 +97,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_MT7601U_OPENIPC=y
 
 # WIREGUARD
 BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
diff --git a/br-ext-chip-hisilicon/configs/hi3518cv100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518cv100_lite_defconfig
index d5b95d13..88a717a0 100644
--- a/br-ext-chip-hisilicon/configs/hi3518cv100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518cv100_lite_defconfig
@@ -97,6 +97,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_MT7601U_OPENIPC=y
 
 # WIREGUARD
 BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
diff --git a/br-ext-chip-hisilicon/configs/hi3518ev100_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev100_lite_defconfig
index 97457d94..81d8174a 100644
--- a/br-ext-chip-hisilicon/configs/hi3518ev100_lite_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3518ev100_lite_defconfig
@@ -97,6 +97,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_MT7601U_OPENIPC=y
 
 # WIREGUARD
 BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
index feb93898..c9b90874 100644
--- a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
+++ b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig
@@ -111,7 +111,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271=y
 BR2_PACKAGE_RTL8812AU_OPENIPC=y
 
 # FPV
-# BR2_PACKAGE_VDEC is not set
+# BR2_PACKAGE_VDEC_OPENIPC is not set
 BR2_PACKAGE_DATALINK=y
 BR2_PACKAGE_WIFIBROADCAST=y
 # BR2_PACKAGE_WFBOPENHD is not set
diff --git a/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig
index 34c54654..ef921d5d 100644
--- a/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc335de_lite_defconfig
@@ -97,6 +97,7 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+# BR2_PACKAGE_AIC8800_OPENIPC is not set
 # BR2_PACKAGE_RTL8188EU is not set
 # BR2_PACKAGE_RTL8192EU_OPENIPC is not set
 
diff --git a/br-ext-chip-sigmastar/configs/ssc335de_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc335de_ultimate_defconfig
index d98ce118..1ea61964 100644
--- a/br-ext-chip-sigmastar/configs/ssc335de_ultimate_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc335de_ultimate_defconfig
@@ -101,6 +101,7 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+# BR2_PACKAGE_AIC8800_OPENIPC is not set
 # BR2_PACKAGE_RTL8188EU is not set
 # BR2_PACKAGE_RTL8192EU_OPENIPC is not set
 
diff --git a/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig
index eedd9612..a01ba706 100644
--- a/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc337de_lite_defconfig
@@ -97,6 +97,7 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+# BR2_PACKAGE_AIC8800_OPENIPC is not set
 # BR2_PACKAGE_RTL8188EU is not set
 # BR2_PACKAGE_RTL8192EU_OPENIPC is not set
 
diff --git a/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig
index 8c12c735..c1ed0077 100644
--- a/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig
+++ b/br-ext-chip-sigmastar/configs/ssc337de_ultimate_defconfig
@@ -101,6 +101,7 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_AIC8800_OPENIPC=y
 # BR2_PACKAGE_RTL8188EU is not set
 # BR2_PACKAGE_RTL8192EU_OPENIPC is not set
 BR2_PACKAGE_RTL8188FU_OPENIPC=y
diff --git a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
new file mode 100644
index 00000000..556ae613
--- /dev/null
+++ b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig
@@ -0,0 +1,129 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_EABIHF=y
+BR2_ARM_FPU_NEON_VFPV4=y
+BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="4.9.84"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+
+# Toolchain
+BR2_PER_PACKAGE_DIRECTORIES=y
+BR2_GCC_VERSION_12_X=y
+BR2_TOOLCHAIN_USES_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6e/kernel/infinity6e-ssc012b.config"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_XZ=y
+
+# OpenIPC
+BR2_OPENIPC_SOC_VENDOR="sigmastar"
+BR2_OPENIPC_SOC_MODEL="ssc338q"
+BR2_OPENIPC_SOC_FAMILY="infinity6e"
+BR2_OPENIPC_FLAVOR="fpv"
+BR2_OPENIPC_FLASH_SIZE="16"
+
+# Filesystem
+# BR2_TARGET_TZ_INFO is not set
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_SQUASHFS=y
+BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
+BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y
+BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/scripts/ubifs/ubinize_sigmastar.cfg"
+BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh"
+
+# OpenIPC configuration
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
+BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC"
+BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc338q"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches"
+
+# OpenIPC packages
+BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config"
+BR2_PACKAGE_DROPBEAR_OPENIPC=y
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+# BR2_PACKAGE_FDK_AAC_OPENIPC is not set
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_HASERL=y
+BR2_PACKAGE_IPCTOOL=y
+BR2_PACKAGE_JSON_C=y
+BR2_PACKAGE_JSONFILTER=y
+BR2_PACKAGE_LIBCURL_OPENIPC=y
+BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
+# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set
+# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
+# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set
+# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set
+BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y
+BR2_PACKAGE_LIBEVENT_OPENIPC=y
+BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
+BR2_PACKAGE_LIBOGG_OPENIPC=y
+BR2_PACKAGE_LIBYAML=y
+BR2_PACKAGE_MAJESTIC=y
+BR2_PACKAGE_MAJESTIC_FONTS=y
+BR2_PACKAGE_MBEDTLS_OPENIPC=y
+# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
+# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
+BR2_PACKAGE_MICROBE_WEB=y
+# BR2_PACKAGE_MINI_SNMPD is not set
+# BR2_PACKAGE_MOTORS is not set
+BR2_PACKAGE_OPUS_OPENIPC=y
+BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
+BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y
+BR2_PACKAGE_EXFAT_OPENIPC=y
+BR2_PACKAGE_EXFATPROGS=y
+# BR2_PACKAGE_SSHPASS is not set
+BR2_PACKAGE_UACME_OPENIPC=y
+BR2_PACKAGE_VTUND_OPENIPC=y
+BR2_PACKAGE_YAML_CLI=y
+BR2_PACKAGE_ZLIB=y
+
+# Wireless
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+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_RTL8812AU_OPENIPC=y
+
+# FPV
+BR2_PACKAGE_DATALINK=y
+BR2_PACKAGE_WIFIBROADCAST=y
+BR2_PACKAGE_MAVLINK_ROUTER=y
+BR2_PACKAGE_MAVFWD=y
+
+# Debug
+# BR2_PACKAGE_HOST_GDB is not set
+# BR2_PACKAGE_GDB is not set
+
+# CCACHE
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(HOME)/.ccache"
+
+# External
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-gnueabihf"
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
+# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz"
diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb
index 45788074..ce252e0c 100755
--- a/general/overlay/etc/wireless/usb
+++ b/general/overlay/etc/wireless/usb
@@ -41,6 +41,12 @@ if [ "$1" = "mt7601u-hi3516ev300-camhi" ]; then
 	exit 0
 fi
 
+# HI3518EV100 CamHi
+if [ "$1" = "mt7601u-hi3518ev100-camhi" ]; then
+	modprobe mt7601sta
+	exit 0
+fi
+
 # HI3518EV200 LifeSmart
 if [ "$1" = "rtl8188fu-hi3518ev200-lifesmart" ]; then
 	set_gpio 54 1
@@ -63,6 +69,12 @@ if [ "$1" = "rtl8188fu-ssc337de-foscam" ]; then
 	exit 0
 fi
 
+# SSC337DE Vendor
+if [ "$1" = "aic8800-ssc337de-vendor" ]; then
+	modprobe aic8800_fdrv
+	exit 0
+fi
+
 # T10 NVT
 if [ "$1" = "mt7601sta-t10-nvt" ]; then
 	modprobe cfg80211
diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade
index 97ce1ecd..1b602082 100755
--- a/general/overlay/usr/sbin/sysupgrade
+++ b/general/overlay/usr/sbin/sysupgrade
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# OpenIPC.org | v.20230520
+# OpenIPC.org | v.20231008
 #
 
-scr_version=1.0.20
+scr_version=1.0.21
 
 args=" $@"
 
@@ -79,7 +79,7 @@ do_update_rootfs() {
 do_wipe_overlay() {
 	echo_c 33 "\nOverlayFS"
 	echo "Erase overlay partition"
-	[ $(get_flash_type mtd) = "nand" ] || jffs2="-j"
+	[ "$flash_type" = "nand" ] || jffs2="-j"
 	busybox flash_eraseall $jffs2 "$(get_device "rootfs_data")"
 }
 
@@ -87,7 +87,7 @@ download_firmware() {
 	echo_c 33 "\nFirmware"
 	[ "$branch_dev" = "1" ] && branch="dev" || branch="latest"
 	osr=$(get_system_build)
-	ftype=$(get_flash_type)
+	ftype="nor"
 	build="${soc}-${ftype}-${osr}"
 	[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/${branch}/openipc.${build}.tgz"
 	echo "Download from $url"
@@ -198,6 +198,7 @@ get_system_info() {
 	kernel_device=$(get_device "kernel")
 	kernel_version=$(get_kernel_version "$kernel_device")
 	system_version=$(get_system_version "")
+	flash_type=$(${IPCINFO} -F)
 }
 
 get_system_version() {
@@ -208,12 +209,6 @@ get_system_build() {
 	grep "BUILD_OPTION" "/etc/os-release" | head -1 | cut -d= -f2
 }
 
-get_flash_type() {
-	local x=$(${IPCINFO} -F)
-	[ -z "$1" ] && [ "$x" = "nand" ] && $(fw_printenv bootcmd | grep -qv nand) && x=nor
-	echo "$x"
-}
-
 print_sysinfo() {
 	get_system_info
 	echo_c 33 "OpenIPC System Updater v${scr_version}"
diff --git a/general/package/Config.in b/general/package/Config.in
index 87dc0480..b670b204 100644
--- a/general/package/Config.in
+++ b/general/package/Config.in
@@ -1,6 +1,8 @@
+source "$BR2_EXTERNAL_GENERAL_PATH/package/aic8800-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/allwinner-osdrv-v83x/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ambarella-osdrv-s3l/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/atbm603x/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/atbm6441/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/aura-httpd/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/autonight/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/aws-producer/Config.in"
diff --git a/general/package/aic8800-openipc/Config.in b/general/package/aic8800-openipc/Config.in
new file mode 100644
index 00000000..762e9648
--- /dev/null
+++ b/general/package/aic8800-openipc/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_AIC8800_OPENIPC
+	bool "aic8800-openipc"
+	depends on BR2_LINUX_KERNEL
+	help
+	  AIC8800 wireless driver
diff --git a/general/package/aic8800-openipc/aic8800-openipc.mk b/general/package/aic8800-openipc/aic8800-openipc.mk
new file mode 100644
index 00000000..182e7a0b
--- /dev/null
+++ b/general/package/aic8800-openipc/aic8800-openipc.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# aic8800-openipc
+#
+################################################################################
+
+AIC8800_OPENIPC_SITE_METHOD = git
+AIC8800_OPENIPC_SITE = https://github.com/openipc/aic8800
+AIC8800_OPENIPC_VERSION = $(shell git ls-remote $(AIC8800_OPENIPC_SITE) HEAD | head -1 | cut -f1)
+
+AIC8800_OPENIPC_LICENSE = GPL-2.0
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
diff --git a/general/package/atbm603x/00000-makefile.patch b/general/package/atbm603x/00000-makefile.patch
deleted file mode 100644
index e6786c7b..00000000
--- a/general/package/atbm603x/00000-makefile.patch
+++ /dev/null
@@ -1,197 +0,0 @@
---- a/Makefile	2023-01-07 16:35:17.971398884 +0300
-+++ b/Makefile	2023-01-07 16:11:17.308131909 +0300
-@@ -1,66 +1,139 @@
-+############################################################################
-+#			ATBM WiFi Product Select
-+#CONFIG_ATBM601x: 1T1R 80211b/g/n, HT20
-+#CONFIG_ATBM602x: 1T1R 80211b/g/n, HT20,HT40
-+#default CONFIG_ATBM603x
-+############################################################################
-+
-+export
-+CONFIG_ATBM601x = n
-+CONFIG_ATBM602x = n
-+CONFIG_ATBM603x = y
-+
-+############################################################################
-+#			ATBM WiFi Interface Select
-+#default CONFIG_ATBM_USB_BUS
-+############################################################################
-+
-+export
-+CONFIG_ATBM_USB_BUS = y
-+CONFIG_ATBM_SDIO_BUS = n
-+CONFIG_ATBM_SPI_BUS = n
-+
-+############################################################################
-+#		       ATBM WiFi SDIO Interface DPLL Freq Select
-+#default 40M
-+############################################################################
-+
-+export
-+CONFIG_ATBM_SDIO_40M = y
-+CONFIG_ATBM_SDIO_24M = n
-+
-+############################################################################
- #
--#makefile for build atbm_wifi.ko
--#
--###############################################################################
--#
--# when release to customer, the CUSTOMER_SUPPORT_USED must set to y
-+#	The Follow Code Of The Makefile Should Not Be Changed 
- #
--###############################################################################
--CUSTOMER_SUPPORT_USED=n
--###############################################################################
--
--#PLATFORM_XUNWEI					1
--#PLATFORM_SUN6I						2
--#PLATFORM_FRIENDLY					3
--#PLATFORM_SUN6I_64					4
--#PLATFORM_HI3798M					5
--#PLATFORM_HI3518E					6
--#PLATFORM_X86PC						7
--#PLATFORM_AMLOGIC					8
--#PLATFORM_AMLOGIC_905X				9
--#PLATFORM_ROCKCHIP					10
--#PLATFORM_MSTAR						11
--#PLATFORM_CDLINUX					12
--#PLATFORM_AMLOGIC_S805				13
--#PLATFORM_HIS_LINUX_3_4				14
--#PLATFORM_ROCKCHIP_3229				15
--#PLATFORM_ROCKCHIP_3229_ANDROID8	16
--#PLATFORM_HS_IPC					17
--#PLATFORM_SIGMASTAR					18
--#PLATFORM_HI3516EV200				19
--#PLATFORM_XUNWEI_2G					20
--#PLATFORM_NVT98517					21
--#PLATFORM_INGENIC					22
--#PLATFORM_SUN8I						23
--
--export
--platform ?= PLATFORM_SUN8I
--sys ?= Linux
--arch ?= arm
--ATBM_WIFI__EXT_CCFLAGS = -DATBM_WIFI_PLATFORM=23
-+############################################################################
-+
-+PWD:=$(shell pwd)
-+WIFI_INSTALL_DIR := $(PWD)/output
-+
-+NOSTDINC_FLAGS := -I$(src)/include/ \
-+	-include $(src)/include/linux/compat-2.6.h \
-+	-DCOMPAT_STATIC
- 
-+#####################################################
- export
--KERDIR := /home/cronyx/firmware/output/build/linux-4.9.118
--CROSS_COMPILE := /home/cronyx/firmware/output/host/bin/arm-openipc-linux-musleabihf-
-+ifeq ($(CONFIG_ATBM601x),y)
-+CONFIG_NOT_SUPPORT_40M_CHW = y
-+CONFIG_ATHENAB=y
-+CONFIG_ARESB=n
-+CONFIG_ARES=n
-+MODULES_NAME =  atbm601x_wifi
-+else ifeq ($(CONFIG_ATBM602x),y)
-+CONFIG_ATHENAB=y
-+CONFIG_ARESB=n
-+CONFIG_ARES=n
-+MODULES_NAME = atbm602x_wifi
-+else ifeq ($(CONFIG_ATBM603x),y)
-+CONFIG_ATHENAB=n
-+CONFIG_ARESB=y
-+CONFIG_ARES=n
-+MODULES_NAME = atbm603x_wifi
-+endif
- 
--ifeq ($(CUSTOMER_SUPPORT_USED),y)
--MAKEFILE_SUB ?= Makefile.build.customer
-+ifeq ($(CONFIG_ATBM_USB_BUS),y)
-+USB_BUS=y
-+else ifeq ($(CONFIG_ATBM_SDIO_BUS),y)
-+SDIO_BUS=y
-+ifeq ($(CONFIG_ATBM_SDIO_24M),y)
-+CONFIG_ATHENAB_24M=y
-+CONFIG_ATHENAB=n
- else
--MAKEFILE_SUB ?= Makefile.build
-+CONFIG_ATHENAB=y
-+endif
-+else ifeq ($(CONFIG_ATBM_SPI_BUS),y)
-+SPI_BUS=y
-+endif
-+MULT_NAME=n
-+ATBM_MAKEFILE_SUB=y
-+#####################################################
-+export 
-+ifeq ($(CONFIG_ATBM_APOLLO),)
-+CONFIG_ATBM_APOLLO=m
-+endif
-+export
-+ATBM_WIFI__EXT_CCFLAGS = -DATBM_WIFI_PLATFORM=23
-+############################################
-+export
-+include $(src)/Makefile.build.kernel
-+################### WIRELESS #########################
-+ifeq ($(CONFIG_ATBM_APOLLO_DEBUG),)
-+ATBM_WIFI__EXT_CCFLAGS += -DCONFIG_ATBM_APOLLO_DEBUG=1
-+CONFIG_ATBM_APOLLO_DEBUG=y
-+endif
-+#####################################################
-+export
-+ifeq ($(CONFIG_MAC80211_ATBM_RC_MINSTREL),)
-+ATBM_WIFI__EXT_CCFLAGS += -DCONFIG_MAC80211_ATBM_RC_MINSTREL=1
-+CONFIG_MAC80211_ATBM_RC_MINSTREL=y
-+endif
-+ifeq ($(CONFIG_MAC80211_ATBM_RC_MINSTREL_HT),)
-+ATBM_WIFI__EXT_CCFLAGS += -DCONFIG_MAC80211_ATBM_RC_MINSTREL_HT=1
-+CONFIG_MAC80211_ATBM_RC_MINSTREL_HT=y
- endif
- 
--ifeq ($(KERNELRELEASE),)
-+ifeq ($(USB_BUS),y)
-+HIF:=usb
-+endif
-+ifeq ($(SDIO_BUS),y)
-+HIF:=sdio
-+endif
-+ifeq ($(SPI_BUS),y)
-+HIF:=spi
-+endif
- 
--all: install strip
-+all: modules install
-+
-+modules: clean
-+	$(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KDIR) M=$(shell pwd) modules -j8
- 
--install:
--	@echo "make PLATFORM_CROSS=$(platform)"
--	$(MAKE) all -f $(MAKEFILE_SUB) ARCH=$(arch) CROSS_COMPILE=$(CROSS_COMPILE) KDIR=$(KERDIR) SYS=$(sys) PLAT=$(platform)
--clean:
--	$(MAKE) -f $(MAKEFILE_SUB) KDIR=$(KERDIR) ARCH=$(arch) clean
- strip:
--	$(MAKE) -f $(MAKEFILE_SUB) KDIR=$(KERDIR) ARCH=$(arch) SYS=$(sys) PLAT=$(platform) strip
--else
--export
--include $(src)/Makefile.build.kernel
--endif
-+	$(CROSS_COMPILE)strip $(WIFI_INSTALL_DIR)/*.ko --strip-unneeded
-+
-+install: modules
-+	mkdir -p $(WIFI_INSTALL_DIR)
-+	chmod 777 $(WIFI_INSTALL_DIR)
-+	cp hal_apollo/*.ko $(WIFI_INSTALL_DIR)
-+
-+clean:
-+	rm -rf hal_apollo/*.o
-+	rm -rf hal_apollo/*.ko  
-+	rm -rf modules.* Module.* 
-+	make -C $(KDIR) M=$(PWD) ARCH=$(ARCH) clean
-+
-+hal_clean:
-+	rm -rf hal_apollo/*.ko
-+	rm -rf hal_apollo/*.o
-+	rm -rf hal_apollo/*.mod.c
-+	rm -rf hal_apollo/*.cmd
diff --git a/general/package/atbm603x/atbm603x.mk b/general/package/atbm603x/atbm603x.mk
index d48c0c82..b420ba0a 100644
--- a/general/package/atbm603x/atbm603x.mk
+++ b/general/package/atbm603x/atbm603x.mk
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# AltoBeam atbm603x wifi driver
+# atbm603x
 #
 ################################################################################
 
@@ -14,12 +14,7 @@ ATBM603X_SOURCE = master.tar.gz
 endif
 
 ATBM603X_LICENSE = GPL-2.0
-
 ATBM603X_MODULE_MAKE_OPTS = \
-	CONFIG_ATBM601x=n \
-	CONFIG_ATBM602x=n \
-	CONFIG_ATBM603x=y \
-	KVER=$(LINUX_VERSION_PROBED) \
 	KSRC=$(LINUX_DIR)
 
 $(eval $(kernel-module))
diff --git a/general/package/atbm6441/Config.in b/general/package/atbm6441/Config.in
new file mode 100644
index 00000000..22c30e2e
--- /dev/null
+++ b/general/package/atbm6441/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_ATBM6441
+	bool "atbm6441"
+	depends on BR2_LINUX_KERNEL
+	help
+	  Wireless driver atbm6441
+
+	  altobeam hare atbm6441 WiFi driver
+
+comment "ATBM6441 needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/general/package/atbm6441/atbm6441.mk b/general/package/atbm6441/atbm6441.mk
new file mode 100644
index 00000000..6dc7104d
--- /dev/null
+++ b/general/package/atbm6441/atbm6441.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# altobeam ATBM6441 WiFi driver
+#
+################################################################################
+
+ifeq ($(LOCAL_DOWNLOAD),y)
+ATBM6441_SITE_METHOD = git
+ATBM6441_SITE = https://github.com/gtxaspec/atbm6441
+ATBM6441_VERSION = $(shell git ls-remote $(ATBM6441_SITE) HEAD | head -1 | cut -f1)
+else
+ATBM6441_SITE = https://github.com/gtxaspec/atbm6441/archive
+ATBM6441_SOURCE = master.tar.gz
+endif
+
+ATBM6441_LICENSE = GPL-2.0
+ATBM6441_MODULE_MAKE_OPTS = \
+	KSRC=$(LINUX_DIR)
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
diff --git a/general/package/datalink/datalink.mk b/general/package/datalink/datalink.mk
index 12f129c4..d42ed6b9 100644
--- a/general/package/datalink/datalink.mk
+++ b/general/package/datalink/datalink.mk
@@ -16,7 +16,7 @@ define DATALINK_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
 	cp $(DATALINK_PKGDIR)/files/datalink.conf $(TARGET_DIR)/etc
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc               
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
 	cp $(DATALINK_PKGDIR)/files/$(DATALINK_FPATH)/telemetry.conf $(TARGET_DIR)/etc
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
@@ -25,6 +25,9 @@ define DATALINK_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	cp $(DATALINK_PKGDIR)/files/$(DATALINK_FPATH)/telemetry $(TARGET_DIR)/usr/bin
 
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
+	cp $(DATALINK_PKGDIR)/files/$(DATALINK_FPATH)/channels.sh $(TARGET_DIR)/usr/sbin
+
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	cp $(DATALINK_PKGDIR)/files/tweaksys $(TARGET_DIR)/usr/bin
 endef
diff --git a/general/package/datalink/files/S98datalink b/general/package/datalink/files/S98datalink
index ed0ae9df..78b6cb74 100755
--- a/general/package/datalink/files/S98datalink
+++ b/general/package/datalink/files/S98datalink
@@ -11,7 +11,6 @@ fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2)
 case "$1" in
   start)
 	if ! [ -f /etc/system.ok ]; then
-		killall majestic
 		tweaksys ${chip}
 	fi
 
diff --git a/general/package/datalink/files/air/channels.sh b/general/package/datalink/files/air/channels.sh
new file mode 100755
index 00000000..8d682316
--- /dev/null
+++ b/general/package/datalink/files/air/channels.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo $1 $2 >> /tmp/channels.log
+
+exit 1
diff --git a/general/package/datalink/files/air/telemetry b/general/package/datalink/files/air/telemetry
index 528a3cc6..be2e192a 100755
--- a/general/package/datalink/files/air/telemetry
+++ b/general/package/datalink/files/air/telemetry
@@ -29,9 +29,9 @@ case "$1" in
 	if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then
 	  /usr/bin/mavlink-routerd &
 	else
-	  mavfwd --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} &
+	  mavfwd --channels ${channels} --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} &
 	fi
-	if [ ${fw} = "fpv" ]; then
+	if [ ${fw} = "fpv" ] || [ ${fw} = "venc" ]; then
 		start_telemetry
 	fi
 	echo "Done."
diff --git a/general/package/datalink/files/air/telemetry.conf b/general/package/datalink/files/air/telemetry.conf
index bf1e5fdc..a0ee64a9 100644
--- a/general/package/datalink/files/air/telemetry.conf
+++ b/general/package/datalink/files/air/telemetry.conf
@@ -18,3 +18,6 @@ fec_n=2
 fec_timeout=0
 guard_interval=long
 one_way=false
+
+### for mavfwd: RC override channels to parse after first 4 and call /usr/sbin/channels.sh $ch $val, default 0
+channels=14
diff --git a/general/package/datalink/files/gs/telemetry b/general/package/datalink/files/gs/telemetry
index 3d456523..4fb097db 100755
--- a/general/package/datalink/files/gs/telemetry
+++ b/general/package/datalink/files/gs/telemetry
@@ -60,7 +60,7 @@ start_all() {
 	if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then
 	  /usr/bin/mavlink-routerd -c /etc/mavlink.conf ${MAVROUTARG} &
 	else
-	  mavfwd --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} &
+    mavfwd --channels ${channels} --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} &
 	fi
 	echo "Done."
 }
diff --git a/general/package/datalink/files/gs/telemetry.conf b/general/package/datalink/files/gs/telemetry.conf
index 705127a1..6918cf63 100644
--- a/general/package/datalink/files/gs/telemetry.conf
+++ b/general/package/datalink/files/gs/telemetry.conf
@@ -18,3 +18,6 @@ fec_n=2
 fec_timeout=0
 guard_interval=long
 one_way=false
+
+### for mavfwd: RC override channels to parse after first 4 and call /usr/sbin/channels.sh $ch $val, default 0
+channels=14
diff --git a/general/package/datalink/files/tweaksys b/general/package/datalink/files/tweaksys
index af3f6bf6..99c50bd8 100755
--- a/general/package/datalink/files/tweaksys
+++ b/general/package/datalink/files/tweaksys
@@ -28,39 +28,45 @@ hisi_goke() {
 all_other() {
   # don't load f2fs module (disabled in kernel)
   sed -i "s!f2fs!#f2fs!g" /etc/modules
-  # disable mavlink routerd autostart
-  sed -i "s!/usr/bin/mavlink-routerd &!#/usr/bin/mavlink-routerd &!g" /etc/init.d/S97mavlink
-  # majestic basic settings
-  cli -s .isp.slowShutter disabled
-  cli -s .isp.drc 350
-  # enable digital image stabilization 
-  # cli -s .isp.dis true
-  cli -s .image.contrast 50
-  cli -s .image.luminance 50
-  cli -s .video0.bitrate 4096
-  cli -s .video0.codec h264
-  cli -s .video0.rcMode cbr
-  cli -s .video0.gopSize 0.2
-  cli -s .hls.enabled false
-  cli -s .netip.enabled false
-  cli -s .jpeg.enabled false
-  # lowdelay support only imx307 sensor
-  if [ ${sensor} = "imx307" ]; then
-	  cli -s .video0.size 1280x720
-	  # cli -s .video0.fps 30
-	  cli -s .isp.lowDelay true
-	  # cli -s .video0.sliceUnits 4
+  if [ -f /usr/bin/mavlink-routerd ]; then
+    # disable mavlink routerd autostart
+    sed -i "s!/usr/bin/mavlink-routerd &!#/usr/bin/mavlink-routerd &!g" /etc/init.d/S97mavlink
   fi
+  if [ -f /usr/bin/majestic ]; then
+    # majestic basic settings
+    cli -s .isp.slowShutter disabled
+    cli -s .isp.drc 350
+    # enable digital image stabilization
+    # cli -s .isp.dis true
+    cli -s .image.contrast 50
+    cli -s .image.luminance 50
+    cli -s .video0.bitrate 4096
+    cli -s .video0.codec h264
+    cli -s .video0.rcMode cbr
+    cli -s .video0.gopSize 0.2
+    cli -s .hls.enabled false
+    cli -s .netip.enabled false
+    cli -s .jpeg.enabled false
+    # lowdelay support only imx307 sensor
+    if [ ${sensor} = "imx307" ]; then
+	    cli -s .video0.size 1280x720
+	    # cli -s .video0.fps 30
+	    cli -s .isp.lowDelay true
+	    # cli -s .video0.sliceUnits 4
+    fi
+# outgoing rtp stream to udp
+cat >> /etc/majestic.yaml << EOF
+outgoing:
+  - udp://127.0.0.1:5600
+EOF
+  fi
+
 # tune socket buffer
 cat >> /etc/sysctl.conf << EOF
 net.core.rmem_default=524288
 net.core.rmem_max=2048000
 EOF
-# add outgoing rtp stream to udp
-cat >> /etc/majestic.yaml << EOF
-outgoing:
-  - udp://127.0.0.1:5600
-EOF
+
   # complete tweaks
   touch /etc/system.ok
   echo "Preparing system done."
diff --git a/general/package/ingenic-osdrv-t31/files/sensor/os03b10.yaml b/general/package/ingenic-osdrv-t31/files/sensor/os03b10.yaml
index 0378b593..8880d84d 100644
--- a/general/package/ingenic-osdrv-t31/files/sensor/os03b10.yaml
+++ b/general/package/ingenic-osdrv-t31/files/sensor/os03b10.yaml
@@ -1,6 +1,6 @@
 sensor:
   name: os03b10
   address: 0x3c
-  width: 2034
+  width: 2304
   height: 1296
   bus: i2c
diff --git a/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk b/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk
index acf07af1..dfa42ab2 100644
--- a/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk
+++ b/general/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk
@@ -27,7 +27,9 @@ define INGENIC_OSDRV_T31_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/sc2232h-t31.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/sc2335-t31.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/sc2336-t31.bin
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/sc3335-t31.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/sc3338-t31.bin
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/sc4236-t31.bin
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T31_PKGDIR)/files/sensor/params/sc5235-t31.bin
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.14__isvp_swan_1.0__/ingenic
diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk
index d0120fd0..daad771d 100644
--- a/general/package/majestic/majestic.mk
+++ b/general/package/majestic/majestic.mk
@@ -14,7 +14,7 @@ MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY)
 MAJESTIC_RELEASE = $(OPENIPC_FLAVOR)
 
 # we don't have Majestic ultimate for these platforms
-MAJESTIC_LIST = hi3516av100 hi3519v101
+MAJESTIC_LIST = hi3516av100 hi3519v101 t21
 
 ifneq ($(filter $(MAJESTIC_LIST),$(MAJESTIC_FAMILY)),)
 	MAJESTIC_RELEASE = lite
diff --git a/general/package/mavfwd/mavfwd.mk b/general/package/mavfwd/mavfwd.mk
index e4cf2438..b16038d2 100644
--- a/general/package/mavfwd/mavfwd.mk
+++ b/general/package/mavfwd/mavfwd.mk
@@ -6,7 +6,7 @@
 
 MAVFWD_SITE_METHOD = git
 MAVFWD_SITE = https://github.com/openipc/mavfwd
-MAVFWD_VERSION = 220d30e118d26008e94445887a03d77ba73c2d29
+MAVFWD_VERSION = c95613e241e03782fc6acc4780e60d8b4316a736
 
 MAVFWD_LICENSE = MIT
 MAVFWD_LICENSE_FILES = LICENSE
@@ -18,8 +18,8 @@ define MAVFWD_BUILD_CMDS
 endef
 
 define MAVFWD_INSTALL_TARGET_CMDS
-    $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
-    $(INSTALL) -m 0755 -D $(@D)/mavfwd $(TARGET_DIR)/usr/sbin/mavfwd
+    $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+    $(INSTALL) -m 0755 -D $(@D)/mavfwd $(TARGET_DIR)/usr/bin/mavfwd
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini b/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini
new file mode 100644
index 00000000..3dbd6ee8
--- /dev/null
+++ b/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini
@@ -0,0 +1,16 @@
+[constants]
+arch = 'arm-openipc'
+abi = 'gnueabihf'
+
+[binaries]
+c = arch + '-linux-' + abi + '-gcc'
+cpp = arch + '-linux-' + abi + '-g++'
+ar = arch + '-linux-'+ abi + '-gcc-ar'
+strip = arch + '-linux-' + abi + '-strip'
+pkgconfig = 'pkg-config'
+
+[host_machine]
+system = 'linux'
+cpu_family = 'arm'
+cpu = 'armv7l'
+endian = 'little'
diff --git a/general/package/mavlink-router/files/meson-cross-arm-openipc.ini b/general/package/mavlink-router/files/meson-cross-arm-musl-openipc.ini
similarity index 100%
rename from general/package/mavlink-router/files/meson-cross-arm-openipc.ini
rename to general/package/mavlink-router/files/meson-cross-arm-musl-openipc.ini
diff --git a/general/package/mavlink-router/files/meson-cross-mipsel-openipc.ini b/general/package/mavlink-router/files/meson-cross-mipsel-musl-openipc.ini
similarity index 100%
rename from general/package/mavlink-router/files/meson-cross-mipsel-openipc.ini
rename to general/package/mavlink-router/files/meson-cross-mipsel-musl-openipc.ini
diff --git a/general/package/mavlink-router/files/prepare.sh b/general/package/mavlink-router/files/prepare.sh
deleted file mode 100755
index ea5412bf..00000000
--- a/general/package/mavlink-router/files/prepare.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-git clone https://github.com/mavlink/c_library_v2.git -b master modules/mavlink_c_library_v2
-
diff --git a/general/package/mavlink-router/mavlink-router.mk b/general/package/mavlink-router/mavlink-router.mk
index 6119349d..01cb9436 100644
--- a/general/package/mavlink-router/mavlink-router.mk
+++ b/general/package/mavlink-router/mavlink-router.mk
@@ -4,21 +4,25 @@
 #
 ################################################################################
 
+MAVLINK_ROUTER_SITE_METHOD = git
+MAVLINK_ROUTER_SITE = https://github.com/mavlink-router/mavlink-router
 MAVLINK_ROUTER_VERSION = 18c06da77563db9ba1b7c4173ff5cae1646b383e
-MAVLINK_ROUTER_SITE = $(call github,mavlink-router,mavlink-router,$(MAVLINK_ROUTER_VERSION))
 MAVLINK_ROUTER_LICENSE = ASF-2.0
 
 MAVLINK_ROUTER_DEPENDENCIES += host-meson host-pkgconf
+MAVLINK_ROUTER_GIT_SUBMODULES = YES
+
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
+MAVLINK_ROUTER_LIBC = glibc
+else
+MAVLINK_ROUTER_LIBC = musl
+endif
 
 MAVLINK_ROUTER_CONF_OPTS += \
 	--buildtype=release \
-	--cross-file $(MAVLINK_ROUTER_PKGDIR)/files/meson-cross-$(ARCH)-openipc.ini
+	--cross-file $(MAVLINK_ROUTER_PKGDIR)/files/meson-cross-$(ARCH)-$(MAVLINK_ROUTER_LIBC)-openipc.ini
 
 define MAVLINK_ROUTER_CONFIGURE_CMDS
-	rm -rf $(@D)/build
-	mkdir -p $(@D)/build
-	cp -f $(MAVLINK_ROUTER_PKGDIR)/files/prepare.sh $(@D)/prepare.sh
-	cd $(@D) ; sh prepare.sh
 	$(TARGET_MAKE_ENV) meson setup $(MAVLINK_ROUTER_CONF_OPTS) $(@D) $(@D)/build
 endef
 
diff --git a/general/package/rtl8189fs-openipc/0001-optimization.patch b/general/package/rtl8189fs-openipc/0001-optimization.patch
deleted file mode 100644
index de1aecac..00000000
--- a/general/package/rtl8189fs-openipc/0001-optimization.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Makefile	2022-10-26 12:12:53.000000000 +0300
-+++ b/Makefile	2022-11-02 23:08:51.607642251 +0300
-@@ -1,5 +1,5 @@
- EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)
--EXTRA_CFLAGS += -O1
-+EXTRA_CFLAGS += -Os
- #EXTRA_CFLAGS += -O3
- #EXTRA_CFLAGS += -Wall
- #EXTRA_CFLAGS += -Wextra
-@@ -88,13 +88,13 @@
- CONFIG_ICMP_VOQ = n
- CONFIG_IP_R_MONITOR = n #arp VOQ and high rate
- ########################## Debug ###########################
--CONFIG_RTW_DEBUG = y
-+CONFIG_RTW_DEBUG = n
- # default log level is _DRV_INFO_ = 4,
- # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
- CONFIG_RTW_LOG_LEVEL = 4
- 
- # enable /proc/net/rtlxxxx/ debug interfaces
--CONFIG_PROC_DEBUG = y
-+CONFIG_PROC_DEBUG = n
- 
- ######################## Wake On Lan ##########################
- CONFIG_WOWLAN = n
diff --git a/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk b/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk
index 74b3a67c..f773f4ba 100644
--- a/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk
+++ b/general/package/rtl8189fs-openipc/rtl8189fs-openipc.mk
@@ -6,10 +6,10 @@
 
 ifeq ($(LOCAL_DOWNLOAD),y)
 RTL8189FS_OPENIPC_SITE_METHOD = git
-RTL8189FS_OPENIPC_SITE = https://github.com/jwrdegoede/rtl8189es_linux
+RTL8189FS_OPENIPC_SITE = https://github.com/openipc/realtek-wlan
 RTL8189FS_OPENIPC_VERSION = $(shell git ls-remote $(RTL8189FS_OPENIPC_SITE) rtl8189fs | head -1 | cut -f1)
 else
-RTL8189FS_OPENIPC_SITE = https://github.com/jwrdegoede/rtl8189es_linux/archive
+RTL8189FS_OPENIPC_SITE = https://github.com/openipc/realtek-wlan/archive
 RTL8189FS_OPENIPC_SOURCE = rtl8189fs.tar.gz
 endif
 
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
index 99b8ddf0..ee451cf6 100755
--- a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# OpenIPC.org | 2023.09.01
+# OpenIPC.org | 2023.10.01
 #
 
 PATH_MODULE=/lib/modules/4.9.84/sigmastar
@@ -20,7 +20,7 @@ set_sensor() {
     gc4653|imx335|sc2239|sc3335|sc3338)
       insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1
       ;;
-    gc2053|sc2335)
+    gc2053|gc2083|sc2335)
       insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1 lane_num=2 hdr_lane_num=2
       ;;
     imx307)
diff --git a/general/package/vdec-openipc/files/S98vdec b/general/package/vdec-openipc/files/S98vdec
new file mode 100755
index 00000000..771712b0
--- /dev/null
+++ b/general/package/vdec-openipc/files/S98vdec
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Start vdec decoder
+#
+
+case "$1" in
+  start)
+    echo "Starting vdec decoder service..."
+    vdec -p 5600 -d frame -c h265 --bg-r 30 --bg-g 0 --bg-b 30 --osd &
+    ;;
+  stop)
+    echo "Stopping vdec decoder service..."
+    kill -9 $(pidof vdec)
+    ;;
+    *)
+    echo "Usage: $0 {start|stop}"
+    exit 1
+esac
diff --git a/general/package/vdec-openipc/files/vdec b/general/package/vdec-openipc/files/vdec
deleted file mode 100755
index 84e08000..00000000
Binary files a/general/package/vdec-openipc/files/vdec and /dev/null differ
diff --git a/general/package/vdec-openipc/vdec-openipc.mk b/general/package/vdec-openipc/vdec-openipc.mk
index b6d7f618..2770339f 100644
--- a/general/package/vdec-openipc/vdec-openipc.mk
+++ b/general/package/vdec-openipc/vdec-openipc.mk
@@ -4,11 +4,16 @@
 #
 ################################################################################
 
+VDEC_OPENIPC_SITE = https://github.com/OpenIPC/silicon_research/releases/download/latest/vdec
+
 VDEC_OPENIPC_LICENSE = MIT
 
 define VDEC_OPENIPC_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
-	cp $(VDEC_OPENIPC_PKGDIR)/files/vdec $(TARGET_DIR)/usr/bin/vdec
+	curl -k -L -o $(@D)/vdec $(VDEC_OPENIPC_SITE)
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/vdec
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
+	cp $(VDEC_OPENIPC_PKGDIR)/files/S98vdec $(TARGET_DIR)/etc/init.d/S98vdec
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/venc-openipc/files/S98venc b/general/package/venc-openipc/files/S98venc
old mode 100644
new mode 100755
index 21e1232a..a0904ac6
--- a/general/package/venc-openipc/files/S98venc
+++ b/general/package/venc-openipc/files/S98venc
@@ -1,60 +1,21 @@
 #!/bin/sh
-
-DAEMON="venc"
-PIDFILE="/var/run/$DAEMON.pid"
-DAEMON_ARGS="-s"
-[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
-load_venc() {
-	[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
-	[ -f /etc/coredump.conf ] && . /etc/coredump.conf
-	if [ "$coredump_enabled" ]; then
-		[ "$(cli -g .watchdog.timeout)" -lt "30" ] && cli -s .watchdog.timeout 30
-		ulimit -c unlimited && echo "|/usr/sbin/sendcoredump.sh" >/proc/sys/kernel/core_pattern
-	fi
-	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" -- $DAEMON_ARGS
-	ln -s /dev/venc /dev/ven
-	/usr/bin/./venc -p 5600 -f 30 -r 7168 -n 1400 -c 265cbr -d frame -v 200_imx307F -s 720p &
-	status=$?
-	if [ "$status" -eq 0 ]; then
-		echo "OK"
-	else
-		echo "FAIL"
-	fi
-	return "$status"
-}
-start() {
-	logger -s -p daemon.info -t $(ipcinfo -v) "Loading video system has started..."
-	export SENSOR=$(fw_printenv -n sensor)
-	load_venc
-}
-stop() {
-	printf 'Stopping %s: ' "$DAEMON"
-	[ -f /usr/bin/$DAEMON ] || echo -en "DISABLED, "
-	start-stop-daemon -K -q -p "$PIDFILE"
-	status=$?
-	if [ "$status" -eq 0 ]; then
-		rm -f "$PIDFILE"
-		echo "OK"
-	else
-		echo "FAIL"
-	fi
-	return "$status"
-}
-
-restart() {
-	stop
-	sleep 1
-	reload
-}
-
-reload() {
-    load_venc
-}
+#
+# Start venc encoder
+#
 
 case "$1" in
-	start|stop|restart|reload)
-		"$1";;
-	*)
-		echo "Usage: $0 {start|stop|restart|reload}"
-		exit 1
+  start)
+    if ! [ -f /dev/ven ]; then
+		ln -s /dev/venc /dev/ven
+    fi
+    echo "Starting venc encoder service..."
+    venc -p 5600 -f 30 -r 7168 -n 1400 -c 265cbr -d frame -v 200_imx307F -s 720p &
+    ;;
+  stop)
+    echo "Stopping venc encoder service..."
+    kill -9 $(pidof venc)
+    ;;
+    *)
+    echo "Usage: $0 {start|stop}"
+    exit 1
 esac
diff --git a/general/package/venc-openipc/files/channels.sh b/general/package/venc-openipc/files/channels.sh
deleted file mode 100644
index 03b69fed..00000000
--- a/general/package/venc-openipc/files/channels.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-echo $1 $2 >>/tmp/channels.log
-
-exit 1
diff --git a/general/package/venc-openipc/files/telemetry b/general/package/venc-openipc/files/telemetry
deleted file mode 100644
index 32c6b645..00000000
--- a/general/package/venc-openipc/files/telemetry
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# Start telemetry
-#
-
-. /etc/datalink.conf
-. /etc/telemetry.conf
-
-keydir="/etc"
-
-fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2)
-
-start_telemetry() {
-  if [ ! -f /usr/bin/telemetry_rx -a ! -f /usr/bin/telemetry_tx ]; then
-	  ln -s /usr/bin/wfb_rx /usr/bin/telemetry_rx ; chmod +x /usr/bin/telemetry_rx
-	  ln -s /usr/bin/wfb_tx /usr/bin/telemetry_tx ; chmod +x /usr/bin/telemetry_tx
-  else
-	if [ ${one_way} = "false" ]; then
-	  telemetry_rx -p ${stream_rx} -u ${port_rx} -K ${keydir}/drone.key -i ${link_id} ${wlan} &
-	fi
-	telemetry_tx -p ${stream_tx} -u ${port_tx} -K ${keydir}/drone.key -B ${bandwidth} -M ${mcs_index} -S ${stbc} -L ${ldpc} -G ${guard_interval} -k ${fec_k} -n ${fec_n} -T ${fec_timeout} -i ${link_id} ${wlan} &
-  fi
-}
-
-case "$1" in
-  start)
-	echo "Loading MAVLink telemetry service..."
-
-	if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then
-	  /usr/bin/mavlink-routerd &
-	else
-	  mavfwd -c 14 --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} &
-	fi
-	echo "Firmware is ${fw}"
-  if [ ${fw} = "fpv" ] || [ ${fw} = "venc" ]; then
-		start_telemetry
-	fi
-	echo "Done."
-	;;
-  stop)
-	echo "Stopping telemetry services..."
-	kill -9 $(pidof telemetry_rx)
-	kill -9 $(pidof telemetry_tx)
-	kill -9 $(pidof mavlink-routerd)
-	kill -9 $(pidof mavfwd)
-	;;
-    *)
-	echo "Usage: $0 {start|stop}"
-	exit 1
-esac
diff --git a/general/package/venc-openipc/files/venc b/general/package/venc-openipc/files/venc
deleted file mode 100755
index fbf30521..00000000
Binary files a/general/package/venc-openipc/files/venc and /dev/null differ
diff --git a/general/package/venc-openipc/venc-openipc.mk b/general/package/venc-openipc/venc-openipc.mk
index a0cfa446..cd0461aa 100644
--- a/general/package/venc-openipc/venc-openipc.mk
+++ b/general/package/venc-openipc/venc-openipc.mk
@@ -4,16 +4,16 @@
 #
 ################################################################################
 
+VENC_OPENIPC_SITE = https://github.com/OpenIPC/silicon_research/releases/download/latest/venc
+
 VENC_OPENIPC_LICENSE = MIT
 
 define VENC_OPENIPC_INSTALL_TARGET_CMDS
-  $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
-	cp $(VENC_OPENIPC_PKGDIR)/files/venc $(TARGET_DIR)/usr/bin/venc
-	cp $(VENC_OPENIPC_PKGDIR)/files/telemetry $(TARGET_DIR)/usr/bin/telemetry
+	curl -k -L -o $(@D)/venc $(VENC_OPENIPC_SITE)
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/venc
+
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	cp $(VENC_OPENIPC_PKGDIR)/files/S98venc $(TARGET_DIR)/etc/init.d/S98venc
-  $(INSTALL) -m 755 -d $(TARGET_DIR)/root
-	cp $(VENC_OPENIPC_PKGDIR)/files/channels.sh $(TARGET_DIR)/root/channels.sh
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/wifibroadcast/files/air/wifibroadcast b/general/package/wifibroadcast/files/air/wifibroadcast
index 21ec896b..a9f62789 100755
--- a/general/package/wifibroadcast/files/air/wifibroadcast
+++ b/general/package/wifibroadcast/files/air/wifibroadcast
@@ -38,7 +38,7 @@ detect_wifi_card() {
   for card in ${devices}
 	do
 	  case "${card}" in
-	  "0bda:8812" | "0bda:881a" | "0b05:17d2" | "2357:0101")
+	  "0bda:8812" | "0bda:881a" | "0b05:17d2" | "2357:0101" | "2604:0012")
 		driver="realtek"
 		modprobe 88XXau rtw_tx_pwr_idx_override=${driver_txpower_override}
 	  ;;
@@ -135,7 +135,7 @@ case "$1" in
 	  fi
 
 	else
-      echo "Wifibroadcast service disabled in wfb.conf..."
+    	    echo "Wifibroadcast service disabled in wfb.conf..."
 	fi
     ;;
   stop)
diff --git a/general/package/wifibroadcast/files/gs/wifibroadcast b/general/package/wifibroadcast/files/gs/wifibroadcast
index 8ea45181..05985bd8 100755
--- a/general/package/wifibroadcast/files/gs/wifibroadcast
+++ b/general/package/wifibroadcast/files/gs/wifibroadcast
@@ -20,7 +20,7 @@ detect_wifi_card() {
   for card in ${devices}
 	do
 	  case "${card}" in
-	  "0bda:8812" | "0bda:881a" | "0b05:17d2" | "2357:0101")
+	  "0bda:8812" | "0bda:881a" | "0b05:17d2" | "2357:0101" | "2604:0012")
 		driver="realtek"
 		modprobe 88XXau rtw_tx_pwr_idx_override=${driver_txpower_override}
 	  ;;