diff --git a/br-ext-chip-goke/board/gk7205v200/gk7202v300.generic.config b/br-ext-chip-goke/board/gk7205v200/gk7202v300.generic.config index a9fe181d..6988d6f2 100644 --- a/br-ext-chip-goke/board/gk7205v200/gk7202v300.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/gk7202v300.generic.config @@ -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 diff --git a/br-ext-chip-goke/board/gk7205v200/gk7205v200.generic.config b/br-ext-chip-goke/board/gk7205v200/gk7205v200.generic.config index 7c153b32..21ef5daa 100644 --- a/br-ext-chip-goke/board/gk7205v200/gk7205v200.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/gk7205v200.generic.config @@ -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 diff --git a/br-ext-chip-goke/board/gk7205v200/gk7205v300.generic.config b/br-ext-chip-goke/board/gk7205v200/gk7205v300.generic.config index 7e5a8dde..49a9f29e 100644 --- a/br-ext-chip-goke/board/gk7205v200/gk7205v300.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/gk7205v300.generic.config @@ -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 diff --git a/br-ext-chip-goke/board/gk7205v200/gk7605v100.generic.config b/br-ext-chip-goke/board/gk7205v200/gk7605v100.generic.config index 1f6915d2..f5c542b8 100644 --- a/br-ext-chip-goke/board/gk7205v200/gk7605v100.generic.config +++ b/br-ext-chip-goke/board/gk7205v200/gk7605v100.generic.config @@ -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 diff --git a/br-ext-chip-goke/board/gk7205v500/gk7201v200.generic.config b/br-ext-chip-goke/board/gk7205v500/gk7201v200.generic.config index 84a7b319..92b095a4 100644 --- a/br-ext-chip-goke/board/gk7205v500/gk7201v200.generic.config +++ b/br-ext-chip-goke/board/gk7205v500/gk7201v200.generic.config @@ -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 diff --git a/br-ext-chip-goke/board/gk7205v500/gk7205v500.generic.config b/br-ext-chip-goke/board/gk7205v500/gk7205v500.generic.config index dc941294..cc0b77c4 100644 --- a/br-ext-chip-goke/board/gk7205v500/gk7205v500.generic.config +++ b/br-ext-chip-goke/board/gk7205v500/gk7205v500.generic.config @@ -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 diff --git a/br-ext-chip-hisilicon/board/hi3516av100/hi3516av100.generic.config b/br-ext-chip-hisilicon/board/hi3516av100/hi3516av100.generic.config index 2ed69a3d..00aead46 100644 --- a/br-ext-chip-hisilicon/board/hi3516av100/hi3516av100.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516av100/hi3516av100.generic.config @@ -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 diff --git a/br-ext-chip-hisilicon/board/hi3516av100/hi3516dv100.generic.config b/br-ext-chip-hisilicon/board/hi3516av100/hi3516dv100.generic.config index 92d30188..2863707a 100644 --- a/br-ext-chip-hisilicon/board/hi3516av100/hi3516dv100.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516av100/hi3516dv100.generic.config @@ -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 diff --git a/br-ext-chip-hisilicon/board/hi3516cv200/hi3518ev200.generic.config b/br-ext-chip-hisilicon/board/hi3516cv200/hi3518ev200.generic.config index 705cf06e..124c922b 100644 --- a/br-ext-chip-hisilicon/board/hi3516cv200/hi3518ev200.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516cv200/hi3518ev200.generic.config @@ -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 diff --git a/br-ext-chip-hisilicon/board/hi3516cv300/hi3516cv300.generic.config b/br-ext-chip-hisilicon/board/hi3516cv300/hi3516cv300.generic.config index 93a10be7..bc99d1bd 100644 --- a/br-ext-chip-hisilicon/board/hi3516cv300/hi3516cv300.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516cv300/hi3516cv300.generic.config @@ -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 diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516dv200.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516dv200.generic.config index c597f89b..95a425e5 100644 --- a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516dv200.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516dv200.generic.config @@ -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 diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev200.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev200.generic.config index 83bf5dde..b1ca7ba4 100644 --- a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev200.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev200.generic.config @@ -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 diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev300.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev300.generic.config index 9bbc3a32..f6e34e61 100644 --- a/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev300.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516ev200/hi3516ev300.generic.config @@ -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 diff --git a/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config b/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config index e71d53da..18ce20ec 100644 --- a/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config +++ b/br-ext-chip-hisilicon/board/hi3516ev200/hi3518ev300.generic.config @@ -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 diff --git a/br-ext-chip-hisilicon/board/hi3519v101/hi3516av200.generic.config b/br-ext-chip-hisilicon/board/hi3519v101/hi3516av200.generic.config index f52abbc2..86a3025e 100644 --- a/br-ext-chip-hisilicon/board/hi3519v101/hi3516av200.generic.config +++ b/br-ext-chip-hisilicon/board/hi3519v101/hi3516av200.generic.config @@ -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 diff --git a/br-ext-chip-ingenic/configs/t10_lite_defconfig b/br-ext-chip-ingenic/configs/t10_lite_defconfig index c94c0d62..a9bdd87f 100644 --- a/br-ext-chip-ingenic/configs/t10_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t10_lite_defconfig @@ -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 diff --git a/br-ext-chip-ingenic/configs/t20_lite_defconfig b/br-ext-chip-ingenic/configs/t20_lite_defconfig index 5125153f..3de6f392 100644 --- a/br-ext-chip-ingenic/configs/t20_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t20_lite_defconfig @@ -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 diff --git a/br-ext-chip-ingenic/configs/t21_lite_defconfig b/br-ext-chip-ingenic/configs/t21_lite_defconfig index 6ed977c3..960a2461 100644 --- a/br-ext-chip-ingenic/configs/t21_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t21_lite_defconfig @@ -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 diff --git a/br-ext-chip-ingenic/configs/t30_lite_defconfig b/br-ext-chip-ingenic/configs/t30_lite_defconfig index 77911b1f..a668d09c 100644 --- a/br-ext-chip-ingenic/configs/t30_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t30_lite_defconfig @@ -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 diff --git a/br-ext-chip-ingenic/configs/t31_lite_defconfig b/br-ext-chip-ingenic/configs/t31_lite_defconfig index 4b83496c..91eeb738 100644 --- a/br-ext-chip-ingenic/configs/t31_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t31_lite_defconfig @@ -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 diff --git a/br-ext-chip-ingenic/configs/t31glibc_lite_defconfig b/br-ext-chip-ingenic/configs/t31glibc_lite_defconfig index 36a77d3d..b6f771bb 100644 --- a/br-ext-chip-ingenic/configs/t31glibc_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t31glibc_lite_defconfig @@ -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 diff --git a/br-ext-chip-ingenic/configs/t40_lite_defconfig b/br-ext-chip-ingenic/configs/t40_lite_defconfig index a146cbeb..9adf727d 100644 --- a/br-ext-chip-ingenic/configs/t40_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t40_lite_defconfig @@ -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 diff --git a/br-ext-chip-ti/configs/dm36x_lite_defconfig b/br-ext-chip-ti/configs/dm36x_lite_defconfig index b64c0c5b..f392a6e8 100644 --- a/br-ext-chip-ti/configs/dm36x_lite_defconfig +++ b/br-ext-chip-ti/configs/dm36x_lite_defconfig @@ -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 diff --git a/general/overlay/etc/init.d/S30customizer b/general/overlay/etc/init.d/S30customizer index b4aa6864..34655932 100755 --- a/general/overlay/etc/init.d/S30customizer +++ b/general/overlay/etc/init.d/S30customizer @@ -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 ;; diff --git a/general/overlay/usr/sbin/extutils b/general/overlay/usr/sbin/extutils index b2fcff84..fad675d9 100755 --- a/general/overlay/usr/sbin/extutils +++ b/general/overlay/usr/sbin/extutils @@ -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" diff --git a/general/overlay/usr/share/openipc/.empty b/general/overlay/usr/share/openipc/sounds/.empty similarity index 100% rename from general/overlay/usr/share/openipc/.empty rename to general/overlay/usr/share/openipc/sounds/.empty diff --git a/general/package/goke-osdrv-gk7205v500/files/script/load_goke b/general/package/goke-osdrv-gk7205v500/files/script/load_goke index 7d5af5eb..af334b20 100755 --- a/general/package/goke-osdrv-gk7205v500/files/script/load_goke +++ b/general/package/goke-osdrv-gk7205v500/files/script/load_goke @@ -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 @@ -93,7 +93,7 @@ insert_isp() { insert_isp_piris() { if [ "${chipid}" == "gk7605v100" -a "${board}" == "demo" ]; then - modprobe xm_piris + modprobe xm_isp_piris fi } @@ -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 @@ -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 @@ -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 diff --git a/general/package/goke-osdrv-gk7205v500/goke-osdrv-gk7205v500.mk b/general/package/goke-osdrv-gk7205v500/goke-osdrv-gk7205v500.mk index 6134e61b..f08d2afb 100644 --- a/general/package/goke-osdrv-gk7205v500/goke-osdrv-gk7205v500.mk +++ b/general/package/goke-osdrv-gk7205v500/goke-osdrv-gk7205v500.mk @@ -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 diff --git a/general/package/quirc-openipc/files/S97qrscan b/general/package/quirc-openipc/files/S97qrscan new file mode 100755 index 00000000..9f19ec5d --- /dev/null +++ b/general/package/quirc-openipc/files/S97qrscan @@ -0,0 +1,9 @@ +#!/bin/sh + +case "$1" in + start) + if [ $(fw_printenv -n wlandev) ]; then + qrscan.sh >/dev/null 2>&1 & + fi + ;; +esac diff --git a/general/package/quirc-openipc/files/qrscan.sh b/general/package/quirc-openipc/files/qrscan.sh new file mode 100755 index 00000000..26128c91 --- /dev/null +++ b/general/package/quirc-openipc/files/qrscan.sh @@ -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 diff --git a/general/package/quirc-openipc/files/ready_48k.pcm b/general/package/quirc-openipc/files/ready_48k.pcm new file mode 100644 index 00000000..d6158250 Binary files /dev/null and b/general/package/quirc-openipc/files/ready_48k.pcm differ diff --git a/general/package/quirc-openipc/quirc-openipc.mk b/general/package/quirc-openipc/quirc-openipc.mk index a6b26f2e..2d813204 100644 --- a/general/package/quirc-openipc/quirc-openipc.mk +++ b/general/package/quirc-openipc/quirc-openipc.mk @@ -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))