Skip to content

Commit

Permalink
some fixes & improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
cronyx committed Feb 19, 2025
1 parent fcae598 commit 1f6e80f
Show file tree
Hide file tree
Showing 32 changed files with 94 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
# CONFIG_MTD_UBI_GLUEBI is not set
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_MTD_UBI_BLOCK=y
CONFIG_DTC=y
CONFIG_OF=y
Expand Down
1 change: 0 additions & 1 deletion br-ext-chip-ingenic/configs/t10_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,5 @@ BR2_PACKAGE_MAJESTIC=y
BR2_PACKAGE_MBEDTLS_OPENIPC=y
BR2_PACKAGE_OPUS_OPENIPC=y
BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_QUIRC_OPENIPC=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
1 change: 0 additions & 1 deletion br-ext-chip-ingenic/configs/t20_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,5 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y
BR2_PACKAGE_MOTORS=y
BR2_PACKAGE_OPUS_OPENIPC=y
BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_QUIRC_OPENIPC=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
1 change: 0 additions & 1 deletion br-ext-chip-ingenic/configs/t21_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,5 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y
BR2_PACKAGE_MOTORS=y
BR2_PACKAGE_OPUS_OPENIPC=y
BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_QUIRC_OPENIPC=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
1 change: 0 additions & 1 deletion br-ext-chip-ingenic/configs/t30_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,5 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y
BR2_PACKAGE_MOTORS=y
BR2_PACKAGE_OPUS_OPENIPC=y
BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_QUIRC_OPENIPC=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
1 change: 0 additions & 1 deletion br-ext-chip-ingenic/configs/t31_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,5 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y
BR2_PACKAGE_MOTORS=y
BR2_PACKAGE_OPUS_OPENIPC=y
BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_QUIRC_OPENIPC=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
1 change: 0 additions & 1 deletion br-ext-chip-ingenic/configs/t31glibc_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,5 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y
BR2_PACKAGE_MOTORS=y
BR2_PACKAGE_OPUS_OPENIPC=y
BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_QUIRC_OPENIPC=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
1 change: 0 additions & 1 deletion br-ext-chip-ingenic/configs/t40_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,5 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y
BR2_PACKAGE_MOTORS=y
BR2_PACKAGE_OPUS_OPENIPC=y
BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y
BR2_PACKAGE_QUIRC_OPENIPC=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
1 change: 0 additions & 1 deletion br-ext-chip-ti/configs/dm36x_lite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,5 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y
BR2_PACKAGE_MAJESTIC_WEBUI=y
BR2_PACKAGE_MBEDTLS_OPENIPC=y
BR2_PACKAGE_MOTORS=y
BR2_PACKAGE_QUIRC_OPENIPC=y
BR2_PACKAGE_VTUND_OPENIPC=y
BR2_PACKAGE_YAML_CLI=y
5 changes: 5 additions & 0 deletions general/overlay/etc/init.d/S30customizer
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ case "$1" in
touch /etc/network.ok
fi

if [ -e /usr/share/openipc/muxes.sh ]; then
echo "Run custom muxes & gpios preset script..."
sh /usr/share/openipc/muxes.sh
fi

check_mac
;;

Expand Down
2 changes: 1 addition & 1 deletion general/overlay/usr/sbin/extutils
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ case "$CMD" in
echo -e " $(lsusb | awk '{print $6}' | sort | tr '\n' ' ')\n"
echo "Memory:"
echo -e " totalmem - $(fw_printenv -n totalmem)"
echo -e " osmem - $(fw_printenv -n osmem)\n"
echo -e " osmem - $(fw_printenv -n osmem || echo 'not set')\n"
echo "Processor:"
echo -e " detected - $(ipcinfo -ci | tr '\n' '\t')"
echo -e " recorded - $(fw_printenv -n soc)\n"
Expand Down
File renamed without changes.
46 changes: 23 additions & 23 deletions general/package/goke-osdrv-gk7205v500/files/script/load_goke
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ insert_detect() {
insert_osal
insmod xm_base.ko
modprobe xm_isp
modprobe xm_sensor_i2c
modprobe xm_sensor_spi
modprobe xm_isp_sensor_i2c
modprobe xm_isp_sensor_spi
}

remove_detect() {
rmmod -w xm_sensor_spi
rmmod -w xm_sensor_i2c
rmmod -w xm_isp_sensor_spi
rmmod -w xm_isp_sensor_i2c
rmmod -w xm_isp
rmmod -w xm_base
rmmod -w xm_osal >/dev/null 2>&1
Expand Down Expand Up @@ -93,7 +93,7 @@ insert_isp() {

insert_isp_piris() {
if [ "${chipid}" == "gk7605v100" -a "${board}" == "demo" ]; then
modprobe xm_piris
modprobe xm_isp_piris
fi
}

Expand All @@ -111,8 +111,8 @@ insert_ko() {
insmod xm_vi.ko
insert_isp
insmod xm_vpss.ko
# insmod xm_vo.ko # unused on XmIPC
# insmod gfbg.ko video="gfbg:vram0_size:1620" # unused on XmIPC # default fb0:D1
# insmod xm_vo.ko # unused on XmIPC
# insmod gfbg.ko video="gfbg:vram0_size:1620" # unused on XmIPC # default fb0:D1
insmod xm_chnl.ko
insmod xm_vedu.ko
insmod xm_rc.ko
Expand All @@ -121,24 +121,24 @@ insert_ko() {
insmod xm_h265e.ko
insmod xm_jpege.ko
insmod xm_ive.ko save_power=0
modprobe xm_pwm
modprobe xm_sensor_i2c
modprobe xm_sensor_spi
# insert_isp_piris # unused on XmIPC
# insert_sil9024; # unused on XmIPC # BT1120
modprobe xm_isp_pwm
modprobe xm_isp_sensor_i2c
modprobe xm_isp_sensor_spi
# insert_isp_piris # unused on XmIPC
# insert_sil9024; # unused on XmIPC # BT1120
insert_audio
modprobe xm_mipi_rx
# insmod xm_pm.ko # unused on XmIPC
modprobe xm_wdt
# insmod xm_pm.ko # unused on XmIPC
# modprobe xm_wdt # temporarily disabled
}

remove_ko() {
rmmod -w xm_wdt
# rmmod -w xm_pm # unused on XmIPC
# rmmod -w xm_wdt
# rmmod -w xm_pm
remove_audio
rmmod -w xm_mipi_rx
# rmmod -w xm_piris # unused on XmIPC
# rmmod -w sil9024 &> /dev/null # unused on XmIPC
# rmmod -w xm_isp_piris
# rmmod -w sil9024 &> /dev/null
rmmod -w xm_ive
rmmod -w xm_rc
rmmod -w xm_jpege
Expand All @@ -147,17 +147,17 @@ remove_ko() {
rmmod -w xm_venc
rmmod -w xm_vedu
rmmod -w xm_chnl
# rmmod -w gfbg # unused on XmIPC
# rmmod -w xm_vo # unused on XmIPC
# rmmod -w gfbg
# rmmod -w xm_vo
rmmod -w xm_vpss
rmmod -w xm_isp
rmmod -w xm_vi
rmmod -w xm_vgs
rmmod -w xm_rgn
# rmmod -w xm_tde
rmmod -w xm_sensor_i2c &>/dev/null
rmmod -w xm_sensor_spi &>/dev/null
rmmod -w xm_pwm
rmmod -w xm_isp_sensor_i2c &>/dev/null
rmmod -w xm_isp_sensor_spi &>/dev/null
rmmod -w xm_isp_pwm
rmmod -w xm_sys
rmmod -w xm_base
rmmod -w xm_osal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ define GOKE_OSDRV_GK7205V500_INSTALL_TARGET_CMDS
# $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(GOKE_OSDRV_GK7205V500_PKGDIR)/files/sensor/libsns_sp2305.so

$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib
## $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(GOKE_OSDRV_GK7205V500_PKGDIR)/files/lib/*
# $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(GOKE_OSDRV_GK7205V500_PKGDIR)/files/lib/*
# $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(GOKE_OSDRV_GK7205V500_PKGDIR)/files/lib/libaac_comm.so
# $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(GOKE_OSDRV_GK7205V500_PKGDIR)/files/lib/libaac_dec.so
# $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib $(GOKE_OSDRV_GK7205V500_PKGDIR)/files/lib/libaac_enc.so
Expand Down
9 changes: 9 additions & 0 deletions general/package/quirc-openipc/files/S97qrscan
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

case "$1" in
start)
if [ $(fw_printenv -n wlandev) ]; then
qrscan.sh >/dev/null 2>&1 &
fi
;;
esac
31 changes: 31 additions & 0 deletions general/package/quirc-openipc/files/qrscan.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/sh

if [ -e /usr/share/openipc/gpio.conf ]; then
. /usr/share/openipc/gpio.conf
fi

gpio=${led1}

n=0

gpio toggle ${gpio} | logger -t gpio

while true ; do
if [ "$n" -ge 30 ]; then
logger -t qrscan "Recognition timeout exceeded, reboot camera and try again..."
gpio toggle ${gpio} | logger -t gpio
exit 1
fi
timeout 1 wget -q -O /tmp/image.jpg http://127.0.0.1/image.jpg
data=$(qrscan -p /tmp/image.jpg)
if [[ -n "$data" ]] && $(echo "$data" | grep -q wlan); then
fw_setenv $(echo $data | cut -d " " -f 1 | sed 's/=/ /')
fw_setenv $(echo $data | cut -d " " -f 2 | sed 's/=/ /')
logger -t qrscan "Recognition successfully, wlanssid and wlanpass is writed to env. Reboot required."
curl --data-binary @/usr/share/openipc/sounds/ready_48k.pcm http://localhost/play_audio
for a in $(seq 10) ; do (gpio toggle ${gpio} ; sleep 0.3 ; gpio toggle ${gpio} ; sleep 0.3) ; done >/dev/null 2>&1
reboot -f
fi
sleep 1
n=$((n + 1))
done
Binary file not shown.
9 changes: 9 additions & 0 deletions general/package/quirc-openipc/quirc-openipc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@ endef
define QUIRC_OPENIPC_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/qrscan

$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(QUIRC_OPENIPC_PKGDIR)/files/qrscan.sh

$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(QUIRC_OPENIPC_PKGDIR)/files/S97qrscan

$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/share/openipc/sounds
$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/openipc/sounds $(QUIRC_OPENIPC_PKGDIR)/files/ready_48k.pcm
endef

$(eval $(generic-package))

0 comments on commit 1f6e80f

Please sign in to comment.