From 60059c598b9d56e8852aada5ba2fc3742a60daaf Mon Sep 17 00:00:00 2001 From: Signor Pellegrino <68112357+FlyRouter@users.noreply.github.com> Date: Wed, 10 Apr 2024 08:46:10 +0300 Subject: [PATCH 01/25] [no-ci] Update 4G modem files (#1392) Co-authored-by: Igor Zalatov (from Citadel PC) --- general/overlay/etc/init.d/S40network | 2 ++ general/overlay/etc/network/interfaces.d/eth1 | 1 + general/overlay/etc/wireless/modem | 10 +++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 general/overlay/etc/network/interfaces.d/eth1 diff --git a/general/overlay/etc/init.d/S40network b/general/overlay/etc/init.d/S40network index 44579a10..8f38bdfe 100755 --- a/general/overlay/etc/init.d/S40network +++ b/general/overlay/etc/init.d/S40network @@ -10,6 +10,7 @@ set_wireless() { ifup wlan0 elif $path/modem "$dev"; then ifup usb0 + ifup eth1 fi [ -e /sys/class/net/eth0 ] && ifconfig eth0 "${net:-192.168.2.10}" } @@ -31,6 +32,7 @@ case "$1" in if [ -n "$dev" ]; then ifdown -f wlan0 ifdown -f usb0 + ifdown -f eth1 else ifdown eth0 fi diff --git a/general/overlay/etc/network/interfaces.d/eth1 b/general/overlay/etc/network/interfaces.d/eth1 new file mode 100644 index 00000000..a0fdc5d0 --- /dev/null +++ b/general/overlay/etc/network/interfaces.d/eth1 @@ -0,0 +1 @@ +iface eth1 inet dhcp diff --git a/general/overlay/etc/wireless/modem b/general/overlay/etc/wireless/modem index 7b8a67e2..15a29447 100755 --- a/general/overlay/etc/wireless/modem +++ b/general/overlay/etc/wireless/modem @@ -8,7 +8,15 @@ set_gpio() { # Generic RNDIS if [ "$1" = "rndis-generic" ]; then modprobe rndis_host - sleep 10 + sleep 5 + exit 0 +fi + +# Huawei E3372H and eth1 +if [ "$1" = "rndis-e3372h" ]; then + usb_modeswitch -v 0x12d1 -p 0x1f01 -c /usr/share/usb_modeswitch/12d1:1f0 + modprobe rndis_host + sleep 5 exit 0 fi From da4d3f1d19515e6eb1bd54cc184b545168e55252 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Wed, 10 Apr 2024 07:56:09 +0200 Subject: [PATCH 02/25] Update xiongmai-osdrv-xm530.mk --- .../xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk index c11cef49..3ab57acf 100644 --- a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk +++ b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk @@ -16,14 +16,14 @@ define XIONGMAI_OSDRV_XM530_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/firmware/hevcenc.fwb - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/*.ko - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/usb/*.ko - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/xm711/*.ko + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103/xiongmai + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/*.ko + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/usb/*.ko + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/xm711/*.ko -# Dirty hack - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103+/kernel/net/wireless - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/kernel/net/wireless $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/rewrite/cfg80211.ko + # Dirty hack + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103/kernel/net/wireless + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/kernel/net/wireless $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/rewrite/cfg80211.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/script/load* From cff39157a201653c5a9688fe830e1ceef0356cb1 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Wed, 10 Apr 2024 08:37:07 +0200 Subject: [PATCH 03/25] Package: update load_xiongmai --- .../files/script/load_xiongmai | 169 ++++++++---------- 1 file changed, 74 insertions(+), 95 deletions(-) diff --git a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai index 9ce81686..0b4bdcff 100755 --- a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai +++ b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai @@ -1,46 +1,35 @@ #!/bin/sh -# Useage: ./loadxm530 [ -r|-i|-a ] -# -r : rmmod all modules -# -i : insmod all modules -# default : rmmod all moules and then insmod them -# - chipid=$(ipcinfo --chip-name) +[ "${chipid}" = "xm550" ] && MEM_ALL=128 || MEM_ALL=64 -[ "${chipid}" == "xm550" ] && MEM_ALL=128 || MEM_ALL=64 - +MODULE=/lib/modules/3.10.103/xiongmai MEM_START=0x800 MEM_SAMALL_LIN=0x1 -MEM_OS=`cat /proc/cmdline | awk '{print $1}' | sed -e 's/mem=//' -e 's/M//'` -MEM_LEN=`echo "$MEM_ALL $MEM_OS"|awk '{printf("0x%03x00000",$1-$2)}'` -MEM_START=`echo "$MEM_START $MEM_SAMALL_LIN $MEM_OS"|awk '{printf("0x%03x00000",$1+$2*$3)}'` -echo MEM_START=$MEM_START MEM_LEN=$MEM_LEN - +MEM_OS=$(cat /proc/cmdline | awk '{print $1}' | sed -e 's/mem=//' -e 's/M//') +MEM_LEN=$(echo "$MEM_ALL $MEM_OS"|awk '{printf("0x%03x00000",$1-$2)}') +MEM_START=$(echo "$MEM_START $MEM_SAMALL_LIN $MEM_OS"|awk '{printf("0x%03x00000",$1+$2*$3)}') +echo MEM_START="$MEM_START" MEM_LEN="$MEM_LEN" VI_BUFF=2 -report_error() -{ +report_error() { echo "******* Error: There's something wrong, please check! *****" - exit 1 + exit 1 } -insert_audio() -{ +insert_audio() { echo "insert audio" insmod xm_i2s.ko insmod acodec.ko } -insert_h265() -{ - echo "insert h265" - insmod mve_rsrc.ko - insmod mve_base.ko +insert_h265() { + echo "insert h265" + insmod mve_rsrc.ko + insmod mve_base.ko } -insert_vo() -{ +insert_vo() { regs 20000000 1 regs 20000010 12042d02 regs 20000044 0x2777 @@ -52,50 +41,45 @@ insert_vo() insmod xm530_vdec.ko } -remove_audio() -{ +remove_audio() { echo "remove audio" rmmod -w acodec rmmod -w xm_i2s } -insert_sns() -{ - #Sensor clock 27MHz - #regs 0x2000002c 1; - #regs 0x2000000c 0x10110010; - #regs 0x20000010 0x901F0010; - #regs 0x20000014 0x01120000; - #regs 0x2000002c 0; - #sleep 0.1; - insmod xm_i2c.ko; +insert_sns() { + #Sensor clock 27MHz + #regs 0x2000002c 1; + #regs 0x2000000c 0x10110010; + #regs 0x20000010 0x901F0010; + #regs 0x20000014 0x01120000; + #regs 0x2000002c 0; + #sleep 0.1; + insmod xm_i2c.ko; } -remove_sns() -{ +remove_sns() { rmmod -w xm_i2c &> /dev/null rmmod -w ssp_sony &> /dev/null } -insert_ko() -{ -# driver load - insert_sns > /dev/null - insmod mmz.ko mmz_start=$MEM_START mmz_size=$MEM_LEN - insmod xm530_vi.ko buffer=$VI_BUFF - insmod xm530_isp.ko - insmod xm530_rgn.ko - insmod xm530_h264.ko - insmod xm_rtc.ko - insmod xm_wdt.ko - insmod log.ko - insert_audio - insert_h265 - #insert_vo +insert_ko() { + # driver load + insert_sns > /dev/null + insmod mmz.ko mmz_start="$MEM_START" mmz_size="$MEM_LEN" + insmod xm530_vi.ko buffer=$VI_BUFF + insmod xm530_isp.ko + insmod xm530_rgn.ko + insmod xm530_h264.ko + insmod xm_rtc.ko + insmod xm_wdt.ko + insmod log.ko + insert_audio + insert_h265 + #insert_vo } -remove_ko() -{ +remove_ko() { remove_audio rmmod -w xm_wdt rmmod -w xm_rtc @@ -104,58 +88,53 @@ remove_ko() rmmod -w xm530_isp rmmod -w xm530_vi rmmod -w mmz - remove_sns } make_symlink() { -if [ ! -f /usr/lib/libsns.so ]; then - SNS_TYPE=$(ipcinfo --short-sensor) - logger -s -p daemon.info -t xiongmai "You sensor is $SNS_TYPE and symlink to libsns.so not found" - case $SNS_TYPE in - imx335|sc335e) - logger -s -p daemon.info -t xiongmai "Create new symlink to libsns_X50_XM530.so" - ln -sf /usr/lib/sensors/libsns_X50_XM530.so /usr/lib/libsns.so - ;; - *) - logger -s -p daemon.info -t xiongmai "Create new symlink to libsns_X123_XM530.so" - ln -sf /usr/lib/sensors/libsns_X123_XM530.so /usr/lib/libsns.so - ;; - esac -fi + if [ ! -f /usr/lib/libsns.so ]; then + SNS_TYPE=$(ipcinfo --short-sensor) + logger -s -p daemon.info -t xiongmai "You sensor is $SNS_TYPE and symlink to libsns.so not found" + + case $SNS_TYPE in + imx335|sc335e) + logger -s -p daemon.info -t xiongmai "Create new symlink to libsns_X50_XM530.so" + ln -sf /usr/lib/sensors/libsns_X50_XM530.so /usr/lib/libsns.so + ;; + *) + logger -s -p daemon.info -t xiongmai "Create new symlink to libsns_X123_XM530.so" + ln -sf /usr/lib/sensors/libsns_X123_XM530.so /usr/lib/libsns.so + ;; + esac + fi } -load_usage() -{ - echo "Usage: ./loadxm530 [-option]" - echo "options:" - echo " -i insert modules" - echo " -r remove modules" - echo " -h help information" - echo -e "for example: ./loadxm530 -i\n" +load_usage() { + echo "Usage: $0 [-option]" + echo "options:" + echo " -i insert modules" + echo " -r remove modules" + echo " -h help information" + echo -e "for example: ./loadxm530 -i\n" } # load module. -if [ "$1" = "-i" ] -then -cd /lib/modules/3.10.103\+/xiongmai -insert_ko -make_symlink +if [ "$1" = "-i" ]; then + cd $MODULE + insert_ko + make_symlink fi -if [ "$1" = "-r" ] -then -remove_ko +if [ "$1" = "-r" ]; then + remove_ko fi -if [ "$1" = "-h" ] -then -load_usage -exit +if [ "$1" = "-h" ]; then + load_usage + exit fi -if [ $# -eq 0 ] || [ "$1" = "-a" ] -then -remove_ko -insert_ko +if [ $# -eq 0 ] || [ "$1" = "-a" ]; then + remove_ko + insert_ko fi From f8f1dfcffe21eea15603c695915ed78c8a07576c Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Wed, 10 Apr 2024 16:23:42 +0200 Subject: [PATCH 04/25] [no ci] Package: update mini-snmpd-openipc --- .../package/mini-snmpd-openipc/files/S50snmpd | 49 ++++++---------- .../package/mini-snmpd-openipc/mini-snmpd.mk | 9 +-- general/scripts/legacy/init.d/S50snmpd | 56 ------------------- 3 files changed, 22 insertions(+), 92 deletions(-) delete mode 100755 general/scripts/legacy/init.d/S50snmpd diff --git a/general/package/mini-snmpd-openipc/files/S50snmpd b/general/package/mini-snmpd-openipc/files/S50snmpd index e925ced5..84a00625 100755 --- a/general/package/mini-snmpd-openipc/files/S50snmpd +++ b/general/package/mini-snmpd-openipc/files/S50snmpd @@ -1,57 +1,42 @@ #!/bin/sh -DAEMON="mini-snmpd" +DAEMON="mini_snmpd" PIDFILE="/var/run/$DAEMON.pid" - SNMPD_ARGS="-n -4 -c openipc -i eth0 -D OpenIPC -C https://openipc.org -L Internet -l notice" -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -# The mini-snmpd does not create a pidfile, so pass "-n" in the command line -# and use "-m" to instruct start-stop-daemon to create one. start() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ - -- $SNMPD_ARGS - status=$? - if [ "$status" -eq 0 ]; then + printf "Starting $DAEMON: " + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- $SNMPD_ARGS + if [ $? = 0 ]; then echo "OK" else echo "FAIL" fi - return "$status" } stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, " + printf "Stopping $DAEMON: " start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" + if [ $? = 0 ]; then echo "OK" else echo "FAIL" fi - return "$status" -} - -restart() { - stop - sleep 1 - start } case "$1" in - start|stop|restart) - "$1";; - reload) - # Restart, since there is no true "reload" feature. - restart;; + start|stop) + "$1" + ;; + + restart|reload) + stop + sleep 1 + start + ;; + *) echo "Usage: $0 {start|stop|restart|reload}" exit 1 + ;; esac diff --git a/general/package/mini-snmpd-openipc/mini-snmpd.mk b/general/package/mini-snmpd-openipc/mini-snmpd.mk index c3c432b6..0e238dd5 100644 --- a/general/package/mini-snmpd-openipc/mini-snmpd.mk +++ b/general/package/mini-snmpd-openipc/mini-snmpd.mk @@ -4,18 +4,19 @@ # ################################################################################ -MINI_SNMPD_OPENIPC_VERSION = 1.4 -MINI_SNMPD_OPENIPC_SITE = $(call github,troglobit,mini-snmpd,v$(MINI_SNMPD_OPENIPC_VERSION)) +MINI_SNMPD_OPENIPC_VERSION = v1.4 +MINI_SNMPD_OPENIPC_SITE = $(call github,troglobit,mini-snmpd,$(MINI_SNMPD_OPENIPC_VERSION)) MINI_SNMPD_OPENIPC_LICENSE = GPL-2.0 MINI_SNMPD_OPENIPC_LICENSE_FILES = COPYING MINI_SNMPD_OPENIPC_AUTORECONF = YES define MINI_SNMPD_OPENIPC_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - cp $(MINI_SNMPD_OPENIPC_PKGDIR)/files/S50snmpd $(TARGET_DIR)/etc/init.d + $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(MINI_SNMPD_OPENIPC_PKGDIR)/files/S50snmpd + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/mini_snmpd endef $(eval $(autotools-package)) diff --git a/general/scripts/legacy/init.d/S50snmpd b/general/scripts/legacy/init.d/S50snmpd deleted file mode 100755 index a8fc7959..00000000 --- a/general/scripts/legacy/init.d/S50snmpd +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -DAEMON="mini-snmpd" -PIDFILE="/var/run/$DAEMON.pid" - -SNMPD_ARGS="-n -4 -c openipc -i eth0 -D OpenIPC -C https://openipc.org -L Internet -l notice" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -# The mini-snmpd does not create a pidfile, so pass "-n" in the command line -# and use "-m" to instruct start-stop-daemon to create one. -start() { - printf 'Starting %s: ' "$DAEMON" - [ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, " - # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- $SNMPD_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - [ -f /usr/sbin/$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" -} - -case "$1" in - start|stop) - "$1" - ;; - - restart|reload) - stop - sleep 1 - start - ;; - - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac From 01bb55a3fb617135eb85ba4458454edaae9f8e0b Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Wed, 10 Apr 2024 16:31:32 +0200 Subject: [PATCH 05/25] [no ci] Package: update S50snmpd --- general/package/mini-snmpd-openipc/files/S50snmpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/mini-snmpd-openipc/files/S50snmpd b/general/package/mini-snmpd-openipc/files/S50snmpd index 84a00625..e419eb88 100755 --- a/general/package/mini-snmpd-openipc/files/S50snmpd +++ b/general/package/mini-snmpd-openipc/files/S50snmpd @@ -2,7 +2,7 @@ DAEMON="mini_snmpd" PIDFILE="/var/run/$DAEMON.pid" -SNMPD_ARGS="-n -4 -c openipc -i eth0 -D OpenIPC -C https://openipc.org -L Internet -l notice" +SNMPD_ARGS="-n -4 -c openipc -D OpenIPC -C https://openipc.org -L Internet" start() { printf "Starting $DAEMON: " From 9aafacf4936ad7e42b28c59c1ef88195f814f831 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:03:45 +0200 Subject: [PATCH 06/25] [no ci] Overlay: update wireless usb script --- general/overlay/etc/wireless/usb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb index c383a9ca..5b2c8562 100755 --- a/general/overlay/etc/wireless/usb +++ b/general/overlay/etc/wireless/usb @@ -29,6 +29,12 @@ if [ "$1" = "rtl8733bu-generic" ]; then exit 0 fi +# Generic RTL8812AU +if [ "$1" = "rtl8812au-generic" ]; then + modprobe 88XXau + exit 0 +fi + # Generic ATBM603x if [ "$1" = "atbm603x-generic-usb" ]; then modprobe atbm603x_wifi_usb From d3d1b3f54dab08e2a07d86982285036f03a08043 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:42:04 +0200 Subject: [PATCH 07/25] [no ci] Package: update S50snmpd --- general/package/mini-snmpd-openipc/files/S50snmpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/mini-snmpd-openipc/files/S50snmpd b/general/package/mini-snmpd-openipc/files/S50snmpd index e419eb88..78e3044f 100755 --- a/general/package/mini-snmpd-openipc/files/S50snmpd +++ b/general/package/mini-snmpd-openipc/files/S50snmpd @@ -6,7 +6,7 @@ SNMPD_ARGS="-n -4 -c openipc -D OpenIPC -C https://openipc.org -L Internet" start() { printf "Starting $DAEMON: " - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- $SNMPD_ARGS + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" -- $SNMPD_ARGS if [ $? = 0 ]; then echo "OK" else From 7d36192ef4132d94cbd4d9af3ae2b883c4ed1b95 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:12:58 +0200 Subject: [PATCH 08/25] General: set majestic package to lite (#1395) --- br-ext-chip-goke/configs/gk7205v200_fpv_defconfig | 1 + br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig | 2 +- br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig | 1 + br-ext-chip-goke/configs/gk7205v210_fpv_defconfig | 1 + br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig | 2 +- br-ext-chip-goke/configs/gk7205v300_fpv_defconfig | 1 + br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig | 2 +- br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig | 1 + br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig | 1 - br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig | 1 - br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig | 1 + br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig | 1 - br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig | 1 + br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig | 1 + br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig | 1 + br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig | 1 + br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig | 1 + br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig | 1 + br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig | 1 + br-ext-chip-ingenic/configs/t20_ultimate_defconfig | 1 - br-ext-chip-ingenic/configs/t21_ultimate_defconfig | 1 - br-ext-chip-ingenic/configs/t31_ultimate_defconfig | 1 - br-ext-chip-ingenic/configs/t40_ultimate_defconfig | 1 - br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig | 1 - br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig | 1 - br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig | 1 - br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig | 1 - general/Config.in | 2 +- general/package/majestic/majestic.mk | 2 +- 29 files changed, 18 insertions(+), 16 deletions(-) diff --git a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig index e2cb4d3e..8c825065 100644 --- a/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v200_fpv_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v200" BR2_OPENIPC_SOC_FAMILY="gk7205v200" BR2_OPENIPC_VARIANT="fpv" BR2_OPENIPC_FLASH_SIZE="8" +BR2_OPENIPC_MAJESTIC="fpv" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig index 5997f5b3..9e6820d0 100644 --- a/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig @@ -35,8 +35,8 @@ BR2_OPENIPC_SOC_VENDOR="goke" BR2_OPENIPC_SOC_MODEL="gk7205v200" BR2_OPENIPC_SOC_FAMILY="gk7205v200" BR2_OPENIPC_VARIANT="rubyfpv" -BR2_OPENIPC_MAJESTIC="fpv" BR2_OPENIPC_FLASH_SIZE="8" +BR2_OPENIPC_MAJESTIC="fpv" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig b/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig index f978d2c4..3284a9ea 100644 --- a/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig +++ b/br-ext-chip-goke/configs/gk7205v200_ultimate_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v200" BR2_OPENIPC_SOC_FAMILY="gk7205v200" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="ultimate" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-goke/configs/gk7205v210_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v210_fpv_defconfig index 71c2e9e2..23c2fb2d 100644 --- a/br-ext-chip-goke/configs/gk7205v210_fpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v210_fpv_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v210" BR2_OPENIPC_SOC_FAMILY="gk7205v200" BR2_OPENIPC_VARIANT="fpv" BR2_OPENIPC_FLASH_SIZE="8" +BR2_OPENIPC_MAJESTIC="fpv" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig index 7c4fa875..621ded63 100644 --- a/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig @@ -35,8 +35,8 @@ BR2_OPENIPC_SOC_VENDOR="goke" BR2_OPENIPC_SOC_MODEL="gk7205v210" BR2_OPENIPC_SOC_FAMILY="gk7205v200" BR2_OPENIPC_VARIANT="rubyfpv" -BR2_OPENIPC_MAJESTIC="fpv" BR2_OPENIPC_FLASH_SIZE="8" +BR2_OPENIPC_MAJESTIC="fpv" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig index 4247b4cf..fb1e4b44 100644 --- a/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v300_fpv_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v300" BR2_OPENIPC_SOC_FAMILY="gk7205v200" BR2_OPENIPC_VARIANT="fpv" BR2_OPENIPC_FLASH_SIZE="8" +BR2_OPENIPC_MAJESTIC="fpv" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig index 306b0474..984d709b 100644 --- a/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig @@ -35,8 +35,8 @@ BR2_OPENIPC_SOC_VENDOR="goke" BR2_OPENIPC_SOC_MODEL="gk7205v300" BR2_OPENIPC_SOC_FAMILY="gk7205v200" BR2_OPENIPC_VARIANT="rubyfpv" -BR2_OPENIPC_MAJESTIC="fpv" BR2_OPENIPC_FLASH_SIZE="8" +BR2_OPENIPC_MAJESTIC="fpv" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig b/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig index 089d2e21..7c3034a6 100644 --- a/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig +++ b/br-ext-chip-goke/configs/gk7205v300_ultimate_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="gk7205v300" BR2_OPENIPC_SOC_FAMILY="gk7205v200" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="ultimate" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig index 2155a0f0..67ff8855 100644 --- a/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516av100_ultimate_defconfig @@ -36,7 +36,6 @@ BR2_OPENIPC_SOC_MODEL="hi3516av100" BR2_OPENIPC_SOC_FAMILY="hi3516av100" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig index 50b8b08f..d6416285 100644 --- a/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516av200_ultimate_defconfig @@ -36,7 +36,6 @@ BR2_OPENIPC_SOC_MODEL="hi3516av200" BR2_OPENIPC_SOC_FAMILY="hi3519v101" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig index 70dfb8a4..3d0d2dd1 100644 --- a/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516cv300_ultimate_defconfig @@ -35,6 +35,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516cv300" BR2_OPENIPC_SOC_FAMILY="hi3516cv300" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="ultimate" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig index a0bd6fe5..f08e042d 100644 --- a/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516dv100_ultimate_defconfig @@ -36,7 +36,6 @@ BR2_OPENIPC_SOC_MODEL="hi3516dv100" BR2_OPENIPC_SOC_FAMILY="hi3516av100" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig index a24a857f..290fb886 100644 --- a/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516ev200_fpv_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev200" BR2_OPENIPC_SOC_FAMILY="hi3516ev200" BR2_OPENIPC_VARIANT="fpv" BR2_OPENIPC_FLASH_SIZE="8" +BR2_OPENIPC_MAJESTIC="fpv" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig index b25d0f34..b60737fb 100644 --- a/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516ev200_ultimate_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev200" BR2_OPENIPC_SOC_FAMILY="hi3516ev200" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="ultimate" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig index 52bc263e..678644f7 100644 --- a/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516ev300_fpv_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev300" BR2_OPENIPC_SOC_FAMILY="hi3516ev200" BR2_OPENIPC_VARIANT="fpv" BR2_OPENIPC_FLASH_SIZE="8" +BR2_OPENIPC_MAJESTIC="fpv" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig index 5f78a063..64261c5b 100644 --- a/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516ev300_ultimate_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3516ev300" BR2_OPENIPC_SOC_FAMILY="hi3516ev200" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="ultimate" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig index 42e82fde..09101adb 100644 --- a/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3518ev200_ultimate_defconfig @@ -35,6 +35,7 @@ BR2_OPENIPC_SOC_MODEL="hi3518ev200" BR2_OPENIPC_SOC_FAMILY="hi3516cv200" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="ultimate" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig index 41540e6a..eb07b0c8 100644 --- a/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3518ev300_ultimate_defconfig @@ -36,6 +36,7 @@ BR2_OPENIPC_SOC_MODEL="hi3518ev300" BR2_OPENIPC_SOC_FAMILY="hi3516ev200" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="ultimate" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig index 377bbaf3..d380717a 100644 --- a/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3536dv100_fpv_defconfig @@ -34,6 +34,7 @@ BR2_OPENIPC_SOC_MODEL="hi3536dv100" BR2_OPENIPC_SOC_FAMILY="hi3536dv100" BR2_OPENIPC_VARIANT="fpv" BR2_OPENIPC_FLASH_SIZE="16" +BR2_OPENIPC_MAJESTIC="fpv" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig index d81350cb..cf305ef7 100644 --- a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig @@ -40,7 +40,6 @@ BR2_OPENIPC_SOC_FAMILY="t20" BR2_OPENIPC_SNS_MODEL="" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig index 243a7ccf..6150b7a2 100644 --- a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig @@ -40,7 +40,6 @@ BR2_OPENIPC_SOC_FAMILY="t21" BR2_OPENIPC_SNS_MODEL="" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig index b215d404..623b3370 100644 --- a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig @@ -40,7 +40,6 @@ BR2_OPENIPC_SOC_FAMILY="t31" BR2_OPENIPC_SNS_MODEL="" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig index 6cc91d89..65f9cc07 100644 --- a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig @@ -40,7 +40,6 @@ BR2_OPENIPC_SOC_FAMILY="t40" BR2_OPENIPC_SNS_MODEL="" BR2_OPENIPC_VARIANT="ultimate" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig index bb48d0f5..3458d491 100644 --- a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig @@ -33,7 +33,6 @@ BR2_OPENIPC_SOC_MODEL="ssc30kq" BR2_OPENIPC_SOC_FAMILY="infinity6e" BR2_OPENIPC_VARIANT="fpv" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig index bfa84d0c..412f3ecc 100644 --- a/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc30kq_rubyfpv_defconfig @@ -33,7 +33,6 @@ BR2_OPENIPC_SOC_MODEL="ssc30kq" BR2_OPENIPC_SOC_FAMILY="infinity6e" BR2_OPENIPC_VARIANT="rubyfpv" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig index dea2f4c0..ad909bac 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_fpv_defconfig @@ -33,7 +33,6 @@ BR2_OPENIPC_SOC_MODEL="ssc338q" BR2_OPENIPC_SOC_FAMILY="infinity6e" BR2_OPENIPC_VARIANT="fpv" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig index e781875c..40138615 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_rubyfpv_defconfig @@ -33,7 +33,6 @@ BR2_OPENIPC_SOC_MODEL="ssc338q" BR2_OPENIPC_SOC_FAMILY="infinity6e" BR2_OPENIPC_VARIANT="rubyfpv" BR2_OPENIPC_FLASH_SIZE="16" -BR2_OPENIPC_MAJESTIC="lite" # Filesystem # BR2_TARGET_TZ_INFO is not set diff --git a/general/Config.in b/general/Config.in index 6629e98d..4ed3ac66 100644 --- a/general/Config.in +++ b/general/Config.in @@ -24,6 +24,6 @@ config BR2_OPENIPC_FLASH_SIZE config BR2_OPENIPC_MAJESTIC string "OpenIPC Majestic" - default "" + default "lite" source "$BR2_EXTERNAL_GENERAL_PATH/package/Config.in" diff --git a/general/package/majestic/majestic.mk b/general/package/majestic/majestic.mk index f7db58da..8d3e8df0 100644 --- a/general/package/majestic/majestic.mk +++ b/general/package/majestic/majestic.mk @@ -10,7 +10,7 @@ MAJESTIC_LICENSE = PROPRIETARY MAJESTIC_LICENSE_FILES = LICENSE MAJESTIC_FAMILY = $(OPENIPC_SOC_FAMILY) -MAJESTIC_VARIANT = $(or $(OPENIPC_MAJESTIC), $(OPENIPC_VARIANT)) +MAJESTIC_VARIANT = $(OPENIPC_MAJESTIC) MAJESTIC_DEPENDENCIES += \ libevent-openipc \ From 6e39676b095c136ec4189c4824ecb0d5fd83393a Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:35:14 +0200 Subject: [PATCH 09/25] [no ci] Sigmastar: update kernel module scripts (#1396) --- .../files/script/load_sigmastar | 49 ++++++++--------- .../files/script/load_sigmastar | 51 +++++++++--------- .../files/script/load_sigmastar | 41 +++++++------- .../files/script/load_sigmastar | 53 ++++++++++--------- 4 files changed, 99 insertions(+), 95 deletions(-) diff --git a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar index 48a34eb4..7ee4701d 100755 --- a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar @@ -4,65 +4,66 @@ # PATH_MODULE=/lib/modules/4.9.84/sigmastar -PATH_SENSOR=${PATH_MODULE}/sensor +PATH_SENSOR=$PATH_MODULE/sensor SENSOR=$(fw_printenv -n sensor) detect_sensor() { - insmod ${PATH_SENSOR}/sensor_config.ko + insmod $PATH_SENSOR/sensor_config.ko if [ -e /dev/srcfg ]; then echo srcfg 0 1 0 0 0 0 > /dev/srcfg rmmod sensor_config fi SENSOR=$(ipcinfo -s) - fw_setenv sensor ${SENSOR} + fw_setenv sensor "$SENSOR" } set_sensor() { - case ${SENSOR} in + case $SENSOR in gc2053|imx307) - insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1 + insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1 ;; sc2239|sc2335) [ "$(fw_printenv -n soc)" = "ssc325de" ] && IFACE=parl - insmod ${PATH_SENSOR}/sensor_${SENSOR}_${IFACE:-mipi}.ko chmap=1 + insmod $PATH_SENSOR/sensor_${SENSOR}_${IFACE:-mipi}.ko chmap=1 ;; *) - echo -e "\n\e[1;31mUNSUPPORTED sensor - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC + echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC ;; esac } insert_ko() { - insmod ${PATH_MODULE}/mhal.ko - insmod ${PATH_MODULE}/mi_common.ko - insmod ${PATH_MODULE}/mi_sys.ko logBufSize=256 default_config_path=/usr/bin - insmod ${PATH_MODULE}/mi_rgn.ko - insmod ${PATH_MODULE}/mi_ai.ko - insmod ${PATH_MODULE}/mi_ao.ko - insmod ${PATH_MODULE}/mi_sensor.ko - insmod ${PATH_MODULE}/mi_shadow.ko - insmod ${PATH_MODULE}/mi_divp.ko - insmod ${PATH_MODULE}/mi_vif.ko - insmod ${PATH_MODULE}/mi_vpe.ko - insmod ${PATH_MODULE}/mi_venc.ko + insmod $PATH_MODULE/mhal.ko + insmod $PATH_MODULE/mi_common.ko + insmod $PATH_MODULE/mi_sys.ko logBufSize=256 default_config_path=/usr/bin + insmod $PATH_MODULE/mi_rgn.ko + insmod $PATH_MODULE/mi_ai.ko + insmod $PATH_MODULE/mi_ao.ko + insmod $PATH_MODULE/mi_sensor.ko + insmod $PATH_MODULE/mi_shadow.ko + insmod $PATH_MODULE/mi_divp.ko + insmod $PATH_MODULE/mi_vif.ko + insmod $PATH_MODULE/mi_vpe.ko + insmod $PATH_MODULE/mi_venc.ko } if [ ! -e /sys/module/mhal ]; then insert_ko fi -if [ -z ${SENSOR} ]; then +if [ -z "$1" ] || [ -z "$SENSOR" ]; then echo -e "\n\e[1;33mAutodetect sensor\e[0m\n" | logger -s -t OpenIPC detect_sensor fi -if [ -z ${SENSOR} ]; then +if [ -z "$SENSOR" ]; then echo -e "\n\e[1;31mSensor parameter MISSING\e[0m\n" | logger -s -t OpenIPC exit 1 else - echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC - if [ -e /sys/module/sensor* ]; then - rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4) + echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC + SENSOR_MODULE=$(ls /sys/module | grep $SENSOR) + if [ -n "$SENSOR_MODULE" ]; then + rmmod $SENSOR_MODULE fi set_sensor fi diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar index 2c4f7af1..155a3d53 100755 --- a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar @@ -4,49 +4,49 @@ # PATH_MODULE=/lib/modules/4.9.84/sigmastar -PATH_SENSOR=${PATH_MODULE}/sensor +PATH_SENSOR=$PATH_MODULE/sensor SENSOR=$(fw_printenv -n sensor) detect_sensor() { - insmod ${PATH_SENSOR}/sensor_config.ko + insmod $PATH_SENSOR/sensor_config.ko if [ -e /dev/srcfg ]; then echo srcfg 0 1 0 0 0 0 > /dev/srcfg rmmod sensor_config fi SENSOR=$(ipcinfo -s) - fw_setenv sensor ${SENSOR} + fw_setenv sensor "$SENSOR" } set_sensor() { - case ${SENSOR} in + case $SENSOR in gc2053|gc2083|gc4023|gc4653|imx307|imx335|jxf37|jxq03|os02g10) - insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1 + insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1 ;; sc200ai|sc401ai|sc2239|sc223a|sc2335|sc2336|sc3335|sc3338) - insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1 + insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1 ;; *) - echo -e "\n\e[1;31mUNSUPPORTED sensor - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC + echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC ;; esac } insert_ko() { - insmod ${PATH_MODULE}/mhal.ko - insmod ${PATH_MODULE}/mi_common.ko - insmod ${PATH_MODULE}/mi_sys.ko cmdQBufSize=256 logBufSize=256 - insmod ${PATH_MODULE}/mi_rgn.ko - insmod ${PATH_MODULE}/mi_ai.ko - insmod ${PATH_MODULE}/mi_ao.ko - insmod ${PATH_MODULE}/mi_sensor.ko - insmod ${PATH_MODULE}/mi_shadow.ko - insmod ${PATH_MODULE}/mi_divp.ko - insmod ${PATH_MODULE}/mi_vif.ko - insmod ${PATH_MODULE}/mi_vpe.ko - insmod ${PATH_MODULE}/mi_venc.ko fw_path=/etc/firmware/chagall.bin + insmod $PATH_MODULE/mhal.ko + insmod $PATH_MODULE/mi_common.ko + insmod $PATH_MODULE/mi_sys.ko cmdQBufSize=256 logBufSize=256 + insmod $PATH_MODULE/mi_rgn.ko + insmod $PATH_MODULE/mi_ai.ko + insmod $PATH_MODULE/mi_ao.ko + insmod $PATH_MODULE/mi_sensor.ko + insmod $PATH_MODULE/mi_shadow.ko + insmod $PATH_MODULE/mi_divp.ko + insmod $PATH_MODULE/mi_vif.ko + insmod $PATH_MODULE/mi_vpe.ko + insmod $PATH_MODULE/mi_venc.ko fw_path=/etc/firmware/chagall.bin MAJOR=$(awk '$2=="mi_poll" {print $1}' /proc/devices) - mknod /dev/mi_poll c ${MAJOR} 0 + mknod /dev/mi_poll c "$MAJOR" 0 echo isproot /etc/firmware > /dev/ispmid } @@ -54,18 +54,19 @@ if [ ! -e /sys/module/mhal ]; then insert_ko fi -if [ -z ${SENSOR} ]; then +if [ -z "$1" ] || [ -z "$SENSOR" ]; then echo -e "\n\e[1;33mAutodetect sensor\e[0m\n" | logger -s -t OpenIPC detect_sensor fi -if [ -z ${SENSOR} ]; then +if [ -z "$SENSOR" ]; then echo -e "\n\e[1;31mSensor parameter MISSING\e[0m\n" | logger -s -t OpenIPC exit 1 else - echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC - if [ -e /sys/module/sensor* ]; then - rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4) + echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC + SENSOR_MODULE=$(ls /sys/module | grep $SENSOR) + if [ -n "$SENSOR_MODULE" ]; then + rmmod $SENSOR_MODULE fi set_sensor fi diff --git a/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar index f1732f23..2c964337 100755 --- a/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar @@ -4,40 +4,40 @@ # PATH_MODULE=/lib/modules/5.10.61/sigmastar -PATH_SENSOR=${PATH_MODULE}/sensor +PATH_SENSOR=$PATH_MODULE/sensor SENSOR=$(fw_printenv -n sensor) detect_sensor() { - insmod ${PATH_SENSOR}/sensor_config.ko + insmod $PATH_SENSOR/sensor_config.ko if [ -e /dev/srcfg ]; then echo srcfg 0 1 0 0 0 0 > /dev/srcfg rmmod sensor_config fi SENSOR=$(ipcinfo -s) - fw_setenv sensor ${SENSOR} + fw_setenv sensor "$SENSOR" } set_sensor() { - case ${SENSOR} in + case $SENSOR in sc401ai|sc501ai) - insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1 + insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1 ;; *) - echo -e "\n\e[1;31mUNSUPPORTED sensor - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC + echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC ;; esac } insert_ko() { - insmod ${PATH_MODULE}/mi_common.ko g_ModParamPath=${PATH_MODULE}/param.json config_json_path=/${PATH_MODULE}/config.json - insmod ${PATH_MODULE}/mi_sys.ko - insmod ${PATH_MODULE}/mi_vif.ko - insmod ${PATH_MODULE}/mi_sensor.ko - insmod ${PATH_MODULE}/mi_isp.ko - insmod ${PATH_MODULE}/mi_rgn.ko - insmod ${PATH_MODULE}/mi_scl.ko - insmod ${PATH_MODULE}/mi_vcodec.ko drv_codec40_common.fw_load_path=/etc/firmware/chagall.bin - insmod ${PATH_MODULE}/mi_venc.ko + insmod $PATH_MODULE/mi_common.ko g_ModParamPath=$PATH_MODULE/param.json config_json_path=$PATH_MODULE/config.json + insmod $PATH_MODULE/mi_sys.ko + insmod $PATH_MODULE/mi_vif.ko + insmod $PATH_MODULE/mi_sensor.ko + insmod $PATH_MODULE/mi_isp.ko + insmod $PATH_MODULE/mi_rgn.ko + insmod $PATH_MODULE/mi_scl.ko + insmod $PATH_MODULE/mi_vcodec.ko drv_codec40_common.fw_load_path=/etc/firmware/chagall.bin + insmod $PATH_MODULE/mi_venc.ko echo isproot /etc/firmware > /dev/ispmid } @@ -46,18 +46,19 @@ if [ ! -e /sys/module/mhal ]; then insert_ko fi -if [ -z ${SENSOR} ]; then +if [ -z "$1" ] || [ -z "$SENSOR" ]; then echo -e "\n\e[1;33mAutodetect sensor\e[0m\n" | logger -s -t OpenIPC detect_sensor fi -if [ -z ${SENSOR} ]; then +if [ -z "$SENSOR" ]; then echo -e "\n\e[1;31mSensor parameter MISSING\e[0m\n" | logger -s -t OpenIPC exit 1 else - echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC - if [ -e /sys/module/sensor* ]; then - rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4) + echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC + SENSOR_MODULE=$(ls /sys/module | grep $SENSOR) + if [ -n "$SENSOR_MODULE" ]; then + rmmod $SENSOR_MODULE fi set_sensor fi diff --git a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar index 4cd36854..99520ca9 100755 --- a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar @@ -4,48 +4,48 @@ # PATH_MODULE=/lib/modules/4.9.84/sigmastar -PATH_SENSOR=${PATH_MODULE}/sensor +PATH_SENSOR=$PATH_MODULE/sensor SENSOR=$(fw_printenv -n sensor) detect_sensor() { - insmod ${PATH_SENSOR}/sensor_config.ko + insmod $PATH_SENSOR/sensor_config.ko if [ -e /dev/srcfg ]; then echo srcfg 0 1 0 0 0 0 > /dev/srcfg rmmod sensor_config fi SENSOR=$(ipcinfo -s) - fw_setenv sensor ${SENSOR} + fw_setenv sensor "$SENSOR" } set_sensor() { - case ${SENSOR} in + case $SENSOR in gc2053|gc4653|imx274|imx307|imx335|imx347|imx415|sc501ai|sc8235) - insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1 + insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1 ;; *) - echo -e "\n\e[1;31mUNSUPPORTED sensor - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC + echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC ;; esac } insert_ko() { - insmod ${PATH_MODULE}/mhal.ko - insmod ${PATH_MODULE}/mi_common.ko - insmod ${PATH_MODULE}/mi_sys.ko cmdQBufSize=768 logBufSize=256 - insmod ${PATH_MODULE}/mi_rgn.ko - insmod ${PATH_MODULE}/mi_ldc.ko - insmod ${PATH_MODULE}/mi_ai.ko - insmod ${PATH_MODULE}/mi_ao.ko - insmod ${PATH_MODULE}/mi_mipitx.ko - insmod ${PATH_MODULE}/mi_sensor.ko - insmod ${PATH_MODULE}/mi_shadow.ko - insmod ${PATH_MODULE}/mi_divp.ko - insmod ${PATH_MODULE}/mi_vif.ko - insmod ${PATH_MODULE}/mi_vpe.ko - insmod ${PATH_MODULE}/mi_venc.ko fw_path=/etc/firmware/chagall.bin + insmod $PATH_MODULE/mhal.ko + insmod $PATH_MODULE/mi_common.ko + insmod $PATH_MODULE/mi_sys.ko cmdQBufSize=768 logBufSize=256 + insmod $PATH_MODULE/mi_rgn.ko + insmod $PATH_MODULE/mi_ldc.ko + insmod $PATH_MODULE/mi_ai.ko + insmod $PATH_MODULE/mi_ao.ko + insmod $PATH_MODULE/mi_mipitx.ko + insmod $PATH_MODULE/mi_sensor.ko + insmod $PATH_MODULE/mi_shadow.ko + insmod $PATH_MODULE/mi_divp.ko + insmod $PATH_MODULE/mi_vif.ko + insmod $PATH_MODULE/mi_vpe.ko + insmod $PATH_MODULE/mi_venc.ko fw_path=/etc/firmware/chagall.bin MAJOR=$(awk '$2=="mi_poll" {print $1}' /proc/devices) - mknod /dev/mi_poll c ${MAJOR} 0 + mknod /dev/mi_poll c "$MAJOR" 0 echo isproot /etc/firmware > /dev/ispmid } @@ -53,18 +53,19 @@ if [ ! -e /sys/module/mhal ]; then insert_ko fi -if [ -z ${SENSOR} ]; then +if [ -z "$1" ] || [ -z "$SENSOR" ]; then echo -e "\n\e[1;33mAutodetect sensor\e[0m\n" | logger -s -t OpenIPC detect_sensor fi -if [ -z ${SENSOR} ]; then +if [ -z "$SENSOR" ]; then echo -e "\n\e[1;31mSensor parameter MISSING\e[0m\n" | logger -s -t OpenIPC exit 1 else - echo -e "\n\e[1;32mSensor assigned - ${SENSOR}\e[0m\n" | logger -s -t OpenIPC - if [ -e /sys/module/sensor* ]; then - rmmod $(ls -d /sys/module/sensor* | cut -d/ -f4) + echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC + SENSOR_MODULE=$(ls /sys/module | grep $SENSOR) + if [ -n "$SENSOR_MODULE" ]; then + rmmod $SENSOR_MODULE fi set_sensor fi From 59068092aa0b8f4d31b2eeb6ec8dcab9583e6a15 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Thu, 11 Apr 2024 17:03:34 +0200 Subject: [PATCH 10/25] [no ci] Package: add generic rtl8812au driver --- general/overlay/etc/wireless/usb | 2 +- general/package/Config.in | 1 + general/package/rtl8812au/Config.in | 4 ++++ general/package/rtl8812au/rtl8812au.mk | 16 ++++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 general/package/rtl8812au/Config.in create mode 100644 general/package/rtl8812au/rtl8812au.mk diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb index 5b2c8562..aa2076a5 100755 --- a/general/overlay/etc/wireless/usb +++ b/general/overlay/etc/wireless/usb @@ -31,7 +31,7 @@ fi # Generic RTL8812AU if [ "$1" = "rtl8812au-generic" ]; then - modprobe 88XXau + modprobe 8812au exit 0 fi diff --git a/general/package/Config.in b/general/package/Config.in index 5fbb71ed..3a386082 100644 --- a/general/package/Config.in +++ b/general/package/Config.in @@ -78,6 +78,7 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/osd-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/quirc-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rcjoystick/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rockchip-osdrv-rv11xx/Config.in" +source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8812au/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8188eus-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8188fu-openipc/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/rtl8188fu-openipc/Config.in" diff --git a/general/package/rtl8812au/Config.in b/general/package/rtl8812au/Config.in new file mode 100644 index 00000000..4fec8536 --- /dev/null +++ b/general/package/rtl8812au/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_RTL8812AU + bool "rtl8812au" + help + Standalone driver for the RTL8812AU. diff --git a/general/package/rtl8812au/rtl8812au.mk b/general/package/rtl8812au/rtl8812au.mk new file mode 100644 index 00000000..2085a0ea --- /dev/null +++ b/general/package/rtl8812au/rtl8812au.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# rtl8812au +# +################################################################################ + +RTL8812AU_SITE = $(call github,openipc,realtek-wlan,$(RTL8812AU_VERSION)) +RTL8812AU_VERSION = rtl8812au + +RTL8812AU_MODULE_MAKE_OPTS = \ + CONFIG_RTL8812AU=m \ + KVER=$(LINUX_VERSION_PROBED) \ + KSRC=$(LINUX_DIR) + +$(eval $(kernel-module)) +$(eval $(generic-package)) From 77cd76e81f6ec07cb63dfa08901091d1d7cc1fa5 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:40:07 +0200 Subject: [PATCH 11/25] [no ci] Package: minor fpv script cleanup --- general/package/datalink/files/S98datalink | 5 +---- general/package/wifibroadcast/files/wifibroadcast | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/general/package/datalink/files/S98datalink b/general/package/datalink/files/S98datalink index c23da340..083a7950 100755 --- a/general/package/datalink/files/S98datalink +++ b/general/package/datalink/files/S98datalink @@ -24,18 +24,15 @@ case "$1" in if [ "$fw" = "lte" ]; then if [ "$usb_modem" = "true" ]; then echo "Starting lte modem configuration..." - echo "ToDo: Running usb_modeswitch or other shit here..." fi - # for the future - #cli -s .outgoing.url1 udp://$gs_ipaddr:$gs_port if [ "$use_zt" = "true" ]; then echo "Starting ZeroTier-One daemon..." /usr/sbin/zerotier-one -d & if [ ! -f "/var/lib/zerotier-one/networks.d/$zt_netid.conf" ]; then sleep 8 zerotier-cli join "$zt_netid" > /dev/null - echo "Don't forget authorize in the my.zerotier.com!" + echo "Don't forget to authorize my.zerotier.com!" fi fi diff --git a/general/package/wifibroadcast/files/wifibroadcast b/general/package/wifibroadcast/files/wifibroadcast index 2b973ff7..68135cb2 100755 --- a/general/package/wifibroadcast/files/wifibroadcast +++ b/general/package/wifibroadcast/files/wifibroadcast @@ -97,8 +97,8 @@ load_interface() { iwconfig "$wlan" channel "$channel" fi - # dirty fix crash if txpower set. setting txpower disabled because patched driver always set txpower level 58 - # iw dev $wlan set txpower fixed $(($txpower * 100)) + # Set txpower + #iw dev $wlan set txpower fixed $(($txpower * 100)) } start_drone_wfb() { From 02585c788fb7ba3b3406a72af6e96d5f1781c373 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:48:03 +0200 Subject: [PATCH 12/25] [no ci] Overlay: update network script --- general/overlay/etc/init.d/S40network | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/general/overlay/etc/init.d/S40network b/general/overlay/etc/init.d/S40network index 8f38bdfe..086e0858 100755 --- a/general/overlay/etc/init.d/S40network +++ b/general/overlay/etc/init.d/S40network @@ -29,13 +29,10 @@ case "$1" in stop) echo "Stopping network..." ifdown lo - if [ -n "$dev" ]; then - ifdown -f wlan0 - ifdown -f usb0 - ifdown -f eth1 - else - ifdown eth0 - fi + ifdown -f wlan0 + ifdown -f usb0 + ifdown -f eth1 + ifdown -f eth0 ;; restart) From d07507f395b28e3cbcefcf21866ec376866b0eb4 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:26:17 +0200 Subject: [PATCH 13/25] [no ci] Overlay: adjust flag names for customizer scripts --- general/overlay/etc/init.d/S30customizer | 4 ++-- general/package/datalink/files/S98datalink | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/general/overlay/etc/init.d/S30customizer b/general/overlay/etc/init.d/S30customizer index e6c22af6..70e56e12 100755 --- a/general/overlay/etc/init.d/S30customizer +++ b/general/overlay/etc/init.d/S30customizer @@ -2,10 +2,10 @@ case "$1" in start) - if [ ! -e /etc/system.ok ] && [ -e /usr/share/openipc/customizer.sh ]; then + if [ ! -e /etc/custom.ok ] && [ -e /usr/share/openipc/customizer.sh ]; then echo "Run customizer script..." sh /usr/share/openipc/customizer.sh - touch /etc/system.ok + touch /etc/custom.ok fi if [ ! -e /etc/network.ok ] && [ -e /usr/share/openipc/wireless.sh ]; then diff --git a/general/package/datalink/files/S98datalink b/general/package/datalink/files/S98datalink index 083a7950..6de4a924 100755 --- a/general/package/datalink/files/S98datalink +++ b/general/package/datalink/files/S98datalink @@ -16,7 +16,7 @@ case "$1" in exit 0 fi - if ! [ -f /etc/system.ok ]; then + if [ ! -f /etc/system.ok ]; then tweaksys "$chip" fi From fb6dd6a4d8619606b73e4c6ac41dcc63e7f01811 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:43:33 +0200 Subject: [PATCH 14/25] [no ci] Overlay: adjust wireless script --- general/overlay/etc/wireless/usb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb index aa2076a5..5b2c8562 100755 --- a/general/overlay/etc/wireless/usb +++ b/general/overlay/etc/wireless/usb @@ -31,7 +31,7 @@ fi # Generic RTL8812AU if [ "$1" = "rtl8812au-generic" ]; then - modprobe 8812au + modprobe 88XXau exit 0 fi From b098c99c2f02acf04b7180efd430f834523c9447 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:56:01 +0200 Subject: [PATCH 15/25] [no ci] General: adjust tweaksys fpv script --- general/package/datalink/files/tweaksys | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/general/package/datalink/files/tweaksys b/general/package/datalink/files/tweaksys index 507e2609..babd9ca9 100755 --- a/general/package/datalink/files/tweaksys +++ b/general/package/datalink/files/tweaksys @@ -114,7 +114,8 @@ streamer() { finish() { # complete tweaks and add marker touch /etc/system.ok - echo "Manually restart the system to apply changes." + echo "Restart system to apply fpv changes..." + reboot } case "$1" in From c3a69061aef6716c10cfa56dd1819f52750a497d Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Fri, 12 Apr 2024 16:19:27 +0200 Subject: [PATCH 16/25] [no ci] XM: revert recent path changes (#1397) --- .../board/xm530/kernel/xm530.generic.config | 2 +- .../xiongmai-osdrv-xm530/files/script/load_xiongmai | 2 +- .../xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/br-ext-chip-xiongmai/board/xm530/kernel/xm530.generic.config b/br-ext-chip-xiongmai/board/xm530/kernel/xm530.generic.config index 6b70c3cd..4596e8f6 100644 --- a/br-ext-chip-xiongmai/board/xm530/kernel/xm530.generic.config +++ b/br-ext-chip-xiongmai/board/xm530/kernel/xm530.generic.config @@ -28,7 +28,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y # CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="+" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_LZMA=y diff --git a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai index 0b4bdcff..bfb85516 100755 --- a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai +++ b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai @@ -2,7 +2,7 @@ chipid=$(ipcinfo --chip-name) [ "${chipid}" = "xm550" ] && MEM_ALL=128 || MEM_ALL=64 -MODULE=/lib/modules/3.10.103/xiongmai +MODULE=/lib/modules/3.10.103+/xiongmai MEM_START=0x800 MEM_SAMALL_LIN=0x1 diff --git a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk index 3ab57acf..5eb842b3 100644 --- a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk +++ b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk @@ -16,14 +16,14 @@ define XIONGMAI_OSDRV_XM530_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/firmware $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/firmware $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/firmware/hevcenc.fwb - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103/xiongmai - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/*.ko - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/usb/*.ko - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/xm711/*.ko + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/*.ko + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/usb/*.ko + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/xiongmai $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/xm711/*.ko # Dirty hack - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103/kernel/net/wireless - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103/kernel/net/wireless $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/rewrite/cfg80211.ko + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.10.103+/kernel/net/wireless + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.10.103+/kernel/net/wireless $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/kmod/rewrite/cfg80211.ko $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(XIONGMAI_OSDRV_XM530_PKGDIR)/files/script/load* From e9cf0d9e6f3cdf81c3846a943ed88f0dfca29285 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:07:11 +0200 Subject: [PATCH 17/25] [no ci] General: add debug messages to datalink console setup --- general/package/datalink/files/S98datalink | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/general/package/datalink/files/S98datalink b/general/package/datalink/files/S98datalink index 6de4a924..7c798e85 100755 --- a/general/package/datalink/files/S98datalink +++ b/general/package/datalink/files/S98datalink @@ -1,6 +1,5 @@ #!/bin/sh chip=$(ipcinfo -c) -skip=$(fw_printenv -n fpv) fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2) if [ -e /etc/datalink.conf ]; then @@ -9,10 +8,13 @@ fi case "$1" in start) - if [ "$skip" = "true" ]; then - sed -i "s/console/#console/g" /etc/inittab - elif [ "$skip" = "false" ]; then - sed -i "s/#console/console/g" /etc/inittab + if [ "$(fw_printenv -n fpv)" = "false" ]; then + if grep -q "#console" /etc/inittab; then + echo "Restart system to restore console..." + sed -i "s/#console/console/g" /etc/inittab + rm -f /etc/system.ok + reboot + fi exit 0 fi From 416fe58d46075f11c1b942413947bc3fa40b95fe Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Fri, 12 Apr 2024 19:12:45 +0200 Subject: [PATCH 18/25] [no ci] Package: sync fpv scripts --- general/package/datalink/files/S98datalink | 2 +- general/package/datalink/files/tweaksys | 21 +++--- general/package/rubyfpv/files/tweaksys | 86 ++++++++++++---------- 3 files changed, 56 insertions(+), 53 deletions(-) diff --git a/general/package/datalink/files/S98datalink b/general/package/datalink/files/S98datalink index 7c798e85..7c9ac3a9 100755 --- a/general/package/datalink/files/S98datalink +++ b/general/package/datalink/files/S98datalink @@ -10,9 +10,9 @@ case "$1" in start) if [ "$(fw_printenv -n fpv)" = "false" ]; then if grep -q "#console" /etc/inittab; then - echo "Restart system to restore console..." sed -i "s/#console/console/g" /etc/inittab rm -f /etc/system.ok + echo "Restart system to restore console..." reboot fi exit 0 diff --git a/general/package/datalink/files/tweaksys b/general/package/datalink/files/tweaksys index babd9ca9..3c03b749 100755 --- a/general/package/datalink/files/tweaksys +++ b/general/package/datalink/files/tweaksys @@ -11,9 +11,6 @@ basic() { # set boot delay fw_setenv bootdelay 0 - # don't load f2fs module (disabled in kernel) - sed -i "s!f2fs!#f2fs!g" /etc/modules - # free uart for telemetry sed -i "s!console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!#console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!g" /etc/inittab @@ -51,8 +48,8 @@ sigmastar() { } majestic_generic() { - # enable digital image stabilization - # cli -s .isp.dis true + # digital image stabilization + #cli -s .isp.dis true cli -s .isp.slowShutter disabled cli -s .image.contrast 50 @@ -67,7 +64,7 @@ majestic_generic() { # lowdelay support only imx307 sensor if [ "$sensor" = "imx307" ]; then cli -s .isp.lowDelay true - # cli -s .video0.sliceUnits 4 + #cli -s .video0.sliceUnits 4 fi if [ "$sensor" = "imx335" ]; then @@ -98,7 +95,7 @@ streamer() { majestic_generic fi - # outgoing rtp stream to udp + # outgoing rtp stream cli -s .outgoing.enabled true cli -s .outgoing.server udp://127.0.0.1:5600 fi @@ -112,10 +109,10 @@ streamer() { } finish() { - # complete tweaks and add marker + # complete tweaks and add flag + fw_setenv wlandev touch /etc/system.ok - echo "Restart system to apply fpv changes..." - reboot + echo "Manually restart the system to apply changes." } case "$1" in @@ -125,7 +122,7 @@ case "$1" in # set custom config if [ "$chip" = "gk7205v200" ] && [ "$sensor" = "imx307" ]; then echo "switch to custom sensor config" - # cli -s .isp.sensorConfig /etc/sensors/60fps/720p_imx307_i2c_2l.ini + #cli -s .isp.sensorConfig /etc/sensors/60fps/720p_imx307_i2c_2l.ini fi # fix osmem in bootargs @@ -136,7 +133,7 @@ case "$1" in fw_setenv osmem 40M fi - # remove unneeded to reduce some memory + # remove unneeded scripts rm -f /etc/init.d/S60crond /etc/init.d/S49ntpd /etc/init.d/S02klogd basic diff --git a/general/package/rubyfpv/files/tweaksys b/general/package/rubyfpv/files/tweaksys index 57ee9fe6..3c03b749 100755 --- a/general/package/rubyfpv/files/tweaksys +++ b/general/package/rubyfpv/files/tweaksys @@ -1,19 +1,17 @@ #!/bin/sh - chip=$(ipcinfo -c) family=$(ipcinfo -f) vendor=$(ipcinfo -v) -if ! [ ${chip} = "hi3536dv100" ]; then +if [ ! "$chip" = "hi3536dv100" ]; then sensor=$(ipcinfo -s) fi basic() { # set boot delay fw_setenv bootdelay 0 - # don't load f2fs module (disabled in kernel) - sed -i "s!f2fs!#f2fs!g" /etc/modules - # freely uart for telemetry + + # free uart for telemetry sed -i "s!console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!#console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!g" /etc/inittab # tune socket buffer @@ -23,19 +21,21 @@ basic() { prefix=${family} hisi_goke() { - if [ ${vendor} = "hisilicon" ]; then + if [ "$vendor" = "hisilicon" ]; then prefix="open" fi + # remove unneeded modules - sed -i "s!insmod ${prefix}_rgn.ko!#insmod ${prefix}_rgn.ko!g" /usr/bin/load_${vendor} - sed -i "s!insmod ${prefix}_jpege.ko!#insmod ${prefix}_jpege.ko!g" /usr/bin/load_${vendor} - sed -i "s!insmod ${prefix}_ive.ko save_power=0!#insmod ${prefix}_ive.ko save_power=0!g" /usr/bin/load_${vendor} - sed -i "s!insmod ${prefix}_aio.ko!#insmod ${prefix}_aio.ko!g" /usr/bin/load_${vendor} - sed -i "s!insmod ${prefix}_ai.ko!#insmod ${prefix}_ai.ko!g" /usr/bin/load_${vendor} - sed -i "s!insmod ${prefix}_ao.ko!#insmod ${prefix}_ao.ko!g" /usr/bin/load_${vendor} - sed -i "s!insmod ${prefix}_aenc.ko!#insmod ${prefix}_aenc.ko!g" /usr/bin/load_${vendor} - sed -i "s!insmod ${prefix}_adec.ko!#insmod ${prefix}_adec.ko!g" /usr/bin/load_${vendor} - sed -i "s!insmod ${prefix}_acodec.ko!#insmod ${prefix}_acodec.ko!g" /usr/bin/load_${vendor} + sed -i "s!insmod ${prefix}_rgn.ko!#insmod ${prefix}_rgn.ko!g" "/usr/bin/load_${vendor}" + sed -i "s!insmod ${prefix}_jpege.ko!#insmod ${prefix}_jpege.ko!g" "/usr/bin/load_${vendor}" + sed -i "s!insmod ${prefix}_ive.ko save_power=0!#insmod ${prefix}_ive.ko save_power=0!g" "/usr/bin/load_${vendor}" + sed -i "s!insmod ${prefix}_aio.ko!#insmod ${prefix}_aio.ko!g" "/usr/bin/load_${vendor}" + sed -i "s!insmod ${prefix}_ai.ko!#insmod ${prefix}_ai.ko!g" "/usr/bin/load_${vendor}" + sed -i "s!insmod ${prefix}_ao.ko!#insmod ${prefix}_ao.ko!g" "/usr/bin/load_${vendor}" + sed -i "s!insmod ${prefix}_aenc.ko!#insmod ${prefix}_aenc.ko!g" "/usr/bin/load_${vendor}" + sed -i "s!insmod ${prefix}_adec.ko!#insmod ${prefix}_adec.ko!g" "/usr/bin/load_${vendor}" + sed -i "s!insmod ${prefix}_acodec.ko!#insmod ${prefix}_acodec.ko!g" "/usr/bin/load_${vendor}" + # change fps 25 -> 30 sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/imx307_i2c_2l_1080p.ini sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini @@ -48,9 +48,10 @@ sigmastar() { } majestic_generic() { + # digital image stabilization + #cli -s .isp.dis true + cli -s .isp.slowShutter disabled - # enable digital image stabilization - # cli -s .isp.dis true cli -s .image.contrast 50 cli -s .image.luminance 50 cli -s .video0.size 1920x1080 @@ -59,24 +60,27 @@ majestic_generic() { cli -s .video0.codec h264 cli -s .video0.rcMode cbr cli -s .video0.gopSize 1.5 + # lowdelay support only imx307 sensor - if [ ${sensor} = "imx307" ]; then + if [ "$sensor" = "imx307" ]; then cli -s .isp.lowDelay true - # cli -s .video0.sliceUnits 4 + #cli -s .video0.sliceUnits 4 fi - if [ ${sensor} = "imx335" ]; then + + if [ "$sensor" = "imx335" ]; then cli -s .isp.drc 350 cli -s .isp.sensorConfig /etc/sensors/imx335_i2c_4M.ini fi + cli -s .hls.enabled false cli -s .netip.enabled false cli -s .jpeg.enabled false } majestic_sigmastar() { - cli -s .isp.exposure 20 - cli -s .isp.aGain 40 cli -s .isp.sensorConfig /etc/sensors/imx415_fpv.bin + cli -s .isp.exposure 10 + cli -s .video0.codec h265 cli -s .video0.size 1920x1080 cli -s .video0.fps 60 cli -s .video0.rcMode cbr @@ -85,18 +89,19 @@ majestic_sigmastar() { streamer() { if [ -f /usr/bin/majestic ]; then - if [ ${vendor} = "sigmastar" ]; then + if [ "$vendor" = "sigmastar" ]; then majestic_sigmastar else majestic_generic fi - # outgoing rtp stream to udp + + # outgoing rtp stream cli -s .outgoing.enabled true cli -s .outgoing.server udp://127.0.0.1:5600 fi if [ -f /usr/bin/venc ]; then - if [ ${sensor} = "imx335" ]; then + if [ "$sensor" = "imx335" ]; then sed -i "s!version=200_imx307B!version=300_imx335B!g" /etc/venc.conf sed -i "s!size=720p!size=1292x972!g" /etc/venc.conf fi @@ -104,30 +109,31 @@ streamer() { } finish() { - # complete tweaks and add marker + # complete tweaks and add flag + fw_setenv wlandev touch /etc/system.ok - echo "Preparing system done." - reboot + echo "Manually restart the system to apply changes." } case "$1" in gk7205v200 | gk7205v210 | hi3516ev200) echo "Preparing system tweaks for ${chip}..." + # set custom config - if [ ${chip} = "gk7205v200" ] && [ ${sensor} = "imx307" ]; then + if [ "$chip" = "gk7205v200" ] && [ "$sensor" = "imx307" ]; then echo "switch to custom sensor config" - # cli -s .isp.sensorConfig /etc/sensors/60fps/720p_imx307_i2c_2l.ini + #cli -s .isp.sensorConfig /etc/sensors/60fps/720p_imx307_i2c_2l.ini fi # fix osmem in bootargs bootargs=$(fw_printenv -n bootargs) - if echo ${bootargs} | grep -q "32M"; then - newbootargs="mem=\${osmem} "$(echo ${bootargs} | cut -d " " -f2-) - fw_setenv bootargs ${newbootargs} + if echo "$bootargs" | grep -q "32M"; then + newbootargs="mem=\${osmem} "$(echo "$bootargs" | cut -d " " -f2-) + fw_setenv bootargs "$newbootargs" fw_setenv osmem 40M fi - # remove unneeded to reduce some memory + # remove unneeded scripts rm -f /etc/init.d/S60crond /etc/init.d/S49ntpd /etc/init.d/S02klogd basic @@ -137,13 +143,13 @@ case "$1" in ;; gk7205v300 | hi3516ev300) - echo "Preparing system tweaks for ${chip}..." + echo "Preparing system tweaks for $chip..." # increase osmem - mem=$(fw_printenv -n osmem) && [ "${mem}" = "32M" ] && fw_setenv osmem 64M && set_allocator cma || echo "Memory allocated for the system:" ${mem} + mem=$(fw_printenv -n osmem) && [ "$mem" = "32M" ] && fw_setenv osmem 64M && set_allocator cma || echo "Memory allocated for the system:" "$mem" # set sensor config for smtsec board - if [ ${chip} = "gk7205v300" ] && [ ${sensor} = "imx307" ]; then + if [ "$chip" = "gk7205v300" ] && [ "$sensor" = "imx307" ]; then cli -s .isp.sensorConfig /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini fi @@ -154,19 +160,19 @@ case "$1" in ;; t31l | t31n | t31x | t31zx) - echo "Preparing system tweaks for ${chip}..." + echo "Preparing system tweaks for $chip..." basic streamer finish ;; hi3536dv100) - echo "Preparing system tweaks for ${chip}..." + echo "Preparing system tweaks for $chip..." finish ;; ssc33x) - echo "Preparing system tweaks for ${chip}..." + echo "Preparing system tweaks for $chip..." basic sigmastar streamer From 3ad6d32d63f8571a959fcd956d02e2bb14cf4149 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Fri, 12 Apr 2024 19:15:05 +0200 Subject: [PATCH 19/25] [no ci] Package: minor fpv script fixup --- general/package/datalink/files/tweaksys | 3 ++- general/package/rubyfpv/files/tweaksys | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/general/package/datalink/files/tweaksys b/general/package/datalink/files/tweaksys index 3c03b749..fd6ecf83 100755 --- a/general/package/datalink/files/tweaksys +++ b/general/package/datalink/files/tweaksys @@ -112,7 +112,8 @@ finish() { # complete tweaks and add flag fw_setenv wlandev touch /etc/system.ok - echo "Manually restart the system to apply changes." + echo "Restart system to apply fpv changes..." + reboot } case "$1" in diff --git a/general/package/rubyfpv/files/tweaksys b/general/package/rubyfpv/files/tweaksys index 3c03b749..fd6ecf83 100755 --- a/general/package/rubyfpv/files/tweaksys +++ b/general/package/rubyfpv/files/tweaksys @@ -112,7 +112,8 @@ finish() { # complete tweaks and add flag fw_setenv wlandev touch /etc/system.ok - echo "Manually restart the system to apply changes." + echo "Restart system to apply fpv changes..." + reboot } case "$1" in From 8258a883ca6c9984b882b667780387b6411e8a48 Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Sat, 13 Apr 2024 08:36:44 +0200 Subject: [PATCH 20/25] [no ci] Overlay: adjust usb wireless script --- general/overlay/etc/wireless/usb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb index 5b2c8562..65dfbb41 100755 --- a/general/overlay/etc/wireless/usb +++ b/general/overlay/etc/wireless/usb @@ -31,7 +31,7 @@ fi # Generic RTL8812AU if [ "$1" = "rtl8812au-generic" ]; then - modprobe 88XXau + modprobe 88XXau rtw_ht_enable=0 rtw_led_enable=0 exit 0 fi From 81f751d1438ca95f3929294fdd17dab8fc306e81 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Sun, 14 Apr 2024 00:19:00 +0200 Subject: [PATCH 21/25] [no ci] Sigmastar: update infinity6e makefile --- .../files/sensor/kmod/sensor_imx335_mipi.ko | Bin 0 -> 22400 bytes .../files/sensor/kmod/sensor_imx415_mipi.ko | Bin 0 -> 28816 bytes .../sigmastar-osdrv-infinity6e.mk | 3 +++ 3 files changed, 3 insertions(+) create mode 100644 general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx335_mipi.ko create mode 100644 general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx415_mipi.ko diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx335_mipi.ko b/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx335_mipi.ko new file mode 100644 index 0000000000000000000000000000000000000000..a5ac740acf37f8cce108c6b84b29fa14f18216b4 GIT binary patch literal 22400 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 B3Nruz literal 0 HcmV?d00001 diff --git a/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk b/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk index daebe319..7c9904ec 100644 --- a/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk +++ b/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk @@ -13,6 +13,9 @@ define SIGMASTAR_OSDRV_INFINITY6E_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/kmod/* + $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.84/sigmastar/sensor + $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar/sensor $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensor/kmod/* + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/firmware $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/firmware $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensor/firmware/* From 300ce1412609b2e3b9a50e2f60add4a124683997 Mon Sep 17 00:00:00 2001 From: Signor Pellegrino <68112357+FlyRouter@users.noreply.github.com> Date: Sun, 14 Apr 2024 23:53:04 +0300 Subject: [PATCH 22/25] [no-ci] Update modem, fix typo (#1398) --- general/overlay/etc/wireless/modem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/overlay/etc/wireless/modem b/general/overlay/etc/wireless/modem index 15a29447..fc188ad9 100755 --- a/general/overlay/etc/wireless/modem +++ b/general/overlay/etc/wireless/modem @@ -14,7 +14,7 @@ fi # Huawei E3372H and eth1 if [ "$1" = "rndis-e3372h" ]; then - usb_modeswitch -v 0x12d1 -p 0x1f01 -c /usr/share/usb_modeswitch/12d1:1f0 + usb_modeswitch -v 0x12d1 -p 0x1f01 -c /usr/share/usb_modeswitch/12d1:1f01 modprobe rndis_host sleep 5 exit 0 From dcad60a46e51dbdd9d62747098172833cc2db7aa Mon Sep 17 00:00:00 2001 From: Signor Pellegrino <68112357+FlyRouter@users.noreply.github.com> Date: Mon, 15 Apr 2024 01:01:47 +0300 Subject: [PATCH 23/25] Update tapip, fix set_routes counter (#1399) --- general/package/vtund-openipc/files/tapip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/general/package/vtund-openipc/files/tapip b/general/package/vtund-openipc/files/tapip index a9703a91..a767b647 100755 --- a/general/package/vtund-openipc/files/tapip +++ b/general/package/vtund-openipc/files/tapip @@ -24,6 +24,6 @@ case "$1" in renew|bound) ip a add "$ip/$subnet" dev "$interface" - [ -n "$staticroutes" ] && set_routes "$staticroutes" + [ -n "$staticroutes" ] && set_routes $staticroutes ;; esac From 2e6f6f304cc305f6fc7ec745d73e6d2404cb251e Mon Sep 17 00:00:00 2001 From: viktorxda <35473052+viktorxda@users.noreply.github.com> Date: Tue, 16 Apr 2024 13:13:12 +0200 Subject: [PATCH 24/25] [no ci] Datalink: adjust telemetry script (#1400) --- general/package/datalink/files/S98datalink | 10 ---- general/package/datalink/files/telemetry | 53 ++++++++++--------- general/package/datalink/files/tweaksys | 4 +- .../package/wifibroadcast/files/wifibroadcast | 3 ++ 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/general/package/datalink/files/S98datalink b/general/package/datalink/files/S98datalink index 7c9ac3a9..8e15241b 100755 --- a/general/package/datalink/files/S98datalink +++ b/general/package/datalink/files/S98datalink @@ -8,16 +8,6 @@ fi case "$1" in start) - if [ "$(fw_printenv -n fpv)" = "false" ]; then - if grep -q "#console" /etc/inittab; then - sed -i "s/#console/console/g" /etc/inittab - rm -f /etc/system.ok - echo "Restart system to restore console..." - reboot - fi - exit 0 - fi - if [ ! -f /etc/system.ok ]; then tweaksys "$chip" fi diff --git a/general/package/datalink/files/telemetry b/general/package/datalink/files/telemetry index 647dbb2f..88a8b9df 100755 --- a/general/package/datalink/files/telemetry +++ b/general/package/datalink/files/telemetry @@ -1,47 +1,50 @@ #!/bin/sh -# -# Start telemetry -# - -. /etc/datalink.conf -. /etc/telemetry.conf - -keydir="/etc" fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2) +keydir=/etc -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 +if [ -e /etc/datalink.conf ]; then + . /etc/datalink.conf +fi + +if [ -e /etc/telemetry.conf ]; then + . /etc/telemetry.conf +fi + +if [ ! -f /usr/bin/telemetry_rx ] && [ ! -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 fi start_drone_telemetry() { - if [ ${one_way} = "false" ]; then - telemetry_rx -p ${stream_rx} -u ${port_rx} -K ${keydir}/${unit}.key -i ${link_id} ${wlan} > /dev/null & + if [ "$one_way" = "false" ]; then + telemetry_rx -p "$stream_rx" -u "$port_rx" -K "$keydir/$unit.key" -i "$link_id" "$wlan" > /dev/null & fi - telemetry_tx -p ${stream_tx} -u ${port_tx} -K ${keydir}/${unit}.key -B ${bandwidth} \ - -M ${mcs_index} -S ${stbc} -L ${ldpc} -G ${guard_interval} -k ${fec_k} -n ${fec_n} \ - -T ${pool_timeout} -i ${link_id} -f ${frame_type} ${wlan} > /dev/null & + telemetry_tx -p "$stream_tx" -u "$port_tx" -K "$keydir/$unit.key" -B "$bandwidth" \ + -M "$mcs_index" -S "$stbc" -L "$ldpc" -G "$guard_interval" -k "$fec_k" -n "$fec_n" \ + -T "$pool_timeout" -i "$link_id" -f "$frame_type" "$wlan" > /dev/null & } start_gs_telemetry() { - if [ ${one_way} = "false" ]; then - telemetry_tx -p ${stream_tx} -u ${port_tx} -K ${keydir}/${unit}.key -B ${bandwidth} \ - -M ${mcs_index} -S ${stbc} -L ${ldpc} -G ${guard_interval} -k ${fec_k} -n ${fec_n} \ - -T ${pool_timeout} -i ${link_id} -f ${frame_type} ${wlan} > /dev/null & + if [ "$one_way" = "false" ]; then + telemetry_tx -p "$stream_tx" -u "$port_tx" -K "$keydir/$unit.key" -B "$bandwidth" \ + -M "$mcs_index" -S "$stbc" -L "$ldpc" -G "$guard_interval" -k "$fec_k" -n "$fec_n" \ + -T "$pool_timeout" -i "$link_id" -f "$frame_type" "$wlan" > /dev/null & fi - telemetry_rx -p ${stream_rx} -u ${port_rx} -K ${keydir}/${unit}.key -i ${link_id} ${wlan} > /dev/null & + telemetry_rx -p "$stream_rx" -u "$port_rx" -K "$keydir/$unit.key" -i "$link_id" "$wlan" > /dev/null & } case "$1" in start) echo "Loading MAVLink telemetry service..." - if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then + if [ "$router" -eq 1 ] || [ "$fw" = "lte" ]; then mavlink-routerd -c /etc/mavlink.conf > /dev/null 2>&1 & else - mavfwd --channels ${channels} --master ${serial} --baudrate ${baud} \ - --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} > /dev/null & + mavfwd --channels "$channels" --master "$serial" --baudrate "$baud" \ + --out 127.0.0.1:$port_tx --in 127.0.0.1:$port_rx > /dev/null & fi - if [ ${fw} = "fpv" ] || [ ${fw} = "venc" ]; then + if [ "$fw" = "fpv" ] || [ "$fw" = "venc" ]; then start_${unit}_telemetry fi echo "Done." diff --git a/general/package/datalink/files/tweaksys b/general/package/datalink/files/tweaksys index fd6ecf83..f9bebb49 100755 --- a/general/package/datalink/files/tweaksys +++ b/general/package/datalink/files/tweaksys @@ -43,8 +43,8 @@ hisi_goke() { } sigmastar() { - sed -i "s!serial=/dev/ttyAMA0!serial=/dev/ttyS0!g" /etc/telemetry.conf - sed -i "s!Device = /dev/ttyAMA0!Device = /dev/ttyS0!g" /etc/mavlink.conf + sed -i "s!serial=/dev/ttyAMA0!serial=/dev/ttyS2!g" /etc/telemetry.conf + sed -i "s!Device = /dev/ttyAMA0!Device = /dev/ttyS2!g" /etc/mavlink.conf } majestic_generic() { diff --git a/general/package/wifibroadcast/files/wifibroadcast b/general/package/wifibroadcast/files/wifibroadcast index 68135cb2..cc6f584a 100755 --- a/general/package/wifibroadcast/files/wifibroadcast +++ b/general/package/wifibroadcast/files/wifibroadcast @@ -135,6 +135,9 @@ case "$1" in if [ "$chip" = "gk7205v200" ]; then # UART2_RX mux devmem 0x120c0010 32 0x1e04 + elif [ "$chip" = "ssc33x" ]; then + # UART2 + devmem 0x1F207890 16 0x8 fi telemetry start fi From 32303b058ec1c06085d51a454c93945c07c92dd6 Mon Sep 17 00:00:00 2001 From: Viktor <35473052+viktorxda@users.noreply.github.com> Date: Tue, 16 Apr 2024 13:28:00 +0200 Subject: [PATCH 25/25] [no ci] Datalink: minor tweaksys cleanup --- general/package/datalink/files/tweaksys | 1 - 1 file changed, 1 deletion(-) diff --git a/general/package/datalink/files/tweaksys b/general/package/datalink/files/tweaksys index f9bebb49..343c7832 100755 --- a/general/package/datalink/files/tweaksys +++ b/general/package/datalink/files/tweaksys @@ -174,7 +174,6 @@ case "$1" in ssc33x) echo "Preparing system tweaks for $chip..." - basic sigmastar streamer finish