diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efa66aa4..5d8515d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,46 +22,12 @@ jobs: strategy: fail-fast: false matrix: - platform: - - hi3516cv100 - - hi3518cv100 - - hi3518ev100 - - hi3516av100 - - hi3516dv100 - - hi3516cv200 - - hi3518ev200 - - hi3519v101 - - hi3516av200 - - hi3516cv300 - - hi3516ev100 - - hi3516cv500 - - hi3516dv300 - - hi3516av300 - - hi3516ev200 - - hi3516ev300 - - hi3518ev300 - - hi3516dv200 - - hi3536cv100 - - hi3536dv100 - - gk7205v200 - - gk7205v210 - - gk7205v300 - - gk7202v300 - - gk7605v100 - - t20 - - t31 - - t40 - - release: - - lite - - ultimate - include: - # Sigmastar infinity6 + # Sigmastar [I6] - {"platform": "ssc325", "release": "lite"} - {"platform": "ssc325de", "release": "lite"} - # Sigmastar infinity6b0 + # Sigmastar [I6B] - {"platform": "ssc333", "release": "lite"} - {"platform": "ssc333", "release": "ultimate"} - {"platform": "ssc335", "release": "lite"} @@ -73,135 +39,128 @@ jobs: - {"platform": "ssc337de", "release": "lite"} - {"platform": "ssc337de", "release": "ultimate"} - # Sigmastar infinity6c + # Sigmastar [I6C] - {"platform": "ssc377", "release": "lite"} - # Sigmastar infinity6e + # Sigmastar [I6E] - {"platform": "ssc30kd", "release": "lite"} - {"platform": "ssc30kd", "release": "ultimate"} + - {"platform": "ssc30kq", "release": "fpv"} - {"platform": "ssc30kq", "release": "lite"} - {"platform": "ssc30kq", "release": "ultimate"} - {"platform": "ssc338q", "release": "fpv"} - {"platform": "ssc338q", "release": "lite"} - {"platform": "ssc338q", "release": "ultimate"} - - platform: hi3518ev200 - release: mini - - platform: hi3516cv300 - release: mini - - platform: hi3516ev200 - release: fpv - - platform: hi3516ev300 - release: fpv - - platform: gk7205v200 - release: fpv - - platform: gk7205v210 - release: fpv - - platform: gk7205v300 - release: fpv - - platform: hi3516ev200 - release: lte - - platform: hi3516ev300 - release: lte - - platform: hi3536dv100 - release: fpv - - platform: gk7205v200 - release: lte - - platform: gk7205v300 - release: lte - - platform: gk7205v200 - release: venc - - platform: gk7205v210 - release: venc - - platform: gk7205v300 - release: venc + # Ingenic [T21] + - {"platform": "t10", "release": "lite"} + - {"platform": "t20", "release": "lite"} + - {"platform": "t20", "release": "ultimate"} + - {"platform": "t21", "release": "lite"} + - {"platform": "t21", "release": "ultimate"} + - {"platform": "t30", "release": "lite"} - # MVP - - platform: fh8852v100 - release: lite - - platform: fh8852v200 - release: lite - - platform: gm8136 - release: lite - - platform: nt98562 - release: lite - - platform: nt98566 - release: lite - - platform: rv1109 - release: lite - - platform: rv1126 - release: lite - - platform: t10 - release: lite - - platform: t21 - release: lite - - platform: t30 - release: lite - - platform: xm510 - release: lite - - platform: xm530 - release: lite - - platform: xm550 - release: lite + # Ingenic [T31] + - {"platform": "t31", "release": "lite"} + - {"platform": "t31", "release": "ultimate"} - # TODO - - platform: ak3916ev300 - release: lite - custom: onlyci - - platform: ak3918ev300 - release: lite - custom: onlyci - - platform: dm36x - release: lite - custom: onlyci - - platform: gk7102 - release: lite - - platform: gk7102s - release: lite - - platform: msc313e - release: lite - custom: onlyci - - platform: msc316dc - release: lite - custom: onlyci - - platform: msc316dm - release: lite - custom: onlyci - - platform: s3l - release: lite - custom: onlyci + # Ingenic [T40] + - {"platform": "t40", "release": "lite"} + - {"platform": "t40", "release": "ultimate"} - exclude: - - platform: hi3516cv100 - release: ultimate - - platform: hi3518cv100 - release: ultimate - - platform: hi3518ev100 - release: ultimate - - platform: hi3516cv200 - release: ultimate - - platform: hi3519v101 - release: ultimate - - platform: hi3516ev100 - release: ultimate - - platform: hi3516cv500 - release: ultimate - - platform: hi3516dv300 - release: ultimate - - platform: hi3516av300 - release: ultimate - - platform: hi3516dv200 - release: ultimate - - platform: hi3536cv100 - release: ultimate - - platform: hi3536dv100 - release: ultimate - - platform: gk7605v100 - release: ultimate - - platform: gk7205v210 - release: ultimate - - platform: gk7202v300 - release: ultimate + # Hisilicon [HI3516AV100] + - {"platform": "hi3516av100", "release": "lite"} + - {"platform": "hi3516av100", "release": "ultimate"} + - {"platform": "hi3516dv100", "release": "lite"} + - {"platform": "hi3516dv100", "release": "ultimate"} + + # Hisilicon [HI3516CV100] + - {"platform": "hi3516cv100", "release": "lite"} + - {"platform": "hi3518cv100", "release": "lite"} + - {"platform": "hi3518ev100", "release": "lite"} + + # Hisilicon [HI3516CV200] + - {"platform": "hi3516cv200", "release": "lite"} + - {"platform": "hi3518ev200", "release": "mini"} + - {"platform": "hi3518ev200", "release": "lite"} + - {"platform": "hi3518ev200", "release": "ultimate"} + + # Hisilicon [HI3516CV300] + - {"platform": "hi3516cv300", "release": "mini"} + - {"platform": "hi3516cv300", "release": "lite"} + - {"platform": "hi3516cv300", "release": "ultimate"} + - {"platform": "hi3516ev100", "release": "lite"} + + # Hisilicon [HI3516CV500] + - {"platform": "hi3516av300", "release": "lite"} + - {"platform": "hi3516cv500", "release": "lite"} + - {"platform": "hi3516dv300", "release": "lite"} + + # Hisilicon [HI3516EV200] + - {"platform": "hi3516dv200", "release": "lite"} + - {"platform": "hi3516ev200", "release": "lte"} + - {"platform": "hi3516ev200", "release": "fpv"} + - {"platform": "hi3516ev200", "release": "lite"} + - {"platform": "hi3516ev200", "release": "ultimate"} + - {"platform": "hi3516ev300", "release": "lte"} + - {"platform": "hi3516ev300", "release": "fpv"} + - {"platform": "hi3516ev300", "release": "lite"} + - {"platform": "hi3516ev300", "release": "ultimate"} + - {"platform": "hi3518ev300", "release": "lite"} + - {"platform": "hi3518ev300", "release": "ultimate"} + + # Hisilicon [HI3519V101] + - {"platform": "hi3516av200", "release": "lite"} + - {"platform": "hi3516av200", "release": "ultimate"} + - {"platform": "hi3519v101", "release": "lite"} + + # Hisilicon [HI3536CV100] + - {"platform": "hi3536cv100", "release": "lite"} + + # Hisilicon [HI3536DV100] + - {"platform": "hi3536dv100", "release": "fpv"} + - {"platform": "hi3536dv100", "release": "lite"} + + # Goke [GK710X] + - {"platform": "gk7102", "release": "lite"} + - {"platform": "gk7102s", "release": "lite"} + + # Goke [GK7205V200] + - {"platform": "gk7202v300", "release": "lite"} + - {"platform": "gk7205v200", "release": "lte"} + - {"platform": "gk7205v200", "release": "fpv"} + - {"platform": "gk7205v200", "release": "venc"} + - {"platform": "gk7205v200", "release": "lite"} + - {"platform": "gk7205v200", "release": "ultimate"} + - {"platform": "gk7205v210", "release": "fpv"} + - {"platform": "gk7205v210", "release": "venc"} + - {"platform": "gk7205v210", "release": "lite"} + - {"platform": "gk7205v300", "release": "lte"} + - {"platform": "gk7205v300", "release": "fpv"} + - {"platform": "gk7205v300", "release": "venc"} + - {"platform": "gk7205v300", "release": "lite"} + - {"platform": "gk7205v300", "release": "ultimate"} + - {"platform": "gk7605v100", "release": "lite"} + + # Fullhan + - {"platform": "fh8852v100", "release": "lite"} + - {"platform": "fh8852v200", "release": "lite"} + + # Grainmedia + - {"platform": "gm8136", "release": "lite"} + + # Novatek + - {"platform": "nt98562", "release": "lite"} + - {"platform": "nt98566", "release": "lite"} + + # Rockchip + - {"platform": "rv1109", "release": "lite"} + - {"platform": "rv1126", "release": "lite"} + + # Xiongmai + - {"platform": "xm510", "release": "lite"} + - {"platform": "xm530", "release": "lite"} + - {"platform": "xm550", "release": "lite"} steps: - name: Checkout source @@ -255,7 +214,7 @@ jobs: fi - name: Upload firmware - if: github.event_name != 'pull_request' && matrix.custom != 'onlyci' + if: github.event_name != 'pull_request' uses: softprops/action-gh-release@v1 with: tag_name: ${{env.TAG_NAME}} @@ -264,7 +223,7 @@ jobs: ${{env.NANDFW}} - name: Send binary - if: github.event_name != 'pull_request' && matrix.custom != 'onlyci' && env.NORFW + if: github.event_name != 'pull_request' && env.NORFW run: | TG_MSG="Commit: ${GIT_HASH}\nBranch: ${GIT_BRANCH}\nTag: ${TAG_NAME}\nTime: ${TIME}\n\n" TG_ICON="\xE2\x9C\x85 GitHub Actions" diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml index a0788437..7d916046 100644 --- a/.github/workflows/toolchain.yml +++ b/.github/workflows/toolchain.yml @@ -56,7 +56,8 @@ jobs: URL=https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG_NAME}/${GCC}.tgz echo ${URL} if ! wget --spider ${URL} 2> /dev/null; then - sed -i "s|EXTERNAL=y|EXTERNAL=n|g" ${CONFIG} + sed -i "/BR2_TOOLCHAIN_EXTERNAL.*/d" ${CONFIG} + echo BR2_PACKAGE_AWS_WEBRTC=y >> ${CONFIG} make BOARD=${CONFIG} br-sdk SDK=$(find output/images -name *_sdk-buildroot.tar.gz) mv ${SDK} ${GCC}.tgz diff --git a/Makefile b/Makefile index 6f878994..47e8cddb 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ help: - make list - show available device configurations\n \ - make deps - install build dependencies\n \ - make clean - remove defconfig and target folder\n \ + - make package - list available packages\n \ - make distclean - remove buildroot and output folder\n \ - make br-linux - build linux kernel only\n \ - make all - build the device firmware\n\n" @@ -50,6 +51,9 @@ prepare: toolname: @general/scripts/show_toolchains.sh $(CONFIG) +package: + @find general/package/* -maxdepth 0 -type d -printf "br-%f\n" | grep -v patch + clean: @rm -rf $(TARGET)/images $(TARGET)/target diff --git a/br-ext-chip-hisilicon/configs/hi3516cv500_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516cv500_lite_defconfig index 71cd8f83..65e2af98 100644 --- a/br-ext-chip-hisilicon/configs/hi3516cv500_lite_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516cv500_lite_defconfig @@ -49,7 +49,6 @@ BR2_TARGET_GENERIC_HOSTNAME="openipc-hi3516cv500" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" # OpenIPC packages -BR2_PACKAGE_AWS_WEBRTC=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" BR2_PACKAGE_DROPBEAR_OPENIPC=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig index 52ede2a2..5b4ff574 100644 --- a/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3516ev200_lite_defconfig @@ -52,7 +52,6 @@ BR2_TARGET_GENERIC_HOSTNAME="openipc-hi3516ev200" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" # OpenIPC packages -BR2_PACKAGE_AWS_WEBRTC=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" BR2_PACKAGE_DROPBEAR_OPENIPC=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/br-ext-chip-hisilicon/configs/hi3518ev200_lite_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev200_lite_defconfig index 0b9bad1d..90d96332 100644 --- a/br-ext-chip-hisilicon/configs/hi3518ev200_lite_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3518ev200_lite_defconfig @@ -104,7 +104,7 @@ BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y # MQTT -BR2_PACKAGE_MOSQUITTO=y +# BR2_PACKAGE_MOSQUITTO is not set # BR2_PACKAGE_MOSQUITTO_BROKER is not set # FEATURES diff --git a/br-ext-chip-hisilicon/configs/hi3518ev200_mini_defconfig b/br-ext-chip-hisilicon/configs/hi3518ev200_mini_defconfig index c202d83a..49725c5d 100644 --- a/br-ext-chip-hisilicon/configs/hi3518ev200_mini_defconfig +++ b/br-ext-chip-hisilicon/configs/hi3518ev200_mini_defconfig @@ -106,7 +106,7 @@ BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y # MQTT -BR2_PACKAGE_MOSQUITTO=y +# BR2_PACKAGE_MOSQUITTO is not set # BR2_PACKAGE_MOSQUITTO_BROKER is not set # FEATURES diff --git a/br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config b/br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config index 63e57489..f02ed601 100644 --- a/br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config +++ b/br-ext-chip-ingenic/board/t31/kernel/t31.generic-fpv.config @@ -850,17 +850,17 @@ CONFIG_ATH9K_HTC=m # CONFIG_LIBERTAS is not set # CONFIG_P54_COMMON is not set # CONFIG_RT2X00 is not set -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_DEBUG=y -CONFIG_RTL8192CU=m -CONFIG_RTL8192C_COMMON=m +# CONFIG_RTLWIFI is not set +# CONFIG_RTLWIFI_DEBUG is not set +# CONFIG_RTL8192CU is not set +# CONFIG_RTL8192C_COMMON is not set # CONFIG_WL_TI is not set # CONFIG_ZD1211RW is not set # CONFIG_MWIFIEX is not set # CONFIG_BCM43341 is not set # CONFIG_BCMDHD_1_141_66 is not set # CONFIG_BCMDHD_AP6181 is not set -CONFIG_MT7601_STA=y +# CONFIG_MT7601_STA is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers diff --git a/br-ext-chip-ingenic/configs/t10_lite_defconfig b/br-ext-chip-ingenic/configs/t10_lite_defconfig index 0068f4f5..ee6b1279 100644 --- a/br-ext-chip-ingenic/configs/t10_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t10_lite_defconfig @@ -60,6 +60,7 @@ BR2_PACKAGE_DROPBEAR_OPENIPC=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # BR2_PACKAGE_FDK_AAC_OPENIPC is not set BR2_PACKAGE_UBOOT_TOOLS=y +BR2_PACKAGE_INGENIC_OPENSDK=y BR2_PACKAGE_INGENIC_OSDRV_T20=y BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y @@ -108,9 +109,10 @@ BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_INGENIC_PWM=y -# BR2_PACKAGE_LOGCAT_OPENIPC is not set +BR2_PACKAGE_LOGCAT_OPENIPC=y # BR2_PACKAGE_HOST_GDB is not set # BR2_PACKAGE_GDB is not set +BR2_PACKAGE_INGENIC_LIBIMP_CONTROL=y # CCACHE BR2_CCACHE=y diff --git a/br-ext-chip-ingenic/configs/t20_lite_defconfig b/br-ext-chip-ingenic/configs/t20_lite_defconfig index f5f2de65..a5bd1c8f 100644 --- a/br-ext-chip-ingenic/configs/t20_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t20_lite_defconfig @@ -92,6 +92,7 @@ BR2_PACKAGE_VTUND_OPENIPC=y BR2_PACKAGE_YAML_CLI=y BR2_PACKAGE_QUIRC_OPENIPC=y # BR2_PACKAGE_AUTONIGHT is not set +BR2_PACKAGE_INGENIC_LIBIMP_CONTROL=y # WiFi BR2_PACKAGE_WIRELESS_TOOLS=y @@ -109,7 +110,7 @@ BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_INGENIC_PWM=y -# BR2_PACKAGE_LOGCAT_OPENIPC is not set +BR2_PACKAGE_LOGCAT_OPENIPC=y # BR2_PACKAGE_HOST_GDB is not set # BR2_PACKAGE_GDB is not set diff --git a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig index 7001feb1..f4e36571 100644 --- a/br-ext-chip-ingenic/configs/t20_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t20_ultimate_defconfig @@ -94,6 +94,7 @@ BR2_PACKAGE_VTUND_OPENIPC=y BR2_PACKAGE_YAML_CLI=y BR2_PACKAGE_QUIRC_OPENIPC=y # BR2_PACKAGE_AUTONIGHT is not set +BR2_PACKAGE_INGENIC_LIBIMP_CONTROL=y # WiFi BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/br-ext-chip-ingenic/configs/t21_lite_defconfig b/br-ext-chip-ingenic/configs/t21_lite_defconfig index a1adc8a3..d2894736 100644 --- a/br-ext-chip-ingenic/configs/t21_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t21_lite_defconfig @@ -91,6 +91,7 @@ BR2_PACKAGE_VTUND_OPENIPC=y BR2_PACKAGE_YAML_CLI=y BR2_PACKAGE_QUIRC_OPENIPC=y # BR2_PACKAGE_AUTONIGHT is not set +BR2_PACKAGE_INGENIC_LIBIMP_CONTROL=y # WiFi BR2_PACKAGE_WIRELESS_TOOLS=y @@ -108,7 +109,7 @@ BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_INGENIC_PWM=y -# BR2_PACKAGE_LOGCAT_OPENIPC is not set +BR2_PACKAGE_LOGCAT_OPENIPC=y # BR2_PACKAGE_HOST_GDB is not set # BR2_PACKAGE_GDB is not set diff --git a/br-ext-chip-ingenic/configs/t21_ultimate_defconfig b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig new file mode 100644 index 00000000..359c8621 --- /dev/null +++ b/br-ext-chip-ingenic/configs/t21_ultimate_defconfig @@ -0,0 +1,133 @@ +# Architecture +BR2_mipsel=y +BR2_mips_xburst=y +# BR2_MIPS_SOFT_FLOAT is not set +BR2_MIPS_FP32_MODE_32=y +# BR2_MIPS_FP32_MODE_XX is not set +BR2_MIPS_NAN_LEGACY=y +BR2_MIPS_OABI32=y +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="3.10.14" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y + +# Toolchain +BR2_PER_PACKAGE_DIRECTORIES=y +BR2_GCC_VERSION_12_X=y +# BR2_TOOLCHAIN_USES_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set +# BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" +BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-float=hard" +BR2_TOOLCHAIN_USES_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="musl" +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_BUILDROOT_LOCALE=y +BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/t21/kernel/t21.generic.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_LZMA=y + +# OpenIPC +BR2_OPENIPC_SOC_VENDOR="ingenic" +BR2_OPENIPC_SOC_MODEL="t21" +BR2_OPENIPC_SOC_FAMILY="t21" +BR2_OPENIPC_FLAVOR="ultimate" +BR2_OPENIPC_FLASH_SIZE="16" + +# Filesystem +# BR2_TARGET_TZ_INFO is not set +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_SQUASHFS=y +BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh" + +# OpenIPC configuration +BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" +BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC" +BR2_TARGET_GENERIC_HOSTNAME="openipc-t21" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_UBOOT_TOOLS=y +BR2_PACKAGE_INGENIC_OSDRV_T21=y +BR2_PACKAGE_IPCTOOL=y +BR2_PACKAGE_JSON_C=y +BR2_PACKAGE_JSONFILTER=y +BR2_PACKAGE_LAME_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y +# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set +BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y +BR2_PACKAGE_LIBOGG_OPENIPC=y +BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MBEDTLS_OPENIPC=y +# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set +# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set +BR2_PACKAGE_MICROBE_WEB=y +# BR2_PACKAGE_MINI_SNMPD is not set +BR2_PACKAGE_MOTORS=y +BR2_PACKAGE_OPUS_OPENIPC=y +BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y +# BR2_PACKAGE_SSHPASS is not set +BR2_PACKAGE_UACME_OPENIPC=y +BR2_PACKAGE_VTUND_OPENIPC=y +BR2_PACKAGE_YAML_CLI=y +BR2_PACKAGE_QUIRC_OPENIPC=y +# BR2_PACKAGE_AUTONIGHT is not set +BR2_PACKAGE_INGENIC_LIBIMP_CONTROL=y + +# WiFi +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y +BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U=y +# BR2_PACKAGE_RTL8188EU is not set +BR2_PACKAGE_RTL8188FU_OPENIPC=y + +# WIREGUARD +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y +BR2_PACKAGE_WIREGUARD_TOOLS=y + +# DEBUG +BR2_PACKAGE_INGENIC_PWM=y +BR2_PACKAGE_LOGCAT_OPENIPC=y +# BR2_PACKAGE_HOST_GDB is not set +# BR2_PACKAGE_GDB is not set + +# CCACHE +BR2_CCACHE=y +BR2_CCACHE_DIR="$(HOME)/.ccache" + +# Compression +BR2_PACKAGE_ZLIB=y + +# External +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="mipsel-openipc-linux-musl" +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz" diff --git a/br-ext-chip-ingenic/configs/t30_lite_defconfig b/br-ext-chip-ingenic/configs/t30_lite_defconfig index 072afba6..4375d4ef 100644 --- a/br-ext-chip-ingenic/configs/t30_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t30_lite_defconfig @@ -91,6 +91,7 @@ BR2_PACKAGE_VTUND_OPENIPC=y BR2_PACKAGE_YAML_CLI=y BR2_PACKAGE_QUIRC_OPENIPC=y # BR2_PACKAGE_AUTONIGHT is not set +BR2_PACKAGE_INGENIC_LIBIMP_CONTROL=y # WiFi BR2_PACKAGE_WIRELESS_TOOLS=y @@ -108,7 +109,7 @@ BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_INGENIC_PWM=y -# BR2_PACKAGE_LOGCAT_OPENIPC is not set +BR2_PACKAGE_LOGCAT_OPENIPC=y # BR2_PACKAGE_HOST_GDB is not set # BR2_PACKAGE_GDB is not set diff --git a/br-ext-chip-ingenic/configs/t31_fpv_defconfig b/br-ext-chip-ingenic/configs/t31_fpv_defconfig index eb37780c..51846d82 100644 --- a/br-ext-chip-ingenic/configs/t31_fpv_defconfig +++ b/br-ext-chip-ingenic/configs/t31_fpv_defconfig @@ -100,13 +100,13 @@ BR2_PACKAGE_WIRELESS_TOOLS=y # BR2_PACKAGE_WPA_SUPPLICANT_CLI is not set # BR2_PACKAGE_WPA_SUPPLICANT_NL80211 is not set # BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE is not set -BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC=y +# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC is not set # BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MEDIATEK_MT7601U is not set -# BR2_PACKAGE_RTL8188EU is not set +BR2_PACKAGE_RTL8812AU_OPENIPC=y # WIREGUARD -BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y -BR2_PACKAGE_WIREGUARD_TOOLS=y +# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set +# BR2_PACKAGE_WIREGUARD_TOOLS is not set # FPV BR2_PACKAGE_DATALINK=y diff --git a/br-ext-chip-ingenic/configs/t31_lite_defconfig b/br-ext-chip-ingenic/configs/t31_lite_defconfig index 967caa7f..64eb08ec 100644 --- a/br-ext-chip-ingenic/configs/t31_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t31_lite_defconfig @@ -109,11 +109,11 @@ BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y # EXPERIMENTAL -BR2_PACKAGE_ONVIF_SIMPLE_SERVER=y +# BR2_PACKAGE_ONVIF_SIMPLE_SERVER is not set # DEBUG BR2_PACKAGE_INGENIC_PWM=y -# BR2_PACKAGE_LOGCAT_OPENIPC is not set +BR2_PACKAGE_LOGCAT_OPENIPC=y # BR2_PACKAGE_HOST_GDB is not set # BR2_PACKAGE_GDB is not set diff --git a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig index 41b985d9..3a81bde6 100644 --- a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig @@ -108,9 +108,6 @@ BR2_PACKAGE_ATBM60XX=y BR2_PACKAGE_RTL8188FU_OPENIPC=y # BR2_PACKAGE_RTL8188EU is not set -# Motors -BR2_PACKAGE_INGENIC_MOTORS_T31=y - # WIREGUARD BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y BR2_PACKAGE_WIREGUARD_TOOLS=y diff --git a/br-ext-chip-ingenic/configs/t40_lite_defconfig b/br-ext-chip-ingenic/configs/t40_lite_defconfig index e8dbcffa..ee92e571 100644 --- a/br-ext-chip-ingenic/configs/t40_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t40_lite_defconfig @@ -92,6 +92,7 @@ BR2_PACKAGE_VTUND_OPENIPC=y BR2_PACKAGE_YAML_CLI=y BR2_PACKAGE_QUIRC_OPENIPC=y # BR2_PACKAGE_AUTONIGHT is not set +BR2_PACKAGE_INGENIC_LIBIMP_CONTROL=y # WiFi BR2_PACKAGE_WIRELESS_TOOLS=y @@ -109,7 +110,7 @@ BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_INGENIC_PWM=y -# BR2_PACKAGE_LOGCAT_OPENIPC is not set +BR2_PACKAGE_LOGCAT_OPENIPC=y # BR2_PACKAGE_HOST_GDB is not set # BR2_PACKAGE_GDB is not set diff --git a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig index a8e2a0d4..d23e2293 100644 --- a/br-ext-chip-ingenic/configs/t40_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t40_ultimate_defconfig @@ -93,6 +93,7 @@ BR2_PACKAGE_VTUND_OPENIPC=y BR2_PACKAGE_YAML_CLI=y BR2_PACKAGE_QUIRC_OPENIPC=y # BR2_PACKAGE_AUTONIGHT is not set +BR2_PACKAGE_INGENIC_LIBIMP_CONTROL=y # WiFi BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig new file mode 100644 index 00000000..e0950135 --- /dev/null +++ b/br-ext-chip-sigmastar/configs/ssc30kq_fpv_defconfig @@ -0,0 +1,122 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_EABIHF=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_ARM_INSTRUCTIONS_THUMB2=y +BR2_KERNEL_HEADERS_VERSION=y +BR2_DEFAULT_KERNEL_VERSION="4.9.84" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y + +# Toolchain +BR2_PER_PACKAGE_DIRECTORIES=y +BR2_GCC_VERSION_12_X=y +BR2_TOOLCHAIN_USES_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc" +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_BUILDROOT_LOCALE=y +BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/openipc/linux/archive/$(OPENIPC_KERNEL).tar.gz" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(EXTERNAL_VENDOR)/board/infinity6e/kernel/infinity6e-ssc012b.config" +BR2_LINUX_KERNEL_UIMAGE=y +BR2_LINUX_KERNEL_XZ=y + +# OpenIPC +BR2_OPENIPC_SOC_VENDOR="sigmastar" +BR2_OPENIPC_SOC_MODEL="ssc30kq" +BR2_OPENIPC_SOC_FAMILY="infinity6e" +BR2_OPENIPC_FLAVOR="fpv" +BR2_OPENIPC_FLASH_SIZE="16" + +# Filesystem +# BR2_TARGET_TZ_INFO is not set +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_SQUASHFS=y +BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/scripts/rootfs_script.sh" + +# OpenIPC configuration +BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc" +BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC" +BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc30kq" +BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" + +# OpenIPC packages +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" +BR2_PACKAGE_DROPBEAR_OPENIPC=y +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set +# BR2_PACKAGE_FDK_AAC_OPENIPC is not set +BR2_PACKAGE_UBOOT_TOOLS=y +BR2_PACKAGE_IPCTOOL=y +BR2_PACKAGE_JSON_C=y +BR2_PACKAGE_JSONFILTER=y +BR2_PACKAGE_LIBCURL_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y +# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set +# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set +BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +BR2_PACKAGE_LIBEVENT_OPENIPC=y +BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y +BR2_PACKAGE_LIBOGG_OPENIPC=y +BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC=y +BR2_PACKAGE_MAJESTIC_FONTS=y +BR2_PACKAGE_MBEDTLS_OPENIPC=y +# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set +# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set +BR2_PACKAGE_MICROBE_WEB=y +# BR2_PACKAGE_MINI_SNMPD is not set +# BR2_PACKAGE_MOTORS is not set +BR2_PACKAGE_OPUS_OPENIPC=y +BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y +BR2_PACKAGE_SIGMASTAR_OSDRV_INFINITY6E=y +BR2_PACKAGE_EXFAT_OPENIPC=y +BR2_PACKAGE_EXFATPROGS=y +# BR2_PACKAGE_SSHPASS is not set +# BR2_PACKAGE_UACME_OPENIPC is not set +BR2_PACKAGE_VTUND_OPENIPC=y +BR2_PACKAGE_YAML_CLI=y +BR2_PACKAGE_ZLIB=y + +# Wireless +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_PACKAGE_RTL8812AU_OPENIPC=y + +# FPV +BR2_PACKAGE_DATALINK=y +BR2_PACKAGE_WIFIBROADCAST=y +BR2_PACKAGE_MAVLINK_ROUTER=y +BR2_PACKAGE_MAVFWD=y + +# Debug +# BR2_PACKAGE_HOST_GDB is not set +# BR2_PACKAGE_GDB is not set + +# CCACHE +BR2_CCACHE=y +BR2_CCACHE_DIR="$(HOME)/.ccache" + +# External +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-openipc-linux-gnueabihf" +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y +# BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/openipc/firmware/releases/download/$(OPENIPC_TOOLCHAIN).tgz" diff --git a/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig index 1967f850..077a091e 100644 --- a/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc333_lite_defconfig @@ -52,7 +52,6 @@ BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc333" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" # OpenIPC packages -BR2_PACKAGE_AWS_WEBRTC=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" BR2_PACKAGE_DROPBEAR_OPENIPC=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/br-ext-chip-sigmastar/configs/ssc333_ultimate_defconfig b/br-ext-chip-sigmastar/configs/ssc333_ultimate_defconfig index 962a2a4c..97d5369d 100644 --- a/br-ext-chip-sigmastar/configs/ssc333_ultimate_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc333_ultimate_defconfig @@ -52,7 +52,6 @@ BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc333" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" # OpenIPC packages -BR2_PACKAGE_AWS_WEBRTC=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" BR2_PACKAGE_DROPBEAR_OPENIPC=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig index 853c81cc..8fcde376 100644 --- a/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc335_lite_defconfig @@ -52,7 +52,6 @@ BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc335" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" # OpenIPC packages -BR2_PACKAGE_AWS_WEBRTC=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" BR2_PACKAGE_DROPBEAR_OPENIPC=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig index 26093e1e..27819da6 100644 --- a/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc338q_lite_defconfig @@ -49,7 +49,6 @@ BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc338q" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" # OpenIPC packages -BR2_PACKAGE_AWS_WEBRTC=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" BR2_PACKAGE_DROPBEAR_OPENIPC=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/br-ext-chip-sigmastar/configs/ssc377_lite_defconfig b/br-ext-chip-sigmastar/configs/ssc377_lite_defconfig index 31062540..e9b1bb93 100644 --- a/br-ext-chip-sigmastar/configs/ssc377_lite_defconfig +++ b/br-ext-chip-sigmastar/configs/ssc377_lite_defconfig @@ -49,7 +49,6 @@ BR2_TARGET_GENERIC_HOSTNAME="openipc-ssc377" BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/package/all-patches" # OpenIPC packages -BR2_PACKAGE_AWS_WEBRTC=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/package/busybox/busybox.config" BR2_PACKAGE_DROPBEAR_OPENIPC=y # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/building.sh b/building.sh index 4c26f1e9..45cf7bfc 100755 --- a/building.sh +++ b/building.sh @@ -212,14 +212,15 @@ copy_function() { uni_build() { [ -z "$BOARD" ] && BOARD=$FUNCNAME - SOC=$(echo $BOARD | cut -d '_' -f 1) + SOC=$(echo $BOARD | cut -sd '_' -f 1) + FLAVOR=$(echo $BOARD | cut -sd '_' -f 2) set -e - if [ "$(echo $BOARD | cut -sd '_' -f 2)" == "" ]; then - BOARD="${BOARD}_lite" + if [ "${FLAVOR}" == "" ]; then + BOARD="${SOC}_lite" fi - if [ "$BOARD" == "hi3518ev200_lite" ]; then + if [ "${SOC}_${FLAVOR}" == "hi3518ev200_lite" ]; then NEED_AUTOUP=1 fi diff --git a/general/overlay/etc/init.d/S40network b/general/overlay/etc/init.d/S40network index c6772c9e..1401361c 100755 --- a/general/overlay/etc/init.d/S40network +++ b/general/overlay/etc/init.d/S40network @@ -6,23 +6,30 @@ set_wireless() { path=/etc/wireless if $path/usb "$dev" || $path/modem "$dev" || $path/sdio "$dev"; then [ -n "$mac" ] && ip link set dev wlan0 address "$mac" - ifup wlan0 && file="-i /etc/wireless/interfaces/eth0" + ifup wlan0 + ifconfig eth0 192.168.192.10 fi } case "$1" in start) echo "Starting network..." - ifup -a - [ -n "$dev" ] && set_wireless - ifup eth0 $file + ifup lo + if [ -n "$dev" ]; then + set_wireless + else + ifup eth0 + fi ;; stop) echo "Stopping network..." - ifdown -a - [ -n "$dev" ] && ifdown wlan0 - ifdown eth0 + ifdown lo + if [ -n "$dev" ]; then + ifdown wlan0 + else + ifdown eth0 + fi ;; restart|reload) diff --git a/general/overlay/etc/init.d/S99watchdog b/general/overlay/etc/init.d/S99watchdog new file mode 100755 index 00000000..0c247260 --- /dev/null +++ b/general/overlay/etc/init.d/S99watchdog @@ -0,0 +1,55 @@ +#!/bin/sh + +DAEMON="watchdog" + +WATCHDOG_ENABLED=false +WATCHDOG_TIMEOUT=60 + +SUPPORTED_VENDORS="ingenic" +WATCHDOG_ARGS="-T $WATCHDOG_TIMEOUT /dev/watchdog" +WATCHDOG_VENDOR=$(ipcinfo -v) + +vendor_supported() { + for vendor in $SUPPORTED_VENDORS; do + [ "$WATCHDOG_VENDOR" = "$vendor" ] && return 0 + done + return 1 +} + +start() +{ + if vendor_supported && [ "$(cli -g .watchdog.enabled)" = "false" ] && [ "$WATCHDOG_ENABLED" = "true" ]; then + printf "Starting ${DAEMON}: " + start-stop-daemon -S -q -x "/sbin/${DAEMON}" -- ${WATCHDOG_ARGS} + [ $? = 0 ] && echo "OK" || echo "FAIL" + else + echo "Watchdog: System watchdog disabled, unsupported vendor or Majestic Watchdog enabled" + exit 0 + fi +} + +stop() +{ + printf "Stopping ${DAEMON}: " + if start-stop-daemon -K -q -s KILL -n "${DAEMON}"; then + echo "OK" + else + echo "FAIL" + fi +} + +case "$1" in + start|stop) + "$1" + ;; + + restart|reload) + stop + start + ;; + + *) + echo "Usage: $0 {start|stop|restart|reload}" >&2 + exit 1 + ;; +esac diff --git a/general/overlay/etc/network/interfaces b/general/overlay/etc/network/interfaces index cdd1d27a..f2d52300 100644 --- a/general/overlay/etc/network/interfaces +++ b/general/overlay/etc/network/interfaces @@ -1,4 +1,3 @@ -auto lo iface lo inet loopback source-dir /etc/network/interfaces.d diff --git a/general/overlay/etc/network/interfaces.d/usb0 b/general/overlay/etc/network/interfaces.d/usb0 index a0a955c3..a8431231 100644 --- a/general/overlay/etc/network/interfaces.d/usb0 +++ b/general/overlay/etc/network/interfaces.d/usb0 @@ -1,2 +1 @@ -#auto usb0 iface usb0 inet dhcp diff --git a/general/overlay/etc/wireless/interfaces/eth0 b/general/overlay/etc/wireless/interfaces/eth0 deleted file mode 100644 index 0f75b509..00000000 --- a/general/overlay/etc/wireless/interfaces/eth0 +++ /dev/null @@ -1,4 +0,0 @@ -iface eth0 inet static - address 192.168.2.10 - netmask 255.255.255.0 - hwaddress ether $(fw_printenv -n ethaddr || echo 00:00:23:34:45:66) diff --git a/general/overlay/etc/wireless/modem b/general/overlay/etc/wireless/modem index 79fcbb36..4a9ab852 100755 --- a/general/overlay/etc/wireless/modem +++ b/general/overlay/etc/wireless/modem @@ -1,10 +1,7 @@ #!/bin/sh set_gpio() { - test -e /sys/class/gpio/gpio$1 && echo $1 > /sys/class/gpio/unexport - echo $1 > /sys/class/gpio/export - echo out > /sys/class/gpio/gpio$1/direction - echo $2 > /sys/class/gpio/gpio$1/value + [ "$2" -eq 1 ] && gpio set $1 || gpio clear $1 sleep 1 } diff --git a/general/overlay/etc/wireless/sdio b/general/overlay/etc/wireless/sdio index 71ec8064..84298b07 100755 --- a/general/overlay/etc/wireless/sdio +++ b/general/overlay/etc/wireless/sdio @@ -1,57 +1,75 @@ #!/bin/sh set_gpio() { - test -e /sys/class/gpio/gpio$1 && echo $1 > /sys/class/gpio/unexport - echo $1 > /sys/class/gpio/export - echo out > /sys/class/gpio/gpio$1/direction - echo $2 > /sys/class/gpio/gpio$1/value + [ "$2" -eq 1 ] && gpio set $1 || gpio clear $1 sleep 1 } set_mmc() { mmc=/sys/devices/platform/jzmmc_v1.2.$1/present - if [ "$(cat $mmc)" = "N" ]; then - echo "INSERT" > $mmc - fi + [ "$(cat $mmc)" = "N" ] && echo "INSERT" > $mmc } -# RTL8189FS Generic -if [ "$1" = "rtl8189fs-generic" ]; then - set_mmc 1 - modprobe 8189fs - exit 0 -fi - -# ATBM603x Generic +# Generic ATBM603X if [ "$1" = "atbm603x-generic" ]; then set_mmc 1 - cp /usr/share/atbm60xx_conf/atbm_txpwer_dcxo_cfg.txt /tmp - cp /usr/share/atbm60xx_conf/set_rate_power.txt /tmp - modprobe atbm603x_wifi_sdio - exit 0 -fi - -# T31 Wyze V3 / AtomCam 2 ATBM603x -if [ "$1" = "atbm603x-t31-wyze-v3" ]; then - set_gpio 57 0;set_gpio 57 1 - set_mmc 1 - cp /usr/share/atbm60xx_conf/atbm_txpwer_dcxo_cfg.txt /tmp - cp /usr/share/atbm60xx_conf/set_rate_power.txt /tmp - modprobe atbm603x_wifi_sdio atbm_printk_mask=0 + cp -f /usr/share/atbm60xx_conf/atbm_txpwer_dcxo_cfg.txt /tmp + cp -f /usr/share/atbm60xx_conf/set_rate_power.txt /tmp + modprobe atbm603x_wifi_sdio exit 0 fi -# T31 Wyze PanV2 ATBM603x +# Generic RTL8189FS +if [ "$1" = "rtl8189fs-generic" ]; then + set_mmc 1 + modprobe 8189fs + exit 0 +fi + +# T20 Wyze PanV1 +if [ "$1" = "rtl8189es-t20-wyze-pan-v1" ]; then + set_mmc 1 + modprobe 8189es rtw_power_mgnt=0 rtw_enusbss=0 + exit 0 +fi + +# T20 Wyze V2 +if [ "$1" = "rtl8189ftv-t20-wyze-v2" ]; then + set_mmc 1 + modprobe 8189fs rtw_power_mgnt=0 rtw_enusbss=0 + exit 0 +fi + +# T31 Wyze DB3 +if [ "$1" = "rtl8189ftv-t31-wyze-db3" ]; then + set_mmc 1 + modprobe 8189fs rtw_power_mgnt=0 rtw_enusbss=0 + exit 0 +fi + +# T31 Wyze PanV2 if [ "$1" = "atbm603x-t31-wyze-pan-v2" ]; then - set_gpio 58 0;set_gpio 58 1 + set_gpio 58 0 + set_gpio 58 1 set_mmc 1 - cp /usr/share/atbm60xx_conf/atbm_txpwer_dcxo_cfg.txt /tmp - cp /usr/share/atbm60xx_conf/set_rate_power.txt /tmp + cp -f /usr/share/atbm60xx_conf/atbm_txpwer_dcxo_cfg.txt /tmp + cp -f /usr/share/atbm60xx_conf/set_rate_power.txt /tmp modprobe atbm603x_wifi_sdio atbm_printk_mask=0 exit 0 fi -# T31 Wyze V3 RTL8189FTV +# T31 Wyze V3 / AtomCam 2 +if [ "$1" = "atbm603x-t31-wyze-v3" ]; then + set_gpio 57 0 + set_gpio 57 1 + set_mmc 1 + cp -f /usr/share/atbm60xx_conf/atbm_txpwer_dcxo_cfg.txt /tmp + cp -f /usr/share/atbm60xx_conf/set_rate_power.txt /tmp + modprobe atbm603x_wifi_sdio atbm_printk_mask=0 + exit 0 +fi + +# T31 Wyze V3 if [ "$1" = "rtl8189ftv-t31-wyze-v3" ]; then set_gpio 57 1 set_mmc 1 @@ -59,25 +77,4 @@ if [ "$1" = "rtl8189ftv-t31-wyze-v3" ]; then exit 0 fi -# T31 Wyze DB3 RTL8189FTV -if [ "$1" = "rtl8189ftv-t31-wyze-db3" ]; then - set_mmc 1 - modprobe 8189fs rtw_power_mgnt=0 rtw_enusbss=0 - exit 0 -fi - -# T20 Wyze V2 RTL8189FTV -if [ "$1" = "rtl8189ftv-t20-wyze-v2" ]; then - set_mmc 1 - modprobe 8189fs rtw_power_mgnt=0 rtw_enusbss=0 - exit 0 -fi - -# T20 Wyze PanV1 RTL8189ES -if [ "$1" = "rtl8189es-t20-wyze-pan-v1" ]; then - set_mmc 1 - modprobe 8189es rtw_power_mgnt=0 rtw_enusbss=0 - exit 0 -fi - exit 1 diff --git a/general/overlay/etc/wireless/usb b/general/overlay/etc/wireless/usb index 978939fb..027195bc 100755 --- a/general/overlay/etc/wireless/usb +++ b/general/overlay/etc/wireless/usb @@ -1,32 +1,29 @@ #!/bin/sh set_gpio() { - test -e /sys/class/gpio/gpio$1 && echo $1 > /sys/class/gpio/unexport - echo $1 > /sys/class/gpio/export - echo out > /sys/class/gpio/gpio$1/direction - echo $2 > /sys/class/gpio/gpio$1/value + [ "$2" -eq 1 ] && gpio set $1 || gpio clear $1 sleep 1 } -# MT7601U Generic +# Generic MT7601U if [ "$1" = "mt7601u-generic" ]; then modprobe mt7601u exit 0 fi -# RTL8188FU Generic -if [ "$1" = "rtl8188fu-generic" ]; then - modprobe 8188fu - exit 0 -fi - -# RTL8188EU Generic +# Generic RTL8188EU if [ "$1" = "rtl8188eu-generic" ]; then modprobe 8188eu exit 0 fi -# RTL8733BU Generic +# Generic RTL8188FU +if [ "$1" = "rtl8188fu-generic" ]; then + modprobe 8188fu + exit 0 +fi + +# Generic RTL8733BU if [ "$1" = "rtl8733bu-generic" ]; then modprobe 8733bu exit 0 @@ -81,7 +78,7 @@ if [ "$1" = "rtl8188fu-hi3518ev200-lifesmart" ]; then exit 0 fi -# HI3518EV200 Rostelecom QVC-IPC-136W +# HI3518EV200 Qtech QVC-IPC-136W if [ "$1" = "rtl8188eu-hi3518ev200-qvc-ipc-136w" ]; then set_gpio 7 1 modprobe 8188eu @@ -103,6 +100,13 @@ if [ "$1" = "rtl8188fu-ssc325de-imou-c22ep-s2" ]; then exit 0 fi +# SSC3333 Meari Speed 6S +if [ "$1" = "rtl8188fu-ssc333-meari-speed-6s" ]; then + set_gpio 14 1 + modprobe 8188fu + exit 0 +fi + # SSC333 Tapo C110 if [ "$1" = "ssw101b-ssc333-tapo-c110" ]; then set_gpio 16 1 @@ -110,6 +114,19 @@ if [ "$1" = "ssw101b-ssc333-tapo-c110" ]; then exit 0 fi +# SSC335DE Uniview C1L-2WN-G +if [ "$1" = "rtl8188fu-ssc335de-uniview-c1l-2wn-g" ]; then + set_gpio 1 0 + modprobe 8188fu + exit 0 +fi + +# SSC337DE BroadbandService +if [ "$1" = "aic8800-ssc337de-broadband" ]; then + modprobe aic8800_fdrv + exit 0 +fi + # SSC337DE BroadbandService if [ "$1" = "rtl8188fu-ssc337de-broadband" ]; then set_gpio 2 0 @@ -124,12 +141,6 @@ if [ "$1" = "rtl8188fu-ssc337de-foscam" ]; then exit 0 fi -# SSC337DE BroadbandService -if [ "$1" = "aic8800-ssc337de-broadband" ]; then - modprobe aic8800_fdrv - exit 0 -fi - # T10 NVT if [ "$1" = "mt7601sta-t10-nvt" ]; then modprobe cfg80211 @@ -151,6 +162,13 @@ if [ "$1" = "rtl8188fu-t21-smartwares" ]; then exit 0 fi +# T31 Aoni EP01J05 +if [ "$1" = "rtl8188fu-t31-aoni-ep01j05" ]; then + set_gpio 43 1 + modprobe 8188fu + exit 0 +fi + # T31 CamHi if [ "$1" = "mt7601u-t31-camhi" ]; then set_gpio 61 0 diff --git a/general/overlay/usr/sbin/extutils b/general/overlay/usr/sbin/extutils index 741cdd27..be4d0ad7 100755 --- a/general/overlay/usr/sbin/extutils +++ b/general/overlay/usr/sbin/extutils @@ -21,9 +21,15 @@ case "${CMD}" in ipctool) IPCTOOL=/tmp/ipctool if [ ! -x $IPCTOOL ]; then - curl -s -L -o $IPCTOOL https://github.com/OpenIPC/ipctool/releases/download/latest/ipctool$ARC - chmod +x $IPCTOOL - echo "The ipctool installed as remote GitHub plugin" + curl -s -L -f -o $IPCTOOL https://github.com/OpenIPC/ipctool/releases/download/latest/ipctool$ARC + response=$? + if [[ "$response" -ne 0 ]]; then + echo "Unable to download ipctool. cUrl error code is $response." + exit $response + else + chmod +x $IPCTOOL + echo "The ipctool installed as remote GitHub plugin" + fi fi $IPCTOOL $@ ;; diff --git a/general/overlay/usr/sbin/resetd b/general/overlay/usr/sbin/resetd index 4f687604..9aec50ce 100755 --- a/general/overlay/usr/sbin/resetd +++ b/general/overlay/usr/sbin/resetd @@ -3,7 +3,7 @@ # Set Reset switch GPIO GPIO= -[ -z $GPIO ] && echo "GPIO not set. Exiting" && echo "[resetd] GPIO undefined in /usr/sbin/resetd" > /dev/kmsg && exit +[ -z $GPIO ] && echo "GPIO pin for resetd is not set" && echo "[resetd] GPIO undefined in /usr/sbin/resetd" > /dev/kmsg && exit # Counter for button press until reset count=0 diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index 44b04225..5329c9b1 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -1,14 +1,12 @@ #!/bin/sh # -# OpenIPC.org | v.20231202 +# OpenIPC.org | v.20231228 # -scr_version=1.0.23 +scr_version=1.0.27 args=" $@" -set -e - LOCK_FILE=/tmp/sysupgrade.lock IPCINFO=/tmp/ipcinfo @@ -100,15 +98,21 @@ download_firmware() { } free_resources() { - # echo_c 37 "\nStop services, unload modules" - # killall majestic crond klogd ntpd rngd syslogd >/dev/null 2>&1 || true - # "load_$vendor" -r >/dev/null 2>&1 || true - # echo_c 37 "\nStop services, sync files, free up memory" - for proc in majestic crond klogd ntpd rngd syslogd; do + + echo -n "Killing majestic ... " + time=$(grep TIME_STAMP /etc/os-release | cut -d= -f2) + if [ "$time" -gt "1702544400" ]; then + killall -q -SIGUSR2 majestic + else + killall -q majestic + fi + echo "OK" + + for proc in crond klogd ntpd rngd syslogd; do echo -n "Killing $proc " while [ -n "$(pidof $proc)" ]; do - killall $proc >/dev/null 2>&1 || true + killall -q $proc sleep 0.1 echo -n "." done diff --git a/general/package/Config.in b/general/package/Config.in index 233744b2..edb9489b 100644 --- a/general/package/Config.in +++ b/general/package/Config.in @@ -37,7 +37,6 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/hisilicon-osdrv-serdes/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/hisilicon-osdrv1-sources/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/i2c-telemetry/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-libimp-control/Config.in" -source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-motors-t31/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-opensdk/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t20/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t21/Config.in" @@ -110,3 +109,4 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/xiongmai-osdrv-xm530/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/xmdp/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/yaml-cli/Config.in" source "$BR2_EXTERNAL_GENERAL_PATH/package/zerotier-one/Config.in" +source "$BR2_EXTERNAL_GENERAL_PATH/package/go2rtc/Config.in" diff --git a/general/package/aws-producer/aws-producer.mk b/general/package/aws-producer/aws-producer.mk index f78aea2d..0cb3b670 100644 --- a/general/package/aws-producer/aws-producer.mk +++ b/general/package/aws-producer/aws-producer.mk @@ -4,14 +4,9 @@ # ################################################################################ -ifeq ($(LOCAL_DOWNLOAD),y) AWS_PRODUCER_SITE_METHOD = git AWS_PRODUCER_SITE = https://github.com/awslabs/amazon-kinesis-video-streams-producer-c AWS_PRODUCER_VERSION = $(shell git ls-remote $(AWS_PRODUCER_SITE) HEAD | head -1 | cut -f1) -else -AWS_PRODUCER_SITE = https://github.com/awslabs/amazon-kinesis-video-streams-producer-c/archive -AWS_PRODUCER_SOURCE = master.tar.gz -endif AWS_PRODUCER_INSTALL_STAGING = YES AWS_PRODUCER_LICENSE = Apache-2.0 diff --git a/general/package/aws-webrtc/aws-webrtc.mk b/general/package/aws-webrtc/aws-webrtc.mk index 4b0eb73d..e4328b71 100644 --- a/general/package/aws-webrtc/aws-webrtc.mk +++ b/general/package/aws-webrtc/aws-webrtc.mk @@ -4,14 +4,9 @@ # ################################################################################ -ifeq ($(LOCAL_DOWNLOAD),y) AWS_WEBRTC_SITE_METHOD = git AWS_WEBRTC_SITE = https://github.com/OpenIPC/webrtc-c AWS_WEBRTC_VERSION = $(shell git ls-remote $(AWS_WEBRTC_SITE) develop | head -1 | cut -f1) -else -AWS_WEBRTC_SITE = https://github.com/OpenIPC/webrtc-c/archive -AWS_WEBRTC_SOURCE = develop.tar.gz -endif AWS_WEBRTC_INSTALL_STAGING = YES AWS_WEBRTC_LICENSE = Apache-2.0 diff --git a/general/package/datalink/files/tweaksys b/general/package/datalink/files/tweaksys index 8abcbae3..92f4feff 100755 --- a/general/package/datalink/files/tweaksys +++ b/general/package/datalink/files/tweaksys @@ -74,11 +74,11 @@ majestic_generic() { } majestic_sigmastar() { - cli -s .isp.exposure 10 - cli -s .isp.aGain 8 - cli -s .isp.dGain 8 + cli -s .isp.exposure 20 + cli -s .isp.aGain 40 + cli -s .isp.sensorConfig /etc/sensors/imx415_fpv.bin cli -s .video0.size 1920x1080 - cli -s .video0.fps 90 + cli -s .video0.fps 60 cli -s .video0.rcMode cbr cli -s .jpeg.enabled false } diff --git a/general/package/go2rtc/Config.in b/general/package/go2rtc/Config.in new file mode 100644 index 00000000..174b1da9 --- /dev/null +++ b/general/package/go2rtc/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_GO2RTC + bool "go2rtc streamer" + default n + help + Ultimate camera streaming application with support RTSP, WebRTC, HomeKit, FFmpeg, RTMP, etc. + Note: Binary will be UPX Compressed, binary size ~3.4mb + https://github.com/AlexxIT/go2rtc diff --git a/general/package/go2rtc/files/go2rtc.yaml b/general/package/go2rtc/files/go2rtc.yaml new file mode 100644 index 00000000..e2c61d17 --- /dev/null +++ b/general/package/go2rtc/files/go2rtc.yaml @@ -0,0 +1,20 @@ +log: + level: info # default level + api: trace + exec: debug + ngrok: info + rtsp: warn + streams: error + webrtc: fatal + +rtsp: + listen: ":8553" + +webrtc: + candidates: + - stun:8555 + +streams: + openipc_jpeg: http://username:password@127.0.0.1/image.jpg + openipc_rtsp-1: rtsp://username:password@127.0.0.1/stream=0 + openipc_rtsp-2: rtsp://username:password@127.0.0.1/stream=1 diff --git a/general/package/go2rtc/go2rtc.mk b/general/package/go2rtc/go2rtc.mk new file mode 100644 index 00000000..97b13fce --- /dev/null +++ b/general/package/go2rtc/go2rtc.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# go2rtc +# +################################################################################ + +GO2RTC_VERSION = master +GO2RTC_SITE = $(call github,AlexxIT,go2rtc,$(GO2RTC_VERSION)) +GO2RTC_LICENSE = MIT +GO2RTC_LICENSE_FILES = LICENSE + +GO2RTC_INSTALL_TARGET = YES + +GO2RTC_DEPENDENCIES = host-go host-upx +GO2RTC_GO_LDFLAGS = -s -w + +define GO2RTC_BUILD_CMDS + GOARCH=$$( \ + case $(BR2_ARCH) in \ + x86) echo 386 ;; \ + x86_64) echo amd64 ;; \ + arm) echo arm ;; \ + aarch64) echo arm64 ;; \ + mips) echo mips ;; \ + mipsel) echo mipsle ;; \ + *) echo "Unsupported architecture: $(BR2_ARCH)" && exit 1 ;; \ + esac \ + ); \ + echo "Building for GOARCH: $$GOARCH"; \ + (cd $(@D); \ + CGO_ENABLED=0 \ + GOOS=linux \ + GOARCH=$$GOARCH \ + go build -ldflags "$(GO2RTC_GO_LDFLAGS)") +endef + +define GO2RTC_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/go2rtc $(TARGET_DIR)/usr/bin/go2rtc + upx --best --lzma $(TARGET_DIR)/usr/bin/go2rtc + $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/ $(GO2RTC_PKGDIR)/files/go2rtc.yaml +endef + +$(eval $(golang-package)) diff --git a/general/package/goke-osdrv-gk7205v200/files/sensor/config/4l_sc223a_i2c_1080p.ini b/general/package/goke-osdrv-gk7205v200/files/sensor/config/4l_sc223a_i2c_1080p.ini new file mode 100644 index 00000000..8ee66117 --- /dev/null +++ b/general/package/goke-osdrv-gk7205v200/files/sensor/config/4l_sc223a_i2c_1080p.ini @@ -0,0 +1,78 @@ +[sensor] +Sensor_type=stSnsSc223aObj +Mode=WDR_MODE_NONE +DllFile=libsns_sc223a_4l.so + +[mode] +input_mode=INPUT_MODE_MIPI +raw_bitness=10 + +[mipi] +lane_id = 0|1|-1|-1|-1|-1|-1|-1| ;lane_id: -1 - disable + +[isp_image] +Isp_FrameRate=25 +Isp_Bayer=BAYER_BGGR + +[vi_dev] +Input_mod=VI_MODE_MIPI +Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0 + ;VI_WORK_MODE_2Multiplex, + ;VI_WORK_MODE_4Multiplex +Combine_mode =0 ;Y/C composite or separation mode + ;VI_COMBINE_COMPOSITE = 0 /*Composite mode */ + ;VI_COMBINE_SEPARATE, /*Separate mode */ +Comp_mode =0 ;Component mode (single-component or dual-component) + ;VI_COMP_MODE_SINGLE = 0, /*single component mode */ + ;VI_COMP_MODE_DOUBLE = 1, /*double component mode */ +Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge) + ;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */ + ;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */ +Mask_num =2 ;Component mask +Mask_0 =0xFFF00000 +Mask_1 =0x0 +Scan_mode = 1;VI_SCAN_INTERLACED = 0 + ;VI_SCAN_PROGRESSIVE, +Data_seq =2 ;data sequence (ONLY for YUV format) + ;----2th component U/V sequence in bt1120 + ; VI_INPUT_DATA_VUVU = 0, + ; VI_INPUT_DATA_UVUV, + ;----input sequence for yuv + ; VI_INPUT_DATA_UYVY = 0, + ; VI_INPUT_DATA_VYUY, + ; VI_INPUT_DATA_YUYV, + ; VI_INPUT_DATA_YVYU + +Vsync =1 ; vertical synchronization signal + ;VI_VSYNC_FIELD = 0, + ;VI_VSYNC_PULSE, +VsyncNeg=1 ;Polarity of the vertical synchronization signal + ;VI_VSYNC_NEG_HIGH = 0, + ;VI_VSYNC_NEG_LOW /*if VIU_VSYNC_E +Hsync =0 ;Attribute of the horizontal synchronization signal + ;VI_HSYNC_VALID_SINGNAL = 0, + ;VI_HSYNC_PULSE, +HsyncNeg =0 ;Polarity of the horizontal synchronization signal + ;VI_HSYNC_NEG_HIGH = 0, + ;VI_HSYNC_NEG_LOW +VsyncValid =1 ;Attribute of the valid vertical synchronization signal + ;VI_VSYNC_NORM_PULSE = 0, + ;VI_VSYNC_VALID_SINGAL, +VsyncValidNeg =0;Polarity of the valid vertical synchronization signal + ;VI_VSYNC_VALID_NEG_HIGH = 0, + ;VI_VSYNC_VALID_NEG_LOW +Timingblank_HsyncHfb =0 ;Horizontal front blanking width +Timingblank_HsyncAct =1920 ;Horizontal effetive width +Timingblank_HsyncHbb =0 ;Horizontal back blanking width +Timingblank_VsyncVfb =0 ;Vertical front blanking height +Timingblank_VsyncVact =1080 ;Vertical effetive width +Timingblank_VsyncVbb=0 ;Vertical back blanking height +Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive) +Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive) +Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive) +InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, +DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1 +DevRect_x=200 +DevRect_y=20 +DevRect_w=1920 +DevRect_h=1080 diff --git a/general/package/goke-osdrv-gk7205v200/files/sensor/libsns_sc223a_4l.so b/general/package/goke-osdrv-gk7205v200/files/sensor/libsns_sc223a_4l.so new file mode 100644 index 00000000..a75c02d5 Binary files /dev/null and b/general/package/goke-osdrv-gk7205v200/files/sensor/libsns_sc223a_4l.so differ diff --git a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk index 2e6b1767..b142f340 100644 --- a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk +++ b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk @@ -107,6 +107,7 @@ define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS ## $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(GOKE_OSDRV_GK7205V200_PKGDIR)/files/sensor/libsns_sc2235.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(GOKE_OSDRV_GK7205V200_PKGDIR)/files/sensor/libsns_sc2239.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(GOKE_OSDRV_GK7205V200_PKGDIR)/files/sensor/libsns_sc223a.so + $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(GOKE_OSDRV_GK7205V200_PKGDIR)/files/sensor/libsns_sc223a_4l.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(GOKE_OSDRV_GK7205V200_PKGDIR)/files/sensor/libsns_sc2335.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(GOKE_OSDRV_GK7205V200_PKGDIR)/files/sensor/libsns_sc3235.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(GOKE_OSDRV_GK7205V200_PKGDIR)/files/sensor/libsns_sc3335.so diff --git a/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon b/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon index 517fdda2..c5276e3e 100755 --- a/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv200/files/script/load_hisilicon @@ -103,7 +103,7 @@ insert_sns() { devmem 0x2003002c 32 0xc4001 # Sensor unreset, clk 24MHz, VI 99MHz ;; - ar0130 | gc1034 | jxf22 | sc1135 | sc1145 | sc2035 | sc2135) + ar0130 | ar0237 | gc1034 | jxf22 | sc1135 | sc1145 | sc2035 | sc2135) devmem 0x200f0040 32 0x2 # I2C0_SCL devmem 0x200f0044 32 0x2 # I2C0_SDA diff --git a/general/package/hisilicon-osdrv-hi3516cv200/files/sensor/config/ar0237_i2c_dc_1080p.ini b/general/package/hisilicon-osdrv-hi3516cv200/files/sensor/config/ar0237_i2c_dc_1080p.ini new file mode 100644 index 00000000..406a691a --- /dev/null +++ b/general/package/hisilicon-osdrv-hi3516cv200/files/sensor/config/ar0237_i2c_dc_1080p.ini @@ -0,0 +1,119 @@ +[sensor] +Sensor_type = ar0237 ;sensor name +Mode = 0 ;WDR_MODE_NONE = 0 + ;WDR_MODE_BUILT_IN = 1 + ;WDR_MODE_2To1_LINE = 2 + ;WDR_MODE_2To1_FRAME = 3 + ;WDR_MODE_2To1_FRAME_FULL_RATE = 4 ...etc +DllFile = /usr/lib/sensors/libsns_ar0237.so ;sensor lib path + +[mode] +input_mode = 4 ;INPUT_MODE_MIPI = 0 + ;INPUT_MODE_SUBLVDS = 1 + ;INPUT_MODE_LVDS = 2 ...etc +dev_attr = 2 ;mipi_dev_attr_t = 0 + ;lvds_dev_attr_t = 1 + ;NULL = 2 +[isp_image] +Isp_x = 0 +Isp_y = 0 +Isp_W = 1920 +Isp_H = 1080 +Isp_FrameRate = 30 +Isp_Bayer = 1 ;BAYER_RGGB= 0, BAYER_GRBG= 1, BAYER_GBRG= 2, BAYER_BGGR= 3 + +[vi_dev] +Input_mod = 2 ;VI_MODE_BT656 = 0, /* ITU-R BT.656 YUV4:2:2 */ + ;VI_MODE_BT601, /* ITU-R BT.601 YUV4:2:2 */ + ;VI_MODE_DIGITAL_CAMERA, /* digital camera mode */ + ;VI_MODE_BT1120_STANDARD, /* BT.1120 progressive mode */ + ;VI_MODE_BT1120_INTERLEAVED, /* BT.1120 interstage mode */ + ;VI_MODE_MIPI, /* MIPI mode*/ + ;VI_MODE_LVDS, + ;VI_MODE_HISPI +Work_mod = 0 ;VI_WORK_MODE_1Multiplex = 0 + ;VI_WORK_MODE_2Multiplex, + ;VI_WORK_MODE_4Multiplex +Combine_mode = 0 ;Y/C composite or separation mode + ;VI_COMBINE_COMPOSITE = 0 /*Composite mode */ + ;VI_COMBINE_SEPARATE, /*Separate mode */ +Comp_mode = 0 ;Component mode (single-component or dual-component) + ;VI_COMP_MODE_SINGLE = 0, /*single component mode */ + ;VI_COMP_MODE_DOUBLE = 1, /*double component mode */ +Clock_edge = 1 ;Clock edge mode (sampling on the rising or falling edge) + ;VI_CLK_EDGE_SINGLE_UP= 0, /*rising edge */ + ;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */ +Mask_num = 2 ;Component mask +Mask_0 = 0xFFF0000 ;ComMsk0 +Mask_1 = 0x0 ;ComMsk1 +Scan_mode = 1 ;VI_SCAN_INTERLACED = 0 + ;VI_SCAN_PROGRESSIVE, +Data_seq = 2 ;data sequence (ONLY for YUV format) + ;----2th component U/V sequence in bt1120 + ; VI_INPUT_DATA_VUVU = 0, + ; VI_INPUT_DATA_UVUV, + ;----input sequence for yuv + ; VI_INPUT_DATA_UYVY = 0, + ; VI_INPUT_DATA_VYUY, + ; VI_INPUT_DATA_YUYV, + ; VI_INPUT_DATA_YVYU +Vsync = 1 ;vertical synchronization signal + ;VI_VSYNC_FIELD = 0, + ;VI_VSYNC_PULSE, +VsyncNeg = 0 ;Polarity of the vertical synchronization signal + ;VI_VSYNC_NEG_HIGH = 0, + ;VI_VSYNC_NEG_LOW /*if VIU_VSYNC_E +Hsync = 0 ;Attribute of the horizontal synchronization signal + ;VI_HSYNC_VALID_SINGNAL = 0, + ;VI_HSYNC_PULSE, +HsyncNeg = 0 ;Polarity of the horizontal synchronization signal + ;VI_HSYNC_NEG_HIGH = 0, + ;VI_HSYNC_NEG_LOW +VsyncValid = 1 ;Attribute of the valid vertical synchronization signal + ;VI_VSYNC_NORM_PULSE = 0, + ;VI_VSYNC_VALID_SINGAL, +VsyncValidNeg = 0 ;Polarity of the valid vertical synchronization signal + ;VI_VSYNC_VALID_NEG_HIGH = 0, + ;VI_VSYNC_VALID_NEG_LOW +Timingblank_HsyncHfb = 0 ;Horizontal front blanking width +Timingblank_HsyncAct = 1920 ;Horizontal effetive width +Timingblank_HsyncHbb = 0 ;Horizontal back blanking width +Timingblank_VsyncVfb = 0 ;Vertical front blanking height +Timingblank_VsyncVact = 1080 ;Vertical effetive width +Timingblank_VsyncVbb = 0 ;Vertical back blanking height +Timingblank_VsyncVbfb = 0 ;Even-field vertical front blanking height(interlace, invalid progressive) +Timingblank_VsyncVbact = 0 ;Even-field vertical effetive width(interlace, invalid progressive) +Timingblank_VsyncVbbb = 0 ;Even-field vertical back blanking height(interlace, invalid progressive) + +;----- only for bt656 ---------- +FixCode = 0 ;BT656_FIXCODE_1 = 0, + ;BT656_FIXCODE_0 +FieldPolar = 0 ;BT656_FIELD_POLAR_STD = 0 + ;BT656_FIELD_POLAR_NSTD + +DataPath = 1 ;ISP enable or bypass + ;VI_PATH_BYPASS = 0,/* ISP bypass */ + ;VI_PATH_ISP = 1,/* ISP enable */ + ;VI_PATH_RAW = 2,/* Capture raw data, for debug */ +InputDataType = 1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1, +DataRev = FALSE ;Data reverse. FALSE = 0; TRUE = 1 +DevRect_x = 0 +DevRect_y = 0 +DevRect_w = 1920 +DevRect_h = 1080 + +[vi_chn] +CapRect_X = 0 +CapRect_Y = 0 +CapRect_Width = 1920 +CapRect_Height = 1080 +DestSize_Width = 1920 +DestSize_Height = 1080 +CapSel = 2 ;Frame/field select. ONLY used in interlaced mode + ;VI_CAPSEL_TOP = 0, /* top field */ + ;VI_CAPSEL_BOTTOM, /* bottom field */ + ;VI_CAPSEL_BOTH, /* top and bottom field */ +PixFormat = 23 ;PIXEL_FORMAT_YUV_SEMIPLANAR_422 = 22 + ;PIXEL_FORMAT_YUV_SEMIPLANAR_420 = 23 ...etc +CompressMode = 0 ;COMPRESS_MODE_NONE = 0 + diff --git a/general/package/hisilicon-osdrv-hi3516cv200/files/sensor/libsns_ar0237.so b/general/package/hisilicon-osdrv-hi3516cv200/files/sensor/libsns_ar0237.so new file mode 100644 index 00000000..67df1f17 Binary files /dev/null and b/general/package/hisilicon-osdrv-hi3516cv200/files/sensor/libsns_ar0237.so differ diff --git a/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk b/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk index 78e4c5ba..2dd22f4b 100644 --- a/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk +++ b/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk @@ -67,6 +67,7 @@ define HISILICON_OSDRV_HI3516CV200_INSTALL_TARGET_CMDS # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(HISILICON_OSDRV_HI3516CV200_PKGDIR)/files/sensor/libsns_9m034.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(HISILICON_OSDRV_HI3516CV200_PKGDIR)/files/sensor/libsns_ar0130.so # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(HISILICON_OSDRV_HI3516CV200_PKGDIR)/files/sensor/libsns_ar0230.so + # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(HISILICON_OSDRV_HI3516CV200_PKGDIR)/files/sensor/libsns_ar0237.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(HISILICON_OSDRV_HI3516CV200_PKGDIR)/files/sensor/libsns_gc1034.so $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(HISILICON_OSDRV_HI3516CV200_PKGDIR)/files/sensor/libsns_gc2023.so # $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors $(HISILICON_OSDRV_HI3516CV200_PKGDIR)/files/sensor/libsns_gc2033.so diff --git a/general/package/ingenic-libimp-control/ingenic-libimp-control.mk b/general/package/ingenic-libimp-control/ingenic-libimp-control.mk index 5c2d4cfd..e448b510 100644 --- a/general/package/ingenic-libimp-control/ingenic-libimp-control.mk +++ b/general/package/ingenic-libimp-control/ingenic-libimp-control.mk @@ -4,10 +4,14 @@ # ################################################################################ -INGENIC_LIBIMP_CONTROL_VERSION = master -INGENIC_LIBIMP_CONTROL_SITE = $(call github,gtxaspec,libimp_control,$(INGENIC_LIBIMP_CONTROL_VERSION)) -INGENIC_LIBIMP_CONTROL_LICENSE = GPL-2.0 -INGENIC_LIBIMP_CONTROL_LICENSE_FILES = COPYING +ifeq ($(LOCAL_DOWNLOAD),y) +INGENIC_LIBIMP_CONTROL_SITE_METHOD = git +INGENIC_LIBIMP_CONTROL_SITE = https://github.com/gtxaspec/libimp_control +INGENIC_LIBIMP_CONTROL_VERSION = $(shell git ls-remote $(INGENIC_LIBIMP_CONTROL_SITE) HEAD | head -1 | cut -f1) +else +INGENIC_LIBIMP_CONTROL_SITE = https://github.com/gtxaspec/libimp_control/archive +INGENIC_LIBIMP_CONTROL_SOURCE = master.tar.gz +endif define INGENIC_LIBIMP_CONTROL_BUILD_CMDS $(MAKE) CONFIG_SOC=$(OPENIPC_SOC_MODEL) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D) diff --git a/general/package/ingenic-motors-t31/Config.in b/general/package/ingenic-motors-t31/Config.in deleted file mode 100644 index 1c2855ab..00000000 --- a/general/package/ingenic-motors-t31/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_INGENIC_MOTORS_T31 - bool "ingenic-motors-t31" - depends on BR2_LINUX_KERNEL - help - Motor driver for Ingenic T31 using TCU2.2. - -comment "ingenic-motors-t31 needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/general/package/ingenic-motors-t31/ingenic-motors-t31.mk b/general/package/ingenic-motors-t31/ingenic-motors-t31.mk deleted file mode 100644 index bb364dfb..00000000 --- a/general/package/ingenic-motors-t31/ingenic-motors-t31.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# Ingenic Motors Driver -# -################################################################################ - -INGENIC_MOTORS_T31_LICENSE = GPL-2.0 - -define INGENIC_MOTORS_T31_EXTRACT_CMDS - cp -av $(INGENIC_MOTORS_T31_PKGDIR)/src/* $(@D)/ -endef - -INGENIC_MOTORS_T31_MODULE_MAKE_OPTS = \ - INSTALL_MOD_PATH=$(TARGET_DIR) \ - INSTALL_MOD_DIR=ingenic \ - KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/general/package/ingenic-motors-t31/src/Makefile b/general/package/ingenic-motors-t31/src/Makefile deleted file mode 100644 index e9488b8c..00000000 --- a/general/package/ingenic-motors-t31/src/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -#CROSS_COMPILE ?= mips-linux-gnu- -#KDIR := ${ISVP_ENV_KERNEL_DIR} - -############################################################################ - -PWD:=$(shell pwd) -INSTALL_DIR := $(PWD)/output - -DEFS = - -MOTORS_NAME := sample_motor - -$(MOTORS_NAME)-objs := motor.o -obj-m := $(MOTORS_NAME).o - - -EXTRA_CFLAGS := $(DEFS) - -all: modules install - -modules: clean - $(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KDIR) M=$(shell pwd) modules -j8 - -strip: - $(CROSS_COMPILE)strip $(INSTALL_DIR)/*.ko --strip-unneeded - -install: modules - mkdir -p $(INSTALL_DIR) - chmod 777 $(INSTALL_DIR) - cp *.ko $(INSTALL_DIR) - -clean: - @rm -rf *.o *~ .depend .*.cmd *.mod.c .tmp_versions *.ko *.symvers modules.order - make -C $(KDIR) M=$(PWD) ARCH=$(ARCH) clean - -.PHONY: modules clean diff --git a/general/package/ingenic-motors-t31/src/motor.c b/general/package/ingenic-motors-t31/src/motor.c deleted file mode 100644 index 40165f32..00000000 --- a/general/package/ingenic-motors-t31/src/motor.c +++ /dev/null @@ -1,1098 +0,0 @@ -/* - * motor.c - Ingenic motor driver - * - * Copyright (C) 2015 Ingenic Semiconductor Co.,Ltd - * http://www.ingenic.com - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef CONFIG_SOC_T40 -#include -#else -#include -#endif -#include -#include -#ifdef CONFIG_SOC_T40 -#include -#else -#include -#include -#endif - -#include -#include - -#include -#include -#include -#include -#include -#include "motor.h" -#define JZ_MOTOR_DRIVER_VERSION "H20171204a-16-jul-23-openipc" - -#define HMOTOR2VMOTORRATIO 1 -static unsigned int hmotor2vmotor = 1; -module_param(hmotor2vmotor, int, S_IRUGO); -MODULE_PARM_DESC(hmotor2vmotor, "The value is hmotor's speed / vmotor's"); - - -static unsigned int hmaxstep = 4300; -module_param(hmaxstep, int, S_IRUGO); -MODULE_PARM_DESC(hmaxstep, "The max steps of horizontal motor"); - -static unsigned int vmaxstep = 300; -module_param(vmaxstep, int, S_IRUGO); -MODULE_PARM_DESC(vmaxstep, "The max steps of vertical motor"); - -/* custom definition for GPIOs (so it's generic rather than hardcoded) */ -int hmin = -1; -module_param(hmin, int, S_IRUGO); -MODULE_PARM_DESC(hmin, "Horizontal motor start point GPIO"); - -int hmax = -1; -module_param(hmax, int, S_IRUGO); -MODULE_PARM_DESC(hmax, "Horizontal motor stop point GPIO"); - -int hlevel = 0; -module_param(hlevel, int, S_IRUGO); -MODULE_PARM_DESC(hlevel, "Horizontal motor IRQ style"); - -int hst1 = 49; -module_param(hst1, int, S_IRUGO); -MODULE_PARM_DESC(hst1, "Horizontal motor GPIO for Phase A. Use absolute GPIO index (i.e. GPIOB is 32 + gpio pin, GPIOC is 64 + gpio pin, etc)"); - -int hst2 = 57; -module_param(hst2, int, S_IRUGO); -MODULE_PARM_DESC(hst2, "Horizontal motor GPIO for Phase B. Use absolute GPIO index (i.e. GPIOB is 32 + gpio pin, GPIOC is 64 + gpio pin, etc)"); - -int hst3 = 54; -module_param(hst3, int, S_IRUGO); -MODULE_PARM_DESC(hst3, "Horizontal motor GPIO for Phase C. Use absolute GPIO index (i.e. GPIOB is 32 + gpio pin, GPIOC is 64 + gpio pin, etc)"); - -int hst4 = 51; -module_param(hst4, int, S_IRUGO); -MODULE_PARM_DESC(hst4, "Horizontal motor GPIO for Phase D. Use absolute GPIO index (i.e. GPIOB is 32 + gpio pin, GPIOC is 64 + gpio pin, etc)"); - -int vmin = -1; -module_param(vmin, int, S_IRUGO); -MODULE_PARM_DESC(vmin, "Vertical motor start point GPIO"); - -int vmax = -1; -module_param(vmax, int, S_IRUGO); -MODULE_PARM_DESC(vmax, "Vertical motor stop point GPIO"); - -int vlevel = 0; -module_param(vlevel, int, S_IRUGO); -MODULE_PARM_DESC(vlevel, "Vertical motor IRQ style"); - -int vst1 = 60; -module_param(vst1, int, S_IRUGO); -MODULE_PARM_DESC(vst1, "Vertical motor GPIO for Phase A. Use absolute GPIO index (i.e. GPIOB is 32 + gpio pin, GPIOC is 64 + gpio pin, etc)"); - -int vst2 = 61; -module_param(vst2, int, S_IRUGO); -MODULE_PARM_DESC(vst2, "Vertical motor GPIO for Phase B. Use absolute GPIO index (i.e. GPIOB is 32 + gpio pin, GPIOC is 64 + gpio pin, etc)"); - -int vst3 = 62; -module_param(vst3, int, S_IRUGO); -MODULE_PARM_DESC(vst3, "Vertical motor GPIO for Phase C. Use absolute GPIO index (i.e. GPIOB is 32 + gpio pin, GPIOC is 64 + gpio pin, etc)"); - -int vst4 = 63; -module_param(vst4, int, S_IRUGO); -MODULE_PARM_DESC(vst4, "Vertical motor GPIO for Phase D. Use absolute GPIO index (i.e. GPIOB is 32 + gpio pin, GPIOC is 64 + gpio pin, etc)"); - - -struct motor_platform_data motors_pdata[HAS_MOTOR_CNT] = { - { - .name = "Horizontal motor", - .motor_min_gpio = -1, - .motor_max_gpio = -1, - .motor_gpio_level = -1, - .motor_st1_gpio = -1, - .motor_st2_gpio = -1, - .motor_st3_gpio = -1, - .motor_st4_gpio = -1, - }, - { - .name = "Vertical motor", - .motor_min_gpio = -1, - .motor_max_gpio = -1, - .motor_gpio_level = -1, - .motor_st1_gpio = -1, - .motor_st2_gpio = -1, - .motor_st3_gpio = -1, - .motor_st4_gpio = -1, - }, -}; - -static void motor_set_default(struct motor_device *mdev) -{ - int index = 0; - struct motor_driver *motor = NULL; - mdev->dev_state = MOTOR_OPS_STOP; - for(index = 0; index < HAS_MOTOR_CNT; index++){ - motor = &mdev->motors[index]; - motor->state = MOTOR_OPS_STOP; - if (motor->pdata->motor_st1_gpio) - gpio_direction_output(motor->pdata->motor_st1_gpio, 0); - if (motor->pdata->motor_st2_gpio) - gpio_direction_output(motor->pdata->motor_st2_gpio, 0); - if (motor->pdata->motor_st3_gpio) - gpio_direction_output(motor->pdata->motor_st3_gpio, 0); - if (motor->pdata->motor_st4_gpio) - gpio_direction_output(motor->pdata->motor_st4_gpio, 0); - } - return; -} - -static unsigned char step_8[8] = { - 0x08, - 0x0c, - 0x04, - 0x06, - 0x02, - 0x03, - 0x01, - 0x09 -}; - -static void motor_move_step(struct motor_device *mdev, int index) -{ - struct motor_driver *motor = NULL; - int step = 0; - - motor = &mdev->motors[index]; - if(motor->state != MOTOR_OPS_STOP){ - step = motor->cur_steps % 8; - step = step < 0 ? step + 8 : step; - if (motor->pdata->motor_st1_gpio) - gpio_direction_output(motor->pdata->motor_st1_gpio, step_8[step] & 0x8); - if (motor->pdata->motor_st2_gpio) - gpio_direction_output(motor->pdata->motor_st2_gpio, step_8[step] & 0x4); - if (motor->pdata->motor_st3_gpio) - gpio_direction_output(motor->pdata->motor_st3_gpio, step_8[step] & 0x2); - if (motor->pdata->motor_st4_gpio) - gpio_direction_output(motor->pdata->motor_st4_gpio, step_8[step] & 0x1); - }else{ - if (motor->pdata->motor_st1_gpio) - gpio_direction_output(motor->pdata->motor_st1_gpio, 0); - if (motor->pdata->motor_st2_gpio) - gpio_direction_output(motor->pdata->motor_st2_gpio, 0); - if (motor->pdata->motor_st3_gpio) - gpio_direction_output(motor->pdata->motor_st3_gpio, 0); - if (motor->pdata->motor_st4_gpio) - gpio_direction_output(motor->pdata->motor_st4_gpio, 0); - } - if(motor->state == MOTOR_OPS_RESET){ - motor->total_steps++; - } - - return; -} - -static void move_to_min_pose_ops(struct motor_driver *motor) -{ - // printk("%s min %d\n",motor->pdata->name,__LINE__); - if(motor->state == MOTOR_OPS_RESET){ - /* motor->state = MOTOR_OPS_STOP; */ - /* // complete(&motor->reset_completion); */ - /* motor->move_dir = MOTOR_MOVE_RIGHT_UP; */ - }else if(motor->state == MOTOR_OPS_NORMAL){ - if(motor->move_dir == MOTOR_MOVE_LEFT_DOWN){ - motor->state = MOTOR_OPS_STOP; - } - }else - motor->move_dir = MOTOR_MOVE_RIGHT_UP; - - motor->cur_steps = 0; - //printk("%s min; cur_steps = %d max_steps = %d\n", motor->pdata->name,motor->cur_steps, motor->max_steps); -} - -static void move_to_max_pose_ops(struct motor_driver *motor,int index) -{ - if(motor->state == MOTOR_OPS_RESET){ - motor->state = MOTOR_OPS_STOP; - if(index ==HORIZONTAL_MOTOR) - motor->max_steps=hmaxstep; - else - motor->max_steps=vmaxstep; - complete(&motor->reset_completion); - motor->move_dir = MOTOR_MOVE_LEFT_DOWN; - }else if(motor->state == MOTOR_OPS_NORMAL){ - if(motor->move_dir == MOTOR_MOVE_RIGHT_UP){ - motor->state = MOTOR_OPS_STOP; - } - }else - motor->move_dir = MOTOR_MOVE_LEFT_DOWN; - motor->cur_steps = motor->max_steps; - //printk("%s max; cur_steps = %d max_steps = %d\n", motor->pdata->name,motor->cur_steps, motor->max_steps); -} - - -static char skip_move_mode[4][4] = {{2,0,0,0}, - {3,2,0,0}, - {4,3,2,0}, - {4,3,2,1}}; - -static inline void calc_slow_mode(struct motor_device *mdev, unsigned int steps) -{ - int index = steps / 10; - index = index > 3 ? 3 : index; - mdev->skip_mode = skip_move_mode[index]; -} - -/* return: 1 --> move, 0 --> don't move */ -static inline int whether_move_func(struct motor_device *mdev, unsigned int remainder) -{ - if(remainder == 0) - return 0; - - remainder = remainder / 10; - remainder = remainder > 3 ? 3: remainder; - if(mdev->counter % mdev->skip_mode[remainder] == 0) - return 1; - else - return 0; -} - -static irqreturn_t jz_timer_interrupt(int irq, void *dev_id) -{ - struct motor_device *mdev = dev_id; - struct motor_move *dst = &mdev->dst_move; - struct motor_move *cur = &mdev->cur_move; - struct motor_driver *motors = mdev->motors; - - if(motors[HORIZONTAL_MOTOR].state == MOTOR_OPS_STOP - && motors[VERTICAL_MOTOR].state == MOTOR_OPS_STOP){ - mdev->dev_state = MOTOR_OPS_STOP; - motor_move_step(mdev, HORIZONTAL_MOTOR); - motor_move_step(mdev, VERTICAL_MOTOR); - if(mdev->wait_stop){ - mdev->wait_stop = 0; - complete(&mdev->stop_completion); - } - return IRQ_HANDLED; - } - - if(motors[HORIZONTAL_MOTOR].cur_steps <= 0) - move_to_min_pose_ops(&motors[HORIZONTAL_MOTOR]); - - if(motors[HORIZONTAL_MOTOR].cur_steps >= motors[HORIZONTAL_MOTOR].max_steps) - move_to_max_pose_ops(&motors[HORIZONTAL_MOTOR],HORIZONTAL_MOTOR); - - if(motors[VERTICAL_MOTOR].cur_steps <= 0) - move_to_min_pose_ops(&motors[VERTICAL_MOTOR]); - - if(motors[VERTICAL_MOTOR].cur_steps >= motors[VERTICAL_MOTOR].max_steps) - move_to_max_pose_ops(&motors[VERTICAL_MOTOR],VERTICAL_MOTOR); - - if(mdev->dev_state == MOTOR_OPS_CRUISE){ - mdev->counter++; - motors[HORIZONTAL_MOTOR].cur_steps += motors[HORIZONTAL_MOTOR].move_dir; - if(mdev->counter % hmotor2vmotor == 0) - motors[VERTICAL_MOTOR].cur_steps += motors[VERTICAL_MOTOR].move_dir; - motor_move_step(mdev, HORIZONTAL_MOTOR); - motor_move_step(mdev, VERTICAL_MOTOR); - }else if(mdev->dev_state == MOTOR_OPS_RESET){ - if(motors[HORIZONTAL_MOTOR].state != MOTOR_OPS_STOP){ - motors[HORIZONTAL_MOTOR].cur_steps += motors[HORIZONTAL_MOTOR].move_dir; - motor_move_step(mdev, HORIZONTAL_MOTOR); - cur->one.x++; - } - if(motors[VERTICAL_MOTOR].state != MOTOR_OPS_STOP){ - motors[VERTICAL_MOTOR].cur_steps += motors[VERTICAL_MOTOR].move_dir; - motor_move_step(mdev, VERTICAL_MOTOR); - cur->one.y++; - } - }else{ - mdev->counter++; - - if(cur->one.x < dst->one.x && motors[HORIZONTAL_MOTOR].state != MOTOR_OPS_STOP){ - if(whether_move_func(mdev, dst->one.x - cur->one.x)){ - motors[HORIZONTAL_MOTOR].cur_steps += motors[HORIZONTAL_MOTOR].move_dir; - motor_move_step(mdev, HORIZONTAL_MOTOR); - cur->one.x++; - } - }else{ - motors[HORIZONTAL_MOTOR].state = MOTOR_OPS_STOP; - } - - if(cur->one.y < dst->one.y && motors[VERTICAL_MOTOR].state != MOTOR_OPS_STOP){ - if(mdev->counter % hmotor2vmotor == 0){ - motors[VERTICAL_MOTOR].cur_steps += motors[VERTICAL_MOTOR].move_dir; - cur->one.y++; - motor_move_step(mdev, VERTICAL_MOTOR); - } - }else{ - motors[VERTICAL_MOTOR].state = MOTOR_OPS_STOP; - } - } - return IRQ_HANDLED; -} - -static long motor_ops_move(struct motor_device *mdev, int x, int y) -{ - struct motor_driver *motors = mdev->motors; - unsigned long flags; - int x_dir = MOTOR_MOVE_STOP; - int y_dir = MOTOR_MOVE_STOP; - int x1 = 0; - int y1 = 0; - /* check x value */ - if(x > 0){ - if(motors[HORIZONTAL_MOTOR].cur_steps >= motors[HORIZONTAL_MOTOR].max_steps) - x = 0; - }else{ - if(motors[HORIZONTAL_MOTOR].cur_steps <= 0) - x = 0; - } - /* check y value */ - if(y > 0){ - if(motors[VERTICAL_MOTOR].cur_steps >= motors[VERTICAL_MOTOR].max_steps) - y = 0; - }else{ - if(motors[VERTICAL_MOTOR].cur_steps <= 0) - y = 0; - } - - /*x_dir = x > 0 ? MOTOR_MOVE_RIGHT_UP : (x < 0 ? MOTOR_MOVE_LEFT_DOWN: MOTOR_MOVE_STOP);*/ - /*y_dir = y > 0 ? MOTOR_MOVE_RIGHT_UP : (y < 0 ? MOTOR_MOVE_LEFT_DOWN: MOTOR_MOVE_STOP);*/ - x_dir = x > 0 ? MOTOR_MOVE_RIGHT_UP : MOTOR_MOVE_LEFT_DOWN; - y_dir = y > 0 ? MOTOR_MOVE_RIGHT_UP : MOTOR_MOVE_LEFT_DOWN; - x1 = x < 0 ? 0 - x : x; - y1 = y < 0 ? 0 - y : y; - - if(x1 + y1 == 0) - return 0; - - mutex_lock(&mdev->dev_mutex); - spin_lock_irqsave(&mdev->slock, flags); - - calc_slow_mode(mdev, x1); - mdev->counter = 0; - mdev->dev_state = MOTOR_OPS_NORMAL; - mdev->dst_move.one.x = x1; - mdev->dst_move.one.y = y1; - mdev->cur_move.one.x = 0; - mdev->cur_move.one.y = 0; - motors[HORIZONTAL_MOTOR].state = MOTOR_OPS_NORMAL; - motors[HORIZONTAL_MOTOR].move_dir = x_dir; - motors[VERTICAL_MOTOR].state = MOTOR_OPS_NORMAL; - motors[VERTICAL_MOTOR].move_dir = y_dir; - spin_unlock_irqrestore(&mdev->slock, flags); - mutex_unlock(&mdev->dev_mutex); - /* printk("%s%d x=%d y=%d t=%d\n",__func__,__LINE__,mdev->dst_move.one.x,mdev->dst_move.one.y,mdev->dst_move.times); */ - /* printk("x_dir=%d,y_dir=%d\n",x_dir,y_dir); */ -#ifdef CONFIG_SOC_T40 - ingenic_tcu_counter_begin(mdev->tcu); -#else - jz_tcu_enable_counter(mdev->tcu); -#endif - return 0; -} - -static void motor_ops_stop(struct motor_device *mdev) -{ - unsigned long flags; - long ret = 0; - unsigned int remainder = 0; - struct motor_driver *motors = mdev->motors; - struct motor_move *dst = &mdev->dst_move; - struct motor_move *cur = &mdev->cur_move; - - - if(mdev->dev_state == MOTOR_OPS_STOP) - return; - - mutex_lock(&mdev->dev_mutex); - spin_lock_irqsave(&mdev->slock, flags); - - if(mdev->dev_state == MOTOR_OPS_NORMAL){ - remainder = dst->one.x - cur->one.x; - if(remainder > 30){ - dst->one.x = 29; - cur->one.x = 0; - } - remainder = dst->one.y - cur->one.y; - if(remainder > 8){ - dst->one.y = 6; - cur->one.y = 0; - } - } - - if(mdev->dev_state == MOTOR_OPS_CRUISE){ - mdev->dev_state = MOTOR_OPS_NORMAL; - motors[HORIZONTAL_MOTOR].state = MOTOR_OPS_NORMAL; - motors[VERTICAL_MOTOR].state = MOTOR_OPS_NORMAL; - dst->one.x = 0; - cur->one.x = 0; - dst->one.y = 0; - cur->one.y = 0; - } - - mdev->counter = 0; - mdev->wait_stop = 1; - spin_unlock_irqrestore(&mdev->slock, flags); - mutex_unlock(&mdev->dev_mutex); - do{ - ret = wait_for_completion_interruptible_timeout(&mdev->stop_completion, msecs_to_jiffies(15000)); - if(ret == 0){ - ret = -ETIMEDOUT; - break; - } - }while(ret == -ERESTARTSYS); -#ifdef CONFIG_SOC_T40 - ingenic_tcu_counter_stop(mdev->tcu); -#else - jz_tcu_disable_counter(mdev->tcu); -#endif - /*mdev->dev_state = MOTOR_OPS_STOP;*/ - /*motors[HORIZONTAL_MOTOR].state = MOTOR_OPS_STOP;*/ - /*motors[VERTICAL_MOTOR].state = MOTOR_OPS_STOP;*/ - motor_set_default(mdev); - return; -} - -static long motor_ops_goback(struct motor_device *mdev) -{ - struct motor_driver *motors = mdev->motors; - int sx, sy; - int cx, cy; - sx = motors[HORIZONTAL_MOTOR].max_steps >> 1; - sy = motors[VERTICAL_MOTOR].max_steps >> 1; - cx = motors[HORIZONTAL_MOTOR].cur_steps; - cy = motors[VERTICAL_MOTOR].cur_steps; - //printk("sx=%d,sy=%d,cx=%d,cy=%d\n",sx,sy,cx,cy); - return motor_ops_move(mdev, sx-cx, sy-cy); -} - -static long motor_ops_cruise(struct motor_device *mdev) -{ - unsigned long flags; - struct motor_driver *motors = mdev->motors; - motor_ops_goback(mdev); - mutex_lock(&mdev->dev_mutex); - spin_lock_irqsave(&mdev->slock, flags); - mdev->dev_state = MOTOR_OPS_CRUISE; - motors[HORIZONTAL_MOTOR].state = MOTOR_OPS_CRUISE; - motors[VERTICAL_MOTOR].state = MOTOR_OPS_CRUISE; - spin_unlock_irqrestore(&mdev->slock, flags); - mutex_unlock(&mdev->dev_mutex); -#ifdef CONFIG_SOC_T40 - ingenic_tcu_counter_begin(mdev->tcu); -#else - jz_tcu_enable_counter(mdev->tcu); -#endif - return 0; -} - -static void motor_get_message(struct motor_device *mdev, struct motor_message *msg) -{ - struct motor_driver *motors = mdev->motors; - msg->x = motors[HORIZONTAL_MOTOR].cur_steps; - msg->y = motors[VERTICAL_MOTOR].cur_steps; - msg->speed = mdev->tcu_speed; - if(mdev->dev_state == MOTOR_OPS_STOP) - msg->status = MOTOR_IS_STOP; - else - msg->status = MOTOR_IS_RUNNING; - /* This is not standard, return the max_steps of each motor */ - msg->x_max_steps = motors[HORIZONTAL_MOTOR].max_steps; - msg->y_max_steps = motors[VERTICAL_MOTOR].max_steps; - return; -} - -static inline int motor_ops_reset_check_params(struct motor_reset_data *rdata) -{ - if(rdata->x_max_steps == 0 || rdata->y_max_steps == 0){ - return -1; - } - if(rdata->x_max_steps < rdata->x_cur_step || rdata->x_max_steps < rdata->x_cur_step) - return -1; - return 0; -} - -static long motor_ops_reset(struct motor_device *mdev, struct motor_reset_data *rdata) -{ - unsigned long flags; - int index = 0; - long ret = 0; - int times = 0; - struct motor_message msg; - printk("%s%d\n",__func__,__LINE__); - - if(mdev == NULL || rdata == NULL){ - printk("ERROR: the parameters of %s is wrong!!\n",__func__); - return -EPERM; - } - - if(motor_ops_reset_check_params(rdata) == 0){ - /* app set max steps and current pos */ - mutex_lock(&mdev->dev_mutex); - spin_lock_irqsave(&mdev->slock, flags); - mdev->motors[HORIZONTAL_MOTOR].max_steps = rdata->x_max_steps; - mdev->motors[HORIZONTAL_MOTOR].cur_steps = rdata->x_cur_step; - mdev->motors[VERTICAL_MOTOR].max_steps = rdata->y_max_steps; - mdev->motors[VERTICAL_MOTOR].cur_steps = rdata->y_cur_step; - spin_unlock_irqrestore(&mdev->slock, flags); - mutex_unlock(&mdev->dev_mutex); - }else{ - /* driver calculate max steps. */ - mutex_lock(&mdev->dev_mutex); - spin_lock_irqsave(&mdev->slock, flags); - for(index = 0; index < HAS_MOTOR_CNT; index++){ - mdev->motors[index].move_dir = MOTOR_MOVE_RIGHT_UP; - mdev->motors[index].state = MOTOR_OPS_RESET; - mdev->motors[index].cur_steps = 0x0; - } - mdev->dst_move.one.x = mdev->motors[HORIZONTAL_MOTOR].max_steps; - mdev->dst_move.one.y = mdev->motors[VERTICAL_MOTOR].max_steps; - mdev->dst_move.times = 1; - mdev->cur_move.one.x = 0; - mdev->cur_move.one.y = 0; - mdev->cur_move.times = 0; - mdev->dev_state = MOTOR_OPS_RESET; - spin_unlock_irqrestore(&mdev->slock, flags); - mutex_unlock(&mdev->dev_mutex); -#ifdef CONFIG_SOC_T40 - ingenic_tcu_counter_begin(mdev->tcu); -#else - jz_tcu_enable_counter(mdev->tcu); -#endif - - for(index = 0; index < HAS_MOTOR_CNT; index++){ - do{ - ret = wait_for_completion_interruptible_timeout(&mdev->motors[index].reset_completion, msecs_to_jiffies(150000)); - if(ret == 0){ - ret = -ETIMEDOUT; - goto exit; - } - }while(ret == -ERESTARTSYS); - } - } - //printk("x_max = %d, y_max = %d\n", mdev->motors[HORIZONTAL_MOTOR].max_steps, - //mdev->motors[VERTICAL_MOTOR].max_steps); - ret = motor_ops_goback(mdev); - /*ret = motor_ops_move(mdev, (mdev->motors[HORIZONTAL_MOTOR].max_steps) >> 1, */ - /*(mdev->motors[VERTICAL_MOTOR].max_steps) >> 1);*/ - - do{ - msleep(10); - motor_get_message(mdev, &msg); - times++; - if(times > 1000){ - printk("ERROR:wait motor timeout %s%d\n",__func__,__LINE__); - ret = -ETIMEDOUT; - goto exit; - } - }while(msg.status == MOTOR_IS_RUNNING); - ret = 0; - - /* sync data */ - rdata->x_max_steps = mdev->motors[HORIZONTAL_MOTOR].max_steps; - rdata->x_cur_step = mdev->motors[HORIZONTAL_MOTOR].cur_steps; - rdata->y_max_steps = mdev->motors[VERTICAL_MOTOR].max_steps; - rdata->y_cur_step = mdev->motors[VERTICAL_MOTOR].cur_steps; - -exit: -#ifdef CONFIG_SOC_T40 - ingenic_tcu_counter_stop(mdev->tcu); -#else - jz_tcu_disable_counter(mdev->tcu); -#endif - msleep(10); - motor_set_default(mdev); - return ret; -} - -static int motor_speed(struct motor_device *mdev, int speed) -{ - __asm__("ssnop"); - if ((speed < MOTOR_MIN_SPEED) || (speed > MOTOR_MAX_SPEED)) { - dev_err(mdev->dev, "speed(%d) set error\n", speed); - return -1; - } - __asm__("ssnop"); - - mdev->tcu_speed = speed; -#ifdef CONFIG_SOC_T40 - ingenic_tcu_set_period(mdev->tcu->cib.id,(24000000 / 64 / mdev->tcu_speed)); -#else - jz_tcu_set_period(mdev->tcu, (24000000 / 64 / mdev->tcu_speed)); -#endif - return 0; -} - -static int motor_open(struct inode *inode, struct file *file) -{ - struct miscdevice *dev = file->private_data; - struct motor_device *mdev = container_of(dev, struct motor_device, misc_dev); - int ret = 0; - if(mdev->flag){ - ret = -EBUSY; - dev_err(mdev->dev, "Motor driver busy now!\n"); - }else{ - mdev->flag = 1; - } - - return ret; -} - -static int motor_release(struct inode *inode, struct file *file) -{ - struct miscdevice *dev = file->private_data; - struct motor_device *mdev = container_of(dev, struct motor_device, misc_dev); - motor_ops_stop(mdev); - mdev->flag = 0; - return 0; -} - -static long motor_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) -{ - struct miscdevice *dev = filp->private_data; - struct motor_device *mdev = container_of(dev, struct motor_device, misc_dev); - long ret = 0; - - if(mdev->flag == 0){ - printk("Please Open /dev/motor Firstly\n"); - return -EPERM; - } - - switch (cmd) { - case MOTOR_STOP: - motor_ops_stop(mdev); - /*printk("MOTOR_STOP!!!!!!!!!!!!!!!!!!!\n");*/ - break; - case MOTOR_RESET: - { - struct motor_reset_data rdata; - if(arg == 0){ - ret = -EPERM; - break; - } - if (copy_from_user(&rdata, (void __user *)arg, - sizeof(rdata))) { - dev_err(mdev->dev, "[%s][%d] copy from user error\n", - __func__, __LINE__); - return -EFAULT; - } - ret = motor_ops_reset(mdev, &rdata); - if(!ret){ - if (copy_to_user((void __user *)arg, &rdata, - sizeof(rdata))) { - dev_err(mdev->dev, "[%s][%d] copy to user error\n", - __func__, __LINE__); - return -EFAULT; - } - } - /*printk("MOTOR_RESET!!!!!!!!!!!!!!!!!!!\n");*/ - break; - } - case MOTOR_MOVE: - { - struct motors_steps dst; - if (copy_from_user(&dst, (void __user *)arg, - sizeof(struct motors_steps))) { - dev_err(mdev->dev, "[%s][%d] copy from user error\n", - __func__, __LINE__); - return -EFAULT; - } - ret = motor_ops_move(mdev, dst.x, dst.y); - /*printk("MOTOR_MOVE!!!!!!!!!!!!!!!!!!!\n");*/ - } - break; - case MOTOR_GET_STATUS: - { - struct motor_message msg; - - motor_get_message(mdev, &msg); - if (copy_to_user((void __user *)arg, &msg, - sizeof(struct motor_message))) { - dev_err(mdev->dev, "[%s][%d] copy to user error\n", - __func__, __LINE__); - return -EFAULT; - } - } - /*printk("MOTOR_GET_STATUS!!!!!!!!!!!!!!!!!!\n");*/ - break; - case MOTOR_SPEED: - { - int speed; - - if (copy_from_user(&speed, (void __user *)arg, sizeof(int))) { - dev_err(mdev->dev, "[%s][%d] copy to user error\n", __func__, __LINE__); - return -EFAULT; - } - - motor_speed(mdev, speed); - } - /*printk("MOTOR_SPEED!!!!!!!!!!!!!!!!!!!!!!!\n");*/ - break; - case MOTOR_GOBACK: - /*printk("MOTOR_GOBACK!!!!!!!!!!!!!!!!!!!!!!!\n");*/ - ret = motor_ops_goback(mdev); - break; - case MOTOR_CRUISE: - /*printk("MOTOR_CRUISE!!!!!!!!!!!!!!!!!!!!!!!\n");*/ - ret = motor_ops_cruise(mdev); - break; - default: - return -EINVAL; - } - - return ret; -} - -static struct file_operations motor_fops = { - .open = motor_open, - .release = motor_release, - .unlocked_ioctl = motor_ioctl, -}; - -static int motor_info_show(struct seq_file *m, void *v) -{ - int len = 0; - struct motor_device *mdev = (struct motor_device *)(m->private); - struct motor_message msg; - int index = 0; - -#ifdef CONFIG_SOC_T40 - seq_printf(m ,"The version of Motor driver is %s. SoC is T40\n",JZ_MOTOR_DRIVER_VERSION); - seq_printf(m ,"Motor driver is %s\n", mdev->flag?"opened":"closed"); - seq_printf(m ,"The max speed is %d and the min speed is %d\n", MOTOR_MAX_SPEED, MOTOR_MIN_SPEED); - motor_get_message(mdev, &msg); - seq_printf(m ,"The status of motor is %s\n", msg.status?"running":"stop"); - seq_printf(m ,"The pos of motor is (%d, %d)\n", msg.x, msg.y); - seq_printf(m ,"The speed of motor is %d\n", msg.speed); - - for(index = 0; index < HAS_MOTOR_CNT; index++){ - seq_printf(m ,"## motor is %s ##\n", mdev->motors[index].pdata->name); - seq_printf(m ,"max steps %d\n", mdev->motors[index].max_steps); - seq_printf(m ,"motor direction %d\n", mdev->motors[index].move_dir); - seq_printf(m ,"motor state %d (normal; cruise; reset)\n", mdev->motors[index].state); - seq_printf(m ,"the irq's counter of max pos is %d\n", mdev->motors[index].max_pos_irq_cnt); - seq_printf(m ,"the irq's counter of min pos is %d\n", mdev->motors[index].min_pos_irq_cnt); - } -#else - len += seq_printf(m ,"The version of Motor driver is %s. SoC is not T40\n",JZ_MOTOR_DRIVER_VERSION); - len += seq_printf(m ,"Motor driver is %s\n", mdev->flag?"opened":"closed"); - len += seq_printf(m ,"The max speed is %d and the min speed is %d\n", MOTOR_MAX_SPEED, MOTOR_MIN_SPEED); - motor_get_message(mdev, &msg); - len += seq_printf(m ,"The status of motor is %s\n", msg.status?"running":"stop"); - len += seq_printf(m ,"The pos of motor is (%d, %d)\n", msg.x, msg.y); - len += seq_printf(m ,"The speed of motor is %d\n", msg.speed); - - for(index = 0; index < HAS_MOTOR_CNT; index++){ - len += seq_printf(m ,"## motor is %s ##\n", mdev->motors[index].pdata->name); - len += seq_printf(m ,"GPIOs: Min %d, Max %d, Level %d, ST1 %d, ST2 %d, ST3 %d, ST4 %d\n", - mdev->motors[index].pdata->motor_min_gpio, - mdev->motors[index].pdata->motor_max_gpio, - mdev->motors[index].pdata->motor_gpio_level, - mdev->motors[index].pdata->motor_st1_gpio, - mdev->motors[index].pdata->motor_st2_gpio, - mdev->motors[index].pdata->motor_st3_gpio, - mdev->motors[index].pdata->motor_st4_gpio); - len += seq_printf(m ,"max steps %d\n", mdev->motors[index].max_steps); - len += seq_printf(m ,"motor direction %d\n", mdev->motors[index].move_dir); - len += seq_printf(m ,"motor state %d (normal; cruise; reset)\n", mdev->motors[index].state); - len += seq_printf(m ,"the irq's counter of max pos is %d\n", mdev->motors[index].max_pos_irq_cnt); - len += seq_printf(m ,"the irq's counter of min pos is %d\n", mdev->motors[index].min_pos_irq_cnt); - } -#endif - - return len; -} - -static int motor_info_open(struct inode *inode, struct file *file) -{ - return single_open_size(file, motor_info_show, PDE_DATA(inode),1024); -} - -static const struct file_operations motor_info_fops ={ - .read = seq_read, - .open = motor_info_open, - .llseek = seq_lseek, - .release = single_release, -}; - -static int motor_probe(struct platform_device *pdev) -{ - int i, ret = 0; - struct motor_device *mdev; - struct motor_driver *motor = NULL; - struct proc_dir_entry *proc; - mdev = devm_kzalloc(&pdev->dev, sizeof(struct motor_device), GFP_KERNEL); - if (!mdev) { - ret = -ENOENT; - dev_err(&pdev->dev, "kzalloc motor device memery error\n"); - goto error_devm_kzalloc; - } - - mdev->cell = mfd_get_cell(pdev); - if (!mdev->cell) { - ret = -ENOENT; - dev_err(&pdev->dev, "Failed to get mfd cell for motor_probe!\n"); - goto error_devm_kzalloc; - } - - mdev->dev = &pdev->dev; - -#ifdef CONFIG_SOC_T40 - mdev->tcu = (struct ingenic_tcu_chn *)mdev->cell->platform_data; -#else - mdev->tcu = (struct jz_tcu_chn *)mdev->cell->platform_data; -#endif - mdev->tcu->irq_type = FULL_IRQ_MODE; - mdev->tcu->clk_src = TCU_CLKSRC_EXT; - mdev->tcu_speed = MOTOR_MAX_SPEED; -#ifdef CONFIG_SOC_T40 - mdev->tcu->is_pwm = 0; - mdev->tcu->cib.func = TRACKBALL_FUNC; - mdev->tcu->clk_div = TCU_PRESCALE_64; - ingenic_tcu_config(mdev->tcu); - ingenic_tcu_set_period(mdev->tcu->cib.id,(24000000 / 64 / mdev->tcu_speed)); -// ingenic_tcu_counter_begin(mdev->tcu); -#else - mdev->tcu->prescale = TCU_PRESCALE_64; - jz_tcu_config_chn(mdev->tcu); - jz_tcu_set_period(mdev->tcu, (24000000 / 64 / mdev->tcu_speed)); - jz_tcu_start_counter(mdev->tcu); -#endif - mutex_init(&mdev->dev_mutex); - spin_lock_init(&mdev->slock); - - platform_set_drvdata(pdev, mdev); - - /* copy module parameters to the motors struct */ - motors_pdata[0].motor_min_gpio = hmin; - motors_pdata[0].motor_max_gpio = hmax; - motors_pdata[0].motor_gpio_level = hlevel; - motors_pdata[0].motor_st1_gpio = hst1; - motors_pdata[0].motor_st2_gpio = hst2; - motors_pdata[0].motor_st3_gpio = hst3; - motors_pdata[0].motor_st4_gpio = hst4; - - motors_pdata[1].motor_min_gpio = vmin; - motors_pdata[1].motor_max_gpio = vmax; - motors_pdata[1].motor_gpio_level = vlevel; - motors_pdata[1].motor_st1_gpio = vst1; - motors_pdata[1].motor_st2_gpio = vst2; - motors_pdata[1].motor_st3_gpio = vst3; - motors_pdata[1].motor_st4_gpio = vst4; - - for(i = 0; i < HAS_MOTOR_CNT; i++) { - motor = &(mdev->motors[i]); - motor->pdata = &motors_pdata[i]; - motor->move_dir = MOTOR_MOVE_STOP; - dev_info(&pdev->dev, "'%s' GPIOs: Min %d, Max %d, Level %d, ST1 %d, ST2 %d, ST3 %d, ST4 %d\n", - motor->pdata->name, - motor->pdata->motor_min_gpio, - motor->pdata->motor_max_gpio, - motor->pdata->motor_gpio_level, - motor->pdata->motor_st1_gpio, - motor->pdata->motor_st2_gpio, - motor->pdata->motor_st3_gpio, - motor->pdata->motor_st4_gpio - ); - - init_completion(&motor->reset_completion); - - if (motor->pdata->motor_st1_gpio != -1) { - gpio_request(motor->pdata->motor_st1_gpio, "motor_st1_gpio"); - } - if (motor->pdata->motor_st2_gpio != -1) { - gpio_request(motor->pdata->motor_st2_gpio, "motor_st2_gpio"); - } - if (motor->pdata->motor_st3_gpio != -1) { - gpio_request(motor->pdata->motor_st3_gpio, "motor_st3_gpio"); - } - if (motor->pdata->motor_st4_gpio != -1) { - gpio_request(motor->pdata->motor_st4_gpio, "motor_st4_gpio"); - } - } - - mdev->motors[HORIZONTAL_MOTOR].max_steps = hmaxstep+100; - mdev->motors[VERTICAL_MOTOR].max_steps = vmaxstep+30; - -#ifdef CONFIG_SOC_T40 - ingenic_tcu_channel_to_virq(mdev->tcu); - mdev->run_step_irq = mdev->tcu->virq[0]; -#else - mdev->run_step_irq = platform_get_irq(pdev,0); -#endif - if (mdev->run_step_irq < 0) { - ret = mdev->run_step_irq; - dev_err(&pdev->dev, "Failed to get platform irq: %d\n", ret); - goto error_get_irq; - } - - ret = request_irq(mdev->run_step_irq, jz_timer_interrupt, 0, - "jz_timer_interrupt", mdev); - if (ret) { - dev_err(&pdev->dev, "Failed to run request_irq() !\n"); - goto error_request_irq; - } - - init_completion(&mdev->stop_completion); - mdev->wait_stop = 0; - mdev->misc_dev.minor = MISC_DYNAMIC_MINOR; - mdev->misc_dev.name = "motor"; - mdev->misc_dev.fops = &motor_fops; - ret = misc_register(&mdev->misc_dev); - if (ret < 0) { - ret = -ENOENT; - dev_err(&pdev->dev, "misc_register failed\n"); - goto error_misc_register; - } - - /* debug info */ - proc = jz_proc_mkdir("motor"); - if (!proc) { - mdev->proc = NULL; - printk("create motor_info failed!\n"); - } else { - mdev->proc = proc; - } - proc_create_data("motor_info", S_IRUGO, proc, &motor_info_fops, (void *)mdev); - - motor_set_default(mdev); - mdev->flag = 0; - //printk("%s%d\n",__func__,__LINE__); -#ifdef CONFIG_SOC_T40 - ingenic_tcu_counter_begin(mdev->tcu); -#endif - return 0; - -error_misc_register: - free_irq(mdev->run_step_irq, mdev); -error_request_irq: -error_get_irq: - for(i = 0; i < HAS_MOTOR_CNT; i++) { - motor = &(mdev->motors[i]); - if(motor->pdata == NULL) - continue; - - if (motor->pdata->motor_st1_gpio != -1) - gpio_free(motor->pdata->motor_st1_gpio); - - if (motor->pdata->motor_st2_gpio != -1) - gpio_free(motor->pdata->motor_st2_gpio); - - if (motor->pdata->motor_st3_gpio != -1) - gpio_free(motor->pdata->motor_st3_gpio); - - if (motor->pdata->motor_st4_gpio != -1) - gpio_free(motor->pdata->motor_st4_gpio); - motor->pdata = 0; - motor->min_pos_irq = 0; - motor->max_pos_irq = 0; - } - kfree(mdev); -error_devm_kzalloc: - return ret; -} - -static int motor_remove(struct platform_device *pdev) -{ - int i; - struct motor_device *mdev = platform_get_drvdata(pdev); - struct motor_driver *motor = NULL; - -#ifdef CONFIG_SOC_T40 - ingenic_tcu_counter_stop(mdev->tcu); -#else - jz_tcu_disable_counter(mdev->tcu); - jz_tcu_stop_counter(mdev->tcu); -#endif - mutex_destroy(&mdev->dev_mutex); - - free_irq(mdev->run_step_irq, mdev); - for(i = 0; i < HAS_MOTOR_CNT; i++) { - motor = &(mdev->motors[i]); - if(motor->pdata == NULL) - continue; - - if (motor->pdata->motor_st1_gpio != -1) - gpio_free(motor->pdata->motor_st1_gpio); - - if (motor->pdata->motor_st2_gpio != -1) - gpio_free(motor->pdata->motor_st2_gpio); - - if (motor->pdata->motor_st3_gpio != -1) - gpio_free(motor->pdata->motor_st3_gpio); - - if (motor->pdata->motor_st4_gpio != -1) - gpio_free(motor->pdata->motor_st4_gpio); - motor->pdata = 0; - motor->min_pos_irq = 0; - motor->max_pos_irq = 0; - motor->min_pos_irq_cnt = 0; - motor->max_pos_irq_cnt = 0; - } - - if (mdev->proc) - proc_remove(mdev->proc); - misc_deregister(&mdev->misc_dev); - - kfree(mdev); - return 0; -} - -#ifdef CONFIG_SOC_T40 -static struct of_device_id motor_match[]={ - {.compatible = "ingenic,tcu_chn2",}, - {} -}; -#endif - -static struct platform_driver motor_driver = { - .probe = motor_probe, - .remove = motor_remove, - .driver = { - .name = "tcu_chn2", -#ifdef CONFIG_SOC_T40 - .of_match_table = motor_match, -#endif - .owner = THIS_MODULE, - } -}; - -static int __init motor_init(void) -{ - return platform_driver_register(&motor_driver); -} - -static void __exit motor_exit(void) -{ - platform_driver_unregister(&motor_driver); -} - -module_init(motor_init); -module_exit(motor_exit); - -MODULE_LICENSE("GPL"); diff --git a/general/package/ingenic-motors-t31/src/motor.h b/general/package/ingenic-motors-t31/src/motor.h deleted file mode 100644 index 0d10af71..00000000 --- a/general/package/ingenic-motors-t31/src/motor.h +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (C) 2015 Ingenic Semiconductor Co.,Ltd - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __MOTOR_H__ -#define __MOTOR_H__ - -#include -#include -#include -#include -#include -/* - * HORIZONTAL is X axis and VERTICAL is Y axis; - * while the Zero point is left-bottom, Origin point - * is cross point of horizontal midpoint and vertical midpoint. - * -*/ - - -/*#define PLATFORM_HAS_HORIZONTAL_MOTOR 1*/ -/*#define PLATFORM_HAS_VERTICAL_MOTOR 1*/ - -enum jz_motor_cnt { - HORIZONTAL_MOTOR, - VERTICAL_MOTOR, - HAS_MOTOR_CNT, -}; - -/* ioctl cmd */ -#define MOTOR_STOP 0x1 -#define MOTOR_RESET 0x2 -#define MOTOR_MOVE 0x3 -#define MOTOR_GET_STATUS 0x4 -#define MOTOR_SPEED 0x5 -#define MOTOR_GOBACK 0x6 -#define MOTOR_CRUISE 0x7 -#define MOTOR_GET_MAXSTEPS 0x8 - -/* motor speed */ -#define MOTOR_MAX_SPEED 900 /**< unit: beats per second */ -#define MOTOR_MIN_SPEED 100 - -enum motor_status { - MOTOR_IS_STOP, - MOTOR_IS_RUNNING, -}; - -struct motor_message { - int x; - int y; - enum motor_status status; - int speed; - unsigned int x_max_steps; - unsigned int y_max_steps; -}; - -struct motors_steps{ - int x; - int y; -}; - -struct motor_reset_data { - unsigned int x_max_steps; - unsigned int y_max_steps; - unsigned int x_cur_step; - unsigned int y_cur_step; -}; - -enum motor_direction { - MOTOR_MOVE_LEFT_DOWN = -1, - MOTOR_MOVE_STOP, - MOTOR_MOVE_RIGHT_UP, -}; - -struct motor_platform_data { - const char name[32]; - int motor_min_gpio; - int motor_max_gpio; - int motor_gpio_level; - - int motor_st1_gpio; - int motor_st2_gpio; - int motor_st3_gpio; - int motor_st4_gpio; -}; - -enum motor_ops_state { - MOTOR_OPS_NORMAL, - MOTOR_OPS_CRUISE, - MOTOR_OPS_RESET, - MOTOR_OPS_STOP, -}; - -struct motor_driver { - struct motor_platform_data *pdata; - int max_pos_irq; - int min_pos_irq; - int max_steps; /* It is right-top point when x is max and y is max.*/ - int cur_steps; /* It is left-bottom point when x is 0 and y is 0.*/ - int total_steps; - char reset_min_pos; - char reset_max_pos; - enum motor_direction move_dir; - enum motor_ops_state state; - struct completion reset_completion; - - struct timer_list min_timer; - struct timer_list max_timer; - /* debug parameters */ - unsigned int max_pos_irq_cnt; - unsigned int min_pos_irq_cnt; -}; - -struct motor_move { - struct motors_steps one; - short times; -}; - -struct motor_device { - struct platform_device *pdev; - const struct mfd_cell *cell; - struct device *dev; - struct miscdevice misc_dev; - struct motor_driver motors[HAS_MOTOR_CNT]; - char *skip_mode; - unsigned int counter; - struct completion stop_completion; - unsigned int wait_stop; -#ifdef CONFIG_SOC_T40 - struct ingenic_tcu_chn *tcu; -#else - struct jz_tcu_chn *tcu; -#endif - int tcu_speed; - - struct mutex dev_mutex; - spinlock_t slock; - - enum motor_ops_state dev_state; - struct motor_message msg; - struct motor_move dst_move; - struct motor_move cur_move; - - int run_step_irq; - int flag; - - /* debug parameters */ - struct proc_dir_entry *proc; -}; - -#endif // __MOTOR_H__ diff --git a/general/package/ingenic-osdrv-t20/files/script/load_ingenic b/general/package/ingenic-osdrv-t20/files/script/load_ingenic index af0aad67..5943cc2d 100755 --- a/general/package/ingenic-osdrv-t20/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t20/files/script/load_ingenic @@ -98,7 +98,7 @@ fi lsmod | grep "audio" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/audio2.ko + insmod ${KMOD_PATH/%\//}/audio2.ko spk_gpio=-1 check_return "insmod audio" fi diff --git a/general/package/ingenic-osdrv-t21/files/script/load_ingenic b/general/package/ingenic-osdrv-t21/files/script/load_ingenic index 3504226d..2ac66031 100755 --- a/general/package/ingenic-osdrv-t21/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t21/files/script/load_ingenic @@ -51,7 +51,7 @@ case ${SENSOR} in ISP_PARAM="isp_clk=125000000" SENSOR_PARAM="sensor_max_fps=25 data_interface=1" ;; -"jxf23") +"jxf23"|"ov2735b"|"sc2232h"|"sc2335") ISP_PARAM="isp_clk=125000000" SENSOR_PARAM="sensor_gpio_func=0" ;; @@ -59,19 +59,7 @@ case ${SENSOR} in ISP_PARAM="isp_clk=90000000" SENSOR_PARAM="sensor_gpio_func=0" ;; -"ov2735b") - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="sensor_gpio_func=0" - ;; -"sc2232") - ISP_PARAM="isp_clk=90000000" - SENSOR_PARAM="" - ;; -"sc2232h") - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="sensor_gpio_func=0" - ;; -"sc2300") +"sc2232"|"sc2300") ISP_PARAM="isp_clk=90000000" SENSOR_PARAM="" ;; @@ -79,10 +67,6 @@ case ${SENSOR} in ISP_PARAM="" SENSOR_PARAM="sensor_gpio_func=0" ;; -"sc2335") - ISP_PARAM="isp_clk=125000000" - SENSOR_PARAM="sensor_gpio_func=0" - ;; *) ISP_PARAM="isp_clk=90000000" SENSOR_PARAM="sensor_gpio_func=0" @@ -110,6 +94,6 @@ fi lsmod | grep "audio" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/audio.ko + insmod ${KMOD_PATH/%\//}/audio.ko spk_gpio=-1 check_return "insmod audio" fi diff --git a/general/package/ingenic-osdrv-t30/files/script/load_ingenic b/general/package/ingenic-osdrv-t30/files/script/load_ingenic index e4907cd4..a637c9cc 100755 --- a/general/package/ingenic-osdrv-t30/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t30/files/script/load_ingenic @@ -75,7 +75,7 @@ fi lsmod | grep "audio" >/dev/null if [ $? -ne 0 ]; then - insmod ${KMOD_PATH/%\//}/audio.ko + insmod ${KMOD_PATH/%\//}/audio.ko spk_gpio=-1 check_return "insmod audio" fi diff --git a/general/package/ingenic-osdrv-t31/files/kmod/audio.ko b/general/package/ingenic-osdrv-t31/files/kmod/audio.ko deleted file mode 100644 index 71c10987..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/audio.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/avpu.ko b/general/package/ingenic-osdrv-t31/files/kmod/avpu.ko deleted file mode 100644 index a5d9d790..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/avpu.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/gpio.ko b/general/package/ingenic-osdrv-t31/files/kmod/gpio.ko deleted file mode 100644 index 9327f38c..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/gpio.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ar1337_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ar1337_t31.ko deleted file mode 100644 index 6a851cd7..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ar1337_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_bf3a03_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_bf3a03_t31.ko deleted file mode 100644 index fe622013..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_bf3a03_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_c2399_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_c2399_t31.ko deleted file mode 100644 index 9eb02b3e..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_c2399_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_c23a98_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_c23a98_t31.ko deleted file mode 100644 index a04b7b11..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_c23a98_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_c3390_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_c3390_t31.ko deleted file mode 100644 index 070f9726..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_c3390_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_c4390_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_c4390_t31.ko deleted file mode 100644 index 0a32f519..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_c4390_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc0328_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc0328_t31.ko deleted file mode 100644 index 63cfd525..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc0328_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc032a_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc032a_t31.ko deleted file mode 100644 index 14a5ee7a..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc032a_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc1034_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc1034_t31.ko deleted file mode 100644 index 5e8f8d0a..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc1034_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc1054_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc1054_t31.ko deleted file mode 100644 index af3e38ec..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc1054_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2023_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2023_t31.ko deleted file mode 100644 index ed31213c..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2023_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2033_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2033_t31.ko deleted file mode 100644 index 1cc2c3f6..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2033_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2053_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2053_t31.ko deleted file mode 100644 index 2a510c48..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2053_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2083_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2083_t31.ko deleted file mode 100644 index 6e4c85c2..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2083_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2093_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2093_t31.ko deleted file mode 100644 index eef6ab31..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc2093_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc3003_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc3003_t31.ko deleted file mode 100644 index 1d0b4d47..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc3003_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc3003a_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc3003a_t31.ko deleted file mode 100644 index 7a9fc262..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc3003a_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc4023_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc4023_t31.ko deleted file mode 100644 index 9925e1b5..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc4023_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc4653_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc4653_t31.ko deleted file mode 100644 index f20badd5..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc4653_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc4c33_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc4c33_t31.ko deleted file mode 100644 index c4183df8..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc4c33_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc5035_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc5035_t31.ko deleted file mode 100644 index 46dd2293..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_gc5035_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_imx307_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_imx307_t31.ko deleted file mode 100644 index 7df2576d..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_imx307_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_imx327_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_imx327_t31.ko deleted file mode 100644 index c36a72b0..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_imx327_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_imx335_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_imx335_t31.ko deleted file mode 100644 index 9a305be0..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_imx335_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf23_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf23_t31.ko deleted file mode 100644 index 52cb5d8a..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf23_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf28p_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf28p_t31.ko deleted file mode 100644 index 33ddd988..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf28p_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf352_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf352_t31.ko deleted file mode 100644 index 941994b8..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf352_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf35_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf35_t31.ko deleted file mode 100644 index 956981b9..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf35_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf37_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf37_t31.ko deleted file mode 100644 index 63ae6caf..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf37_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf37p_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf37p_t31.ko deleted file mode 100644 index 7498cf43..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf37p_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf38p_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf38p_t31.ko deleted file mode 100644 index f2b2bebb..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf38p_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf51_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf51_t31.ko deleted file mode 100644 index a69ee92a..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf51_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf53_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf53_t31.ko deleted file mode 100644 index 3a823f17..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxf53_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh61p_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh61p_t31.ko deleted file mode 100644 index c43ff069..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh61p_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh62_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh62_t31.ko deleted file mode 100644 index e1a0a28b..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh62_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh63_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh63_t31.ko deleted file mode 100644 index ab28b162..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh63_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh66_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh66_t31.ko deleted file mode 100644 index 737307ba..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxh66_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk03_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk03_t31.ko deleted file mode 100644 index 0959ad64..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk03_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk04_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk04_t31.ko deleted file mode 100644 index 3dc58588..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk04_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk05_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk05_t31.ko deleted file mode 100644 index cc959938..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk05_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk06_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk06_t31.ko deleted file mode 100644 index 22361a3c..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxk06_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxq03_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxq03_t31.ko deleted file mode 100644 index 2953753c..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxq03_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxq03p_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxq03p_t31.ko deleted file mode 100644 index ed4769cc..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_jxq03p_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis2006_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis2006_t31.ko deleted file mode 100644 index 0372e948..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis2006_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis2008_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis2008_t31.ko deleted file mode 100644 index b079d3c0..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis2008_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis4001_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis4001_t31.ko deleted file mode 100644 index 08bba30e..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis4001_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis5001_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis5001_t31.ko deleted file mode 100644 index ae6fc0cb..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_mis5001_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os02d20_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_os02d20_t31.ko deleted file mode 100644 index ac114d51..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os02d20_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os02g10_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_os02g10_t31.ko deleted file mode 100644 index d6a0777b..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os02g10_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os02k10_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_os02k10_t31.ko deleted file mode 100644 index ed594d3a..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os02k10_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os03b10_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_os03b10_t31.ko deleted file mode 100644 index ddc71e07..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os03b10_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os04b10_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_os04b10_t31.ko deleted file mode 100644 index f046a05d..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os04b10_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os04c10_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_os04c10_t31.ko deleted file mode 100644 index e1f149ca..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os04c10_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os05a10_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_os05a10_t31.ko deleted file mode 100644 index b9cfdefc..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_os05a10_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov2740_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov2740_t31.ko deleted file mode 100644 index 6f39ca06..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov2740_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov2745_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov2745_t31.ko deleted file mode 100644 index 0d90aa31..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov2745_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov5648_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov5648_t31.ko deleted file mode 100644 index 4003f163..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov5648_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov5695_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov5695_t31.ko deleted file mode 100644 index d8379362..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov5695_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov9732_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov9732_t31.ko deleted file mode 100644 index d64901c1..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ov9732_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5258_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5258_t31.ko deleted file mode 100644 index f3e910a6..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5258_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5260_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5260_t31.ko deleted file mode 100644 index db0f5dbb..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5260_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5268_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5268_t31.ko deleted file mode 100644 index 12f4d9a2..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5268_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5270_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5270_t31.ko deleted file mode 100644 index 5b457660..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5270_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5520_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5520_t31.ko deleted file mode 100644 index 816c4bb7..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_ps5520_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc1346_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc1346_t31.ko deleted file mode 100644 index 98e55207..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc1346_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc200ai_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc200ai_t31.ko deleted file mode 100644 index 1bfc3d9e..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc200ai_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc201cs_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc201cs_t31.ko deleted file mode 100644 index 424d6da5..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc201cs_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2210_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2210_t31.ko deleted file mode 100644 index 3bfa87cd..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2210_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2232h_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2232h_t31.ko deleted file mode 100644 index 4072a355..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2232h_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2235_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2235_t31.ko deleted file mode 100644 index 5a2791e5..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2235_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2239_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2239_t31.ko deleted file mode 100644 index f941b536..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2239_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2239p_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2239p_t31.ko deleted file mode 100644 index e3e4ae71..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2239p_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc223a_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc223a_t31.ko deleted file mode 100644 index 23f99558..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc223a_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc230ai_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc230ai_t31.ko deleted file mode 100644 index 22b2100b..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc230ai_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2310_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2310_t31.ko deleted file mode 100644 index 99b0941f..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2310_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2315e_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2315e_t31.ko deleted file mode 100644 index 8a44f45a..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2315e_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2332_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2332_t31.ko deleted file mode 100644 index 92e44fb5..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2332_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2335_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2335_t31.ko deleted file mode 100644 index 8384ac02..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2335_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2336_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2336_t31.ko deleted file mode 100644 index 5152cf2d..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc2336_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc301IoT_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc301IoT_t31.ko deleted file mode 100644 index 9bf58b14..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc301IoT_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3235_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3235_t31.ko deleted file mode 100644 index a8018d05..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3235_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3335_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3335_t31.ko deleted file mode 100644 index 3f1e6f7a..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3335_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3336_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3336_t31.ko deleted file mode 100644 index f7d67437..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3336_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3338_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3338_t31.ko deleted file mode 100644 index 01c989d4..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc3338_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc401ai_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc401ai_t31.ko deleted file mode 100644 index fcc25ecd..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc401ai_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4236_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4236_t31.ko deleted file mode 100644 index 12712ec4..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4236_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4236h_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4236h_t31.ko deleted file mode 100644 index e7eff452..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4236h_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4238_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4238_t31.ko deleted file mode 100644 index 05e10a2e..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4238_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4335_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4335_t31.ko deleted file mode 100644 index ce0a1bd8..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4335_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4336_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4336_t31.ko deleted file mode 100644 index 1a5884c8..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc4336_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc450ai_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc450ai_t31.ko deleted file mode 100644 index 59c188be..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc450ai_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc500ai_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc500ai_t31.ko deleted file mode 100644 index a7b15cf0..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc500ai_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc5235_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc5235_t31.ko deleted file mode 100644 index f2be4710..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sc5235_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sp1405_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_sp1405_t31.ko deleted file mode 100644 index f51f510e..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_sp1405_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sensor_tp2850_t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/sensor_tp2850_t31.ko deleted file mode 100644 index cba748a1..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sensor_tp2850_t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/sinfo.ko b/general/package/ingenic-osdrv-t31/files/kmod/sinfo.ko deleted file mode 100644 index 70255dbc..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/sinfo.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/kmod/tx-isp-t31.ko b/general/package/ingenic-osdrv-t31/files/kmod/tx-isp-t31.ko deleted file mode 100644 index a8fab197..00000000 Binary files a/general/package/ingenic-osdrv-t31/files/kmod/tx-isp-t31.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t31/files/script/load_ingenic b/general/package/ingenic-osdrv-t31/files/script/load_ingenic index 9b66a64c..672220b4 100755 --- a/general/package/ingenic-osdrv-t31/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t31/files/script/load_ingenic @@ -205,7 +205,7 @@ fi lsmod | grep "audio" >/dev/null if [ $? -ne 0 ]; then - modprobe audio + modprobe audio spk_gpio=-1 check_return "insmod audio" fi diff --git a/general/package/ingenic-osdrv-t40/files/kmod/audio.ko b/general/package/ingenic-osdrv-t40/files/kmod/audio.ko deleted file mode 100644 index 5a8a6973..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/audio.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/avpu.ko b/general/package/ingenic-osdrv-t40/files/kmod/avpu.ko deleted file mode 100644 index 8a005457..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/avpu.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/dtrng_dev.ko b/general/package/ingenic-osdrv-t40/files/kmod/dtrng_dev.ko deleted file mode 100644 index 8d50baa8..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/dtrng_dev.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/gpio.ko b/general/package/ingenic-osdrv-t40/files/kmod/gpio.ko deleted file mode 100644 index 51a220bf..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/gpio.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/mpsys.ko b/general/package/ingenic-osdrv-t40/files/kmod/mpsys.ko deleted file mode 100644 index 535a783e..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/mpsys.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_bf20a1_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_bf20a1_t40.ko deleted file mode 100644 index 1ba7cee1..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_bf20a1_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_bf2253_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_bf2253_t40.ko deleted file mode 100644 index 608d901e..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_bf2253_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_c2399_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_c2399_t40.ko deleted file mode 100644 index 778b5bde..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_c2399_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_c4390_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_c4390_t40.ko deleted file mode 100644 index 2f51670a..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_c4390_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc2053_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc2053_t40.ko deleted file mode 100644 index 0c1f3a82..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc2053_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc2093_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc2093_t40.ko deleted file mode 100644 index 0707fb60..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc2093_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc4023_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc4023_t40.ko deleted file mode 100644 index 3bd3f60b..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc4023_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc4653_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc4653_t40.ko deleted file mode 100644 index 070ae3c6..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_gc4653_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_hi556_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_hi556_t40.ko deleted file mode 100644 index a03843d5..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_hi556_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx307_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx307_t40.ko deleted file mode 100644 index 2c2020a7..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx307_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx327_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx327_t40.ko deleted file mode 100644 index 43f12fb8..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx327_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx334_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx334_t40.ko deleted file mode 100644 index 1096c037..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx334_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx335_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx335_t40.ko deleted file mode 100644 index f5f55685..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx335_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx415_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx415_t40.ko deleted file mode 100644 index 41f85733..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_imx415_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23_s0_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23_s0_t40.ko deleted file mode 100644 index 86498e6a..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23_s0_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23_s1_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23_s1_t40.ko deleted file mode 100644 index d39bef64..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23_s1_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23_t40.ko deleted file mode 100644 index 769afcf2..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23s_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23s_t40.ko deleted file mode 100644 index 3b7d5bbf..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf23s_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf32_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf32_t40.ko deleted file mode 100644 index 91e47989..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf32_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf35_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf35_t40.ko deleted file mode 100644 index 0a4f92b9..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf35_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf37_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf37_t40.ko deleted file mode 100644 index 73567ef8..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxf37_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxh63_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxh63_t40.ko deleted file mode 100644 index 987d6780..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxh63_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxk04_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxk04_t40.ko deleted file mode 100644 index a02d4734..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxk04_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxk08_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxk08_t40.ko deleted file mode 100644 index c255a517..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxk08_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxq03_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxq03_t40.ko deleted file mode 100644 index 87fcc57c..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_jxq03_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_mis2006_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_mis2006_t40.ko deleted file mode 100644 index 7974f018..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_mis2006_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_mis2008_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_mis2008_t40.ko deleted file mode 100644 index 894d44fb..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_mis2008_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_mis8001_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_mis8001_t40.ko deleted file mode 100644 index 1f5508b7..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_mis8001_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_os04b10_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_os04b10_t40.ko deleted file mode 100644 index 5dc966cf..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_os04b10_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_os05a10_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_os05a10_t40.ko deleted file mode 100644 index 976e081b..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_os05a10_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_os08a10_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_os08a10_t40.ko deleted file mode 100644 index 4cd51ca4..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_os08a10_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ov01a1s_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_ov01a1s_t40.ko deleted file mode 100644 index cc9062bf..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ov01a1s_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ov2740_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_ov2740_t40.ko deleted file mode 100644 index f0b83eec..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ov2740_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ov9732_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_ov9732_t40.ko deleted file mode 100644 index f9a6e60b..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ov9732_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ps5258_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_ps5258_t40.ko deleted file mode 100644 index 8a917299..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ps5258_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ps5260_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_ps5260_t40.ko deleted file mode 100644 index 49bbdccd..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_ps5260_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc200ai_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc200ai_t40.ko deleted file mode 100644 index bbd45708..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc200ai_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc201cs_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc201cs_t40.ko deleted file mode 100644 index 1ec6a030..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc201cs_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2232h_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2232h_t40.ko deleted file mode 100644 index 3355be21..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2232h_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2239_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2239_t40.ko deleted file mode 100644 index 117c7b19..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2239_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc223a_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc223a_t40.ko deleted file mode 100644 index e254ddb1..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc223a_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2310_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2310_t40.ko deleted file mode 100644 index 843a213a..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2310_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2335_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2335_t40.ko deleted file mode 100644 index bf539050..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc2335_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc301IoT_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc301IoT_t40.ko deleted file mode 100644 index 5a3ae5d9..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc301IoT_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc3235_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc3235_t40.ko deleted file mode 100644 index 6a3a95f0..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc3235_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc3335_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc3335_t40.ko deleted file mode 100644 index d331655e..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc3335_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc3336_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc3336_t40.ko deleted file mode 100644 index 9d088d60..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc3336_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc401ai_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc401ai_t40.ko deleted file mode 100644 index 3258cad4..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc401ai_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc4236_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc4236_t40.ko deleted file mode 100644 index d8abb82b..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc4236_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc4335_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc4335_t40.ko deleted file mode 100644 index 8ad1d2bc..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc4335_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc500ai_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc500ai_t40.ko deleted file mode 100644 index 47889722..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc500ai_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc5235_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc5235_t40.ko deleted file mode 100644 index 52dea69c..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc5235_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc5239_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc5239_t40.ko deleted file mode 100644 index 1b1347f5..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc5239_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc8235_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc8235_t40.ko deleted file mode 100644 index 302477ae..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc8235_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc8238_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc8238_t40.ko deleted file mode 100644 index 71a11460..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc8238_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc830ai_t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc830ai_t40.ko deleted file mode 100644 index e387df15..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sensor_sc830ai_t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/sinfo.ko b/general/package/ingenic-osdrv-t40/files/kmod/sinfo.ko deleted file mode 100644 index fac15208..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/sinfo.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/soc-nna.ko b/general/package/ingenic-osdrv-t40/files/kmod/soc-nna.ko deleted file mode 100644 index ee12c285..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/soc-nna.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/kmod/tx-isp-t40.ko b/general/package/ingenic-osdrv-t40/files/kmod/tx-isp-t40.ko deleted file mode 100644 index 46e2461d..00000000 Binary files a/general/package/ingenic-osdrv-t40/files/kmod/tx-isp-t40.ko and /dev/null differ diff --git a/general/package/ingenic-osdrv-t40/files/script/load_ingenic b/general/package/ingenic-osdrv-t40/files/script/load_ingenic index d22ef787..cb076a0b 100755 --- a/general/package/ingenic-osdrv-t40/files/script/load_ingenic +++ b/general/package/ingenic-osdrv-t40/files/script/load_ingenic @@ -97,7 +97,7 @@ fi lsmod | grep "audio" >/dev/null if [ $? -ne 0 ]; then - modprobe audio + modprobe audio spk_gpio=-1 check_return "insmod audio" fi diff --git a/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk b/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk index 5fd7b523..56c1e482 100644 --- a/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk +++ b/general/package/ingenic-osdrv-t40/ingenic-osdrv-t40.mk @@ -23,10 +23,8 @@ define INGENIC_OSDRV_T40_INSTALL_TARGET_CMDS $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T40_PKGDIR)/files/sensor/params/sc8238-t40.bin $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensor $(INGENIC_OSDRV_T40_PKGDIR)/files/sensor/params/sc830ai-t40.bin - $(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.4.94/ingenic - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.4.94/ingenic $(INGENIC_OSDRV_T40_PKGDIR)/files/kmod/dtrng_dev.ko - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.4.94/ingenic $(INGENIC_OSDRV_T40_PKGDIR)/files/kmod/mpsys.ko - $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.4.94/ingenic $(INGENIC_OSDRV_T40_PKGDIR)/files/kmod/soc-nna.ko + # Modules for T40 are built from the openingenic repository sources, so we don't need to copy them. + #$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.4.94/ingenic $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(INGENIC_OSDRV_T40_PKGDIR)/files/script/load* diff --git a/general/package/ingenic-pwm/ingenic-pwm.mk b/general/package/ingenic-pwm/ingenic-pwm.mk index 90df91d6..1a6d1548 100644 --- a/general/package/ingenic-pwm/ingenic-pwm.mk +++ b/general/package/ingenic-pwm/ingenic-pwm.mk @@ -4,10 +4,14 @@ # ################################################################################ -INGENIC_PWM_VERSION = master -INGENIC_PWM_SITE = $(call github,gtxaspec,ingenic-pwm,$(INGENIC_PWM_VERSION)) -INGENIC_PWM_LICENSE = GPL-2.0 -INGENIC_PWM_LICENSE_FILES = COPYING +ifeq ($(LOCAL_DOWNLOAD),y) +INGENIC_PWM_SITE_METHOD = git +INGENIC_PWM_SITE = https://github.com/gtxaspec/ingenic-pwm +INGENIC_PWM_VERSION = $(shell git ls-remote $(INGENIC_PWM_SITE) HEAD | head -1 | cut -f1) +else +INGENIC_PWM_SITE = https://github.com/gtxaspec/ingenic-pwm/archive +INGENIC_PWM_SOURCE = master.tar.gz +endif define INGENIC_PWM_BUILD_CMDS $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) -C $(@D) diff --git a/general/package/libsrtp-openipc/libsrtp-openipc.mk b/general/package/libsrtp-openipc/libsrtp-openipc.mk index 81e561af..fc7a15bb 100644 --- a/general/package/libsrtp-openipc/libsrtp-openipc.mk +++ b/general/package/libsrtp-openipc/libsrtp-openipc.mk @@ -4,16 +4,13 @@ # ################################################################################ -ifeq ($(LOCAL_DOWNLOAD),y) LIBSRTP_OPENIPC_SITE_METHOD = git LIBSRTP_OPENIPC_SITE = https://github.com/cisco/libsrtp LIBSRTP_OPENIPC_VERSION = $(shell git ls-remote $(LIBSRTP_OPENIPC_SITE) HEAD | head -1 | cut -f1) -else -LIBSRTP_OPENIPC_SITE = https://github.com/cisco/libsrtp/archive -LIBSRTP_OPENIPC_SOURCE = master.tar.gz -endif LIBSRTP_OPENIPC_INSTALL_STAGING = YES +LIBSRTP_OPENIPC_SUPPORTS_IN_SOURCE_BUILD = NO + LIBSRTP_OPENIPC_LICENSE = BSD-3-Clause LIBSRTP_OPENIPC_LICENSE_FILES = LICENSE LIBSRTP_OPENIPC_CPE_ID_VENDOR = cisco diff --git a/general/package/linux-patcher/linux-patcher.mk b/general/package/linux-patcher/linux-patcher.mk index c80e8fa3..e7bdcd09 100644 --- a/general/package/linux-patcher/linux-patcher.mk +++ b/general/package/linux-patcher/linux-patcher.mk @@ -6,13 +6,18 @@ export UIMAGE_NAME = Linux-$(LINUX_VERSION_PROBED)-$(OPENIPC_SOC_MODEL) +# Exclude buildroot yylloc patches +LINUX_POST_PATCH_HOOKS = LINUX_APPLY_LOCAL_PATCHES + ifneq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) define LINUX_PATCHER_CONFIG_CFG80211 $(call KCONFIG_DISABLE_OPT,CONFIG_CFG80211) endef endif -ifeq ($(BOARD),ssc338q_fpv) +BOARD_LIST = ssc338q_fpv ssc30kq_fpv + +ifneq ($(filter $(BOARD),$(BOARD_LIST)),) define LINUX_PATCHER_CONFIG_ATHEROS $(call KCONFIG_ENABLE_OPT,CONFIG_FW_LOADER) $(call KCONFIG_ENABLE_OPT,CONFIG_WLAN) diff --git a/general/package/motors/motors.mk b/general/package/motors/motors.mk index a5b6218d..d1353035 100644 --- a/general/package/motors/motors.mk +++ b/general/package/motors/motors.mk @@ -21,7 +21,7 @@ define MOTORS_BUILD_CMDS (cd $(@D)/i2c-motor; $(TARGET_CC) -Os -s main.c -o i2c-motor) (cd $(@D)/xm-kmotor; $(TARGET_CC) -Os -s main.c -o xm-kmotor) (cd $(@D)/xm-uart; $(TARGET_CC) -Os -s main.c -o xm-uart) - (cd $(@D)/t31-kmotor; $(TARGET_CC) -Os -s main.c -o t31-kmotor) + (cd $(@D)/ingenic-motor; $(TARGET_CC) -Os -s main.c -o ingenic-motor) endef define MOTORS_INSTALL_TARGET_CMDS @@ -29,7 +29,7 @@ define MOTORS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/i2c-motor/i2c-motor $(TARGET_DIR)/usr/bin/i2c-motor $(INSTALL) -m 0755 -D $(@D)/xm-kmotor/xm-kmotor $(TARGET_DIR)/usr/bin/xm-kmotor $(INSTALL) -m 0755 -D $(@D)/xm-uart/xm-uart $(TARGET_DIR)/usr/bin/xm-uart - $(INSTALL) -m 0755 -D $(@D)/t31-kmotor/t31-kmotor $(TARGET_DIR)/usr/bin/t31-kmotor + $(INSTALL) -m 0755 -D $(@D)/ingenic-motor/ingenic-motor $(TARGET_DIR)/usr/bin/ingenic-motor endef $(eval $(generic-package)) diff --git a/general/package/onvif-simple-server/01-enable-mbedtls-only.patch b/general/package/onvif-simple-server/01-enable-mbedtls-only.patch index 25382154..4f307e08 100644 --- a/general/package/onvif-simple-server/01-enable-mbedtls-only.patch +++ b/general/package/onvif-simple-server/01-enable-mbedtls-only.patch @@ -1,18 +1,21 @@ --- a/Makefile 2023-07-04 13:52:08.000000000 +0300 +++ b/Makefile 2023-07-11 00:10:53.987288000 +0300 -@@ -2,13 +2,8 @@ - - OBJECTS_O = onvif_simple_server.o device_service.o media_service.o ptz_service.o utils.o log.o - OBJECTS_W = wsd_simple_server.o utils.o log.o +@@ -3,15 +3,9 @@ + OBJECTS_O = onvif_simple_server.o device_service.o media_service.o ptz_service.o events_service.o fault.o conf.o utils.o log.o ezxml_wrapper.o ezxml/ezxml.o + OBJECTS_N = onvif_notify_server.o conf.o utils.o log.o ezxml_wrapper.o ezxml/ezxml.o + OBJECTS_W = wsd_simple_server.o utils.o log.o ezxml_wrapper.o ezxml/ezxml.o -ifdef HAVE_MBEDTLS --INCLUDE = -DHAVE_MBEDTLS -I../mbedtls/include -ffunction-sections -fdata-sections --LIBS_O = -Wl,--gc-sections ../mbedtls/library/libmbedcrypto.a -lpthread +-INCLUDE = -DHAVE_MBEDTLS -I../mbedtls/include -ffunction-sections -fdata-sections -lrt +-LIBS_O = -Wl,--gc-sections ../mbedtls/library/libmbedcrypto.a -lpthread -lrt +-LIBS_N = -Wl,--gc-sections ../mbedtls/library/libmbedcrypto.a -lpthread -lrt -else --INCLUDE = -I../libtomcrypt/src/headers -ffunction-sections -fdata-sections --LIBS_O = -Wl,--gc-sections ../libtomcrypt/libtomcrypt.a -lpthread +-INCLUDE = -I../libtomcrypt/src/headers -ffunction-sections -fdata-sections -lrt +-LIBS_O = -Wl,--gc-sections ../libtomcrypt/libtomcrypt.a -lpthread -lrt +-LIBS_N = -Wl,--gc-sections ../libtomcrypt/libtomcrypt.a -lpthread -lrt -endif -+INCLUDE = -DHAVE_MBEDTLS -ffunction-sections -fdata-sections -+LIBS_O = -Wl,--gc-sections -lmbedtls -lmbedcrypto -lpthread ++INCLUDE = -DHAVE_MBEDTLS -ffunction-sections -fdata-sections -lrt ++LIBS_O = -Wl,--gc-sections -lmbedtls -lmbedcrypto -lpthread -lrt ++LIBS_N = -Wl,--gc-sections -lmbedtls -lmbedcrypto -lpthread -lrt LIBS_W = -Wl,--gc-sections - all: onvif_simple_server wsd_simple_server + all: onvif_simple_server onvif_notify_server wsd_simple_server diff --git a/general/package/onvif-simple-server/02-change-config-file-and-dir-names.patch b/general/package/onvif-simple-server/02-change-config-file-and-dir-names.patch index 6c36771f..430b2eb4 100644 --- a/general/package/onvif-simple-server/02-change-config-file-and-dir-names.patch +++ b/general/package/onvif-simple-server/02-change-config-file-and-dir-names.patch @@ -1,19 +1,21 @@ --- a/onvif_simple_server.c 2023-07-16 16:48:12.000000000 +0300 +++ b/onvif_simple_server.c 2023-09-09 22:42:57.126222514 +0300 -@@ -32,8 +32,8 @@ +@@ -36,9 +36,9 @@ #include "utils.h" #include "log.h" - + -#define DEFAULT_CONF_FILE "/etc/onvif_simple_server.conf" -#define DEFAULT_LOG_FILE "/var/log/onvif_simple_server.log" +-#define DEBUG_FILE "/tmp/onvif_simple_server.debug" +#define DEFAULT_CONF_FILE "/etc/onvif.conf" +#define DEFAULT_LOG_FILE "/tmp/onvif.log" - ++#define DEBUG_FILE "/tmp/onvif.debug" + service_context_t service_ctx; --- a/wsd_simple_server.c 2023-07-16 16:48:12.000000000 +0300 +++ b/wsd_simple_server.c 2023-09-09 22:55:59.594700185 +0300 -@@ -36,8 +36,8 @@ +@@ -38,8 +38,8 @@ #define PORT 3702 #define TYPE "NetworkVideoTransmitter" diff --git a/general/package/onvif-simple-server/onvif-simple-server.mk b/general/package/onvif-simple-server/onvif-simple-server.mk index 4aad01b6..1169058f 100644 --- a/general/package/onvif-simple-server/onvif-simple-server.mk +++ b/general/package/onvif-simple-server/onvif-simple-server.mk @@ -6,9 +6,10 @@ ONVIF_SIMPLE_SERVER_SITE_METHOD = git ONVIF_SIMPLE_SERVER_SITE = https://github.com/roleoroleo/onvif_simple_server -ONVIF_SIMPLE_SERVER_VERSION = b875f42b81db13032070c35d934ed3b46f52101e +#ONVIF_SIMPLE_SERVER_VERSION = de6d585a245e4873c49b113360f98907f2b4cf49 +ONVIF_SIMPLE_SERVER_VERSION = $(shell git ls-remote $(ONVIF_SIMPLE_SERVER_SITE) HEAD | head -1 | awk '{ print $$1 }') -ONVIF_SIMPLE_SERVER_DEPENDENCIES = mbedtls-openipc +ONVIF_SIMPLE_SERVER_DEPENDENCIES = mbedtls ONVIF_SIMPLE_SERVER_LICENSE = MIT ONVIF_SIMPLE_SERVER_LICENSE_FILES = LICENSE diff --git a/general/package/quirc-openipc/Config.in b/general/package/quirc-openipc/Config.in index f791ce3c..04308fdc 100644 --- a/general/package/quirc-openipc/Config.in +++ b/general/package/quirc-openipc/Config.in @@ -1,8 +1,5 @@ config BR2_PACKAGE_QUIRC_OPENIPC - bool "quirc" - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBJPEG + bool "quirc-openipc" help QR codes are a type of high-density matrix barcodes, and quirc is a library for extracting and decoding them from images. - https://github.com/dlbeer/quirc diff --git a/general/package/quirc-openipc/files/qrparse b/general/package/quirc-openipc/files/qrparse deleted file mode 100755 index fdbb36a2..00000000 --- a/general/package/quirc-openipc/files/qrparse +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh - -################################################################################ -# -# THIS SCRIPT WILL PARSE AN ZXING FORMAT QR CODE PAYLOAD FOR WIFI CREDENTIALS -# -# INPUT MUST BE PASSED IN SINGLE QUOTES -# -# BARCODE CONTENTS CAN BE FOUND HERE -# https://github.com/zxing/zxing/wiki/Barcode-Contents#wi-fi-network-config-android-ios-11 -# -# THIS SCRIPT USES SIMILAR LOGIC TO: -# https://github.com/zxing/zxing/blob/master/core/src/main/java/com/google/zxing/client/result/WifiResultParser.java -# -# @author jayfan0 -# -# OPENIPC USAGE: qrparse $(qrscan -p /mnt/mmcblk0p1/qrcode2.jpg | head -n 1) -# OPENIPC FULL USAGE: curl -s -o /tmp/img.jpg http://127.0.0.1/image.jpg ; qrparse $(qrscan -p /tmp/img.jpg | head -n 1) -################################################################################ - -if [ "$1" = "help" ]; then - echo -e "\n================= QRPARSER usage =================\n" - echo -e "Parse the QR code scanned by qrscan and extract wifi credentials\n" - echo -e "INPUT MUST BE PASSED IN SINGLE QUOTES\n" - echo -e "USAGE EXAMPLES:\n" - echo -e 'Standalone:\t\t qrparse $(qrscan -p /mnt/mmcblk0p1/qrcode2.jpg | head -n 1)\n' - echo -e 'With camera sensor:\t curl -s -o /tmp/img.jpg http://127.0.0.1/image.jpg ; qrparse $(qrscan -p /tmp/img.jpg | head -n 1)\n' - exit -fi - -# scan='WIFI:S:thi$iSmdsywifi;H:false;T:WPA2;P:$e£cr3tt;PH2:MSCHAPv2;;' -scan=$1 - -if [[ ${scan:0:5} == "WIFI:" ]]; then - - trunc=$(echo $scan | sed 's/WIFI://') - - delims=${trunc//[^;]} - - count=${#delims} - - fields=$(( $count-1 )) - - for i in $(seq 1 $fields); - do - line=$(echo $trunc | cut -d ';' -f $i) - - for j in $(seq 1 2); - do - single=$(echo $line | cut -d ':' -f $j) - - case $single in - S) - SSID=$(echo $line | cut -d ':' -f $(( j + 1 ))) - [ -z $SSID ] && echo "SSID Empty. Aborting" && exit - echo "SSID = $SSID" - ;; - - P) - password=$(echo $line | cut -d ':' -f $(( j + 1 ))) - echo "Password = $password" - ;; - - T) - auth=$(echo $line | cut -d ':' -f $(( j + 1 ))) - [ -z $auth ] && auth = "nopass" - echo "Authentication type = $auth" - ;; - - H) - hidden=$(echo $line | cut -d ':' -f $(( j + 1 ))) -# echo "Hidden SSID = $hidden" - ;; - - E) - eap=$(echo $line | cut -d ':' -f $(( j + 1 ))) - echo "EAP method = $eap" - ;; - - A) - anon=$(echo $line | cut -d ':' -f $(( j + 1 ))) - echo "Anonymous identity = $anon" - ;; - - I) - identity=$(echo $line | cut -d ':' -f $(( j + 1 ))) - echo "Identity = $identity" - ;; - - PH2) - ph2=$(echo $line | cut -d ':' -f $(( j + 1 ))) - echo "PH2 = $ph2" - ;; - esac - done - done - - # Unfortunately, in the past, H: was not just used for boolean 'hidden', but 'phase 2 method'. - # To try to retain backwards compatibility, we set one or the other based on whether the string - #is 'true' or 'false': - if [ ! -z $hidden ]; then - # If PH2 was specified separately, or if the value is clearly boolean, interpret it as 'hidden' - if [ ! -z "$ph2" ] || [[ $(echo "$hidden" | tr '[:upper:]' '[:lower:]') = $(echo "true") ]] || [[ $(echo "$hidden" | tr '[:upper:]' '[:lower:]') = $(echo "false") ]]; then - hidden=$hidden - echo "Hidden = $hidden" - else - ph2=$hidden - echo "PH2 = $ph2" - fi - fi -else - echo "Invalid QR Code" -fi diff --git a/general/package/quirc-openipc/quirc-openipc.mk b/general/package/quirc-openipc/quirc-openipc.mk index f0c35f86..3936f29f 100644 --- a/general/package/quirc-openipc/quirc-openipc.mk +++ b/general/package/quirc-openipc/quirc-openipc.mk @@ -4,31 +4,24 @@ # ################################################################################ -ifeq ($(LOCAL_DOWNLOAD),y) -QUIRC_OPENIPC_SITE_METHOD = git -QUIRC_OPENIPC_SITE = https://github.com/openipc/quirc -QUIRC_OPENIPC_VERSION = $(shell git ls-remote $(QUIRC_OPENIPC_SITE) HEAD | head -1 | cut -f1) -else QUIRC_OPENIPC_SITE = https://github.com/openipc/quirc/archive QUIRC_OPENIPC_SOURCE = master.tar.gz -endif -QUIRC_OPENIPC_DEPENDENCIES += libjpeg -QUIRC_OPENIPC_LICENSE = ISC -QUIRC_OPENIPC_LICENSE_FILES = LICENSE.txt +QUIRC_OPENIPC_DEPENDENCIES = libjpeg +LIBJPEG_CONF_OPTS = --disable-shared QUIRC_OPENIPC_MAKE_OPTS = \ - CC="$(TARGET_CC)" \ - AR="$(TARGET_AR)" + CC=$(TARGET_CC) \ + AR=$(TARGET_AR) \ + LDFLAGS="-s" define QUIRC_OPENIPC_BUILD_CMDS $(MAKE) $(QUIRC_OPENIPC_MAKE_OPTS) -C $(@D) all endef define QUIRC_OPENIPC_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/qrscan $(TARGET_DIR)/usr/sbin - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(QUIRC_OPENIPC_PKGDIR)files/qrparse + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/qrscan endef $(eval $(generic-package)) diff --git a/general/package/quirc-openipc/readme.md b/general/package/quirc-openipc/readme.md deleted file mode 100644 index e8ecfb19..00000000 --- a/general/package/quirc-openipc/readme.md +++ /dev/null @@ -1,11 +0,0 @@ - -### Sample usage - -``` -#!/bin/sh - -while true ; do - sleep 1 - curl -s -o /tmp/img.jpg http://127.0.0.1/image.jpg ; qrscan -p /tmp/img.jpg -done -``` diff --git a/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch b/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch index 3941b002..cba91788 100644 --- a/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch +++ b/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch @@ -1,19 +1,21 @@ ---- a/Makefile 2023-11-08 03:23:56.619884059 +0300 -+++ b/Makefile 2023-11-08 03:51:10.864807292 +0300 -@@ -39,7 +39,7 @@ +--- a/Makefile 2023-12-28 12:04:57.820353449 +0300 ++++ b/Makefile 2023-12-28 12:31:56.636201729 +0300 +@@ -39,8 +39,8 @@ ########################## WIFI IC ############################ CONFIG_RTL8812A = y -CONFIG_RTL8821A = y +-CONFIG_RTL8814A = y +CONFIG_RTL8821A = n - CONFIG_RTL8814A = n ++CONFIG_RTL8814A = n ######################### Interface ########################### CONFIG_USB_HCI = y + ########################## Features ########################### @@ -206,9 +206,9 @@ EXTRA_CFLAGS += -DDBG=0 endif --ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), y_y) +-ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) +ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_n_n) -EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau_wfb\" diff --git a/general/package/rtl8812au-openipc/0002-old_kernel_fix.patch b/general/package/rtl8812au-openipc/0002-old_kernel_fix.patch new file mode 100644 index 00000000..c887210d --- /dev/null +++ b/general/package/rtl8812au-openipc/0002-old_kernel_fix.patch @@ -0,0 +1,36 @@ +diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +--- a/os_dep/linux/ioctl_cfg80211.c 2023-12-28 04:55:44.047232205 +0300 ++++ b/os_dep/linux/ioctl_cfg80211.c 2023-12-28 04:58:01.223544721 +0300 +@@ -4921,6 +4921,7 @@ + //RTW_INFO("%s dvobj null\n", __func__); + } + switch(pHalData->current_channel_bw){ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) + case CHANNEL_WIDTH_5: + //RTW_INFO("%s width 5\n", __func__); + width = NL80211_CHAN_WIDTH_5; +@@ -4931,6 +4932,7 @@ + width = NL80211_CHAN_WIDTH_10; + center_freq = control_freq; + break; ++#endif + case CHANNEL_WIDTH_20: + //RTW_INFO("%s width 20\n", __func__); + width = NL80211_CHAN_WIDTH_20; +diff -Naur a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c +--- a/os_dep/linux/wifi_regd.c 2023-11-08 03:19:52.064089100 +0300 ++++ b/os_dep/linux/wifi_regd.c 2023-12-28 04:57:52.047523712 +0300 +@@ -334,11 +334,11 @@ + if (ch) + ch->flags &= ~(IEEE80211_CHAN_DISABLED|IEEE80211_CHAN_NO_HT40PLUS| + IEEE80211_CHAN_NO_HT40MINUS|IEEE80211_CHAN_NO_80MHZ| +- IEEE80211_CHAN_NO_160MHZ); ++ IEEE80211_CHAN_NO_160MHZ | + #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) + IEEE80211_CHAN_NO_IBSS|IEEE80211_CHAN_PASSIVE_SCAN); + #else +- IEEE80211_CHAN_NO_IR; ++ IEEE80211_CHAN_NO_IR); + #endif + //ch->flags = IEEE80211_CHAN_DISABLED; + } diff --git a/general/package/sigmastar-osdrv-infinity6/files/lib/libmi_iqserver.so b/general/package/sigmastar-osdrv-infinity6/files/lib/libmi_iqserver.so new file mode 100644 index 00000000..c2fd89ab Binary files /dev/null and b/general/package/sigmastar-osdrv-infinity6/files/lib/libmi_iqserver.so differ diff --git a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar index d76d02ef..cce5fa52 100755 --- a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar @@ -15,14 +15,12 @@ detect_sensor() { } set_sensor() { - SOC=$(fw_printenv -n soc) - [ "$SOC" = "ssc325de" ] && IFACE=parl - case ${SENSOR} in gc2053|imx307) insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1 ;; - sc2239) + sc2239|sc2335) + [ "$(fw_printenv -n soc)" = "ssc325de" ] && IFACE=parl insmod ${PATH_SENSOR}/sensor_${SENSOR}_${IFACE:-mipi}.ko chmap=1 ;; *) diff --git a/general/package/sigmastar-osdrv-infinity6/files/sensor/configs/sc2239.bin b/general/package/sigmastar-osdrv-infinity6/files/sensor/configs/sc2239.bin index 25052659..588e1439 100644 Binary files a/general/package/sigmastar-osdrv-infinity6/files/sensor/configs/sc2239.bin and b/general/package/sigmastar-osdrv-infinity6/files/sensor/configs/sc2239.bin differ diff --git a/general/package/sigmastar-osdrv-infinity6/files/sensor/configs/sc2335.bin b/general/package/sigmastar-osdrv-infinity6/files/sensor/configs/sc2335.bin new file mode 100644 index 00000000..588e1439 Binary files /dev/null and b/general/package/sigmastar-osdrv-infinity6/files/sensor/configs/sc2335.bin differ diff --git a/general/package/sigmastar-osdrv-infinity6/files/sensor/firmware/isp_api.xml b/general/package/sigmastar-osdrv-infinity6/files/sensor/firmware/isp_api.xml new file mode 100644 index 00000000..a48dd3c3 --- /dev/null +++ b/general/package/sigmastar-osdrv-infinity6/files/sensor/firmware/isp_api.xml @@ -0,0 +1,669 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/lib/libmi_iqserver.so b/general/package/sigmastar-osdrv-infinity6b0/files/lib/libmi_iqserver.so new file mode 100644 index 00000000..e2d121a2 Binary files /dev/null and b/general/package/sigmastar-osdrv-infinity6b0/files/lib/libmi_iqserver.so differ diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar index 2e0965c6..aaee802e 100755 --- a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar +++ b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar @@ -20,7 +20,7 @@ set_sensor() { gc2053|gc2083|gc4023|gc4653|imx307|imx335) insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1 ;; - os02g10|sc2239|sc223a|sc2335|sc3335|sc3338) + jxf37|os02g10|sc2239|sc223a|sc2335|sc3335|sc3338) insmod ${PATH_SENSOR}/sensor_${SENSOR}_mipi.ko chmap=1 ;; *) diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/configs/jxf37.bin b/general/package/sigmastar-osdrv-infinity6b0/files/sensor/configs/jxf37.bin new file mode 100644 index 00000000..067a64d0 Binary files /dev/null and b/general/package/sigmastar-osdrv-infinity6b0/files/sensor/configs/jxf37.bin differ diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/firmware/isp_api.xml b/general/package/sigmastar-osdrv-infinity6b0/files/sensor/firmware/isp_api.xml new file mode 100644 index 00000000..6043f79d --- /dev/null +++ b/general/package/sigmastar-osdrv-infinity6b0/files/sensor/firmware/isp_api.xml @@ -0,0 +1,977 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_sc3338_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_sc3338_mipi.ko deleted file mode 100644 index 732a9b98..00000000 Binary files a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_sc3338_mipi.ko and /dev/null differ diff --git a/general/package/sigmastar-osdrv-infinity6c/files/lib/libmi_iqserver.so b/general/package/sigmastar-osdrv-infinity6c/files/lib/libmi_iqserver.so new file mode 100644 index 00000000..240dafcf Binary files /dev/null and b/general/package/sigmastar-osdrv-infinity6c/files/lib/libmi_iqserver.so differ diff --git a/general/package/sigmastar-osdrv-infinity6c/files/sensor/firmware/isp_api.xml b/general/package/sigmastar-osdrv-infinity6c/files/sensor/firmware/isp_api.xml new file mode 100644 index 00000000..f0f28770 --- /dev/null +++ b/general/package/sigmastar-osdrv-infinity6c/files/sensor/firmware/isp_api.xml @@ -0,0 +1,1444 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/general/package/sigmastar-osdrv-infinity6e/files/lib/libmi_iqserver.so b/general/package/sigmastar-osdrv-infinity6e/files/lib/libmi_iqserver.so new file mode 100755 index 00000000..b47732dd Binary files /dev/null and b/general/package/sigmastar-osdrv-infinity6e/files/lib/libmi_iqserver.so differ diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/configs/imx415_fpv.bin b/general/package/sigmastar-osdrv-infinity6e/files/sensor/configs/imx415_fpv.bin new file mode 100644 index 00000000..2dc9cbcd Binary files /dev/null and b/general/package/sigmastar-osdrv-infinity6e/files/sensor/configs/imx415_fpv.bin differ diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/firmware/isp_api.xml b/general/package/sigmastar-osdrv-infinity6e/files/sensor/firmware/isp_api.xml new file mode 100644 index 00000000..852697d2 --- /dev/null +++ b/general/package/sigmastar-osdrv-infinity6e/files/sensor/firmware/isp_api.xml @@ -0,0 +1,1135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/general/package/vdec-openipc/files/S98vdec b/general/package/vdec-openipc/files/S98vdec index d05543ad..7f63d94c 100755 --- a/general/package/vdec-openipc/files/S98vdec +++ b/general/package/vdec-openipc/files/S98vdec @@ -4,6 +4,14 @@ # . /etc/vdec.conf +if [ ! -z ${records} ]; then + for i in $(seq 1000 9000) + do + [ ! -f ${records}/video_${i}.${codec} ] && break + done + extra=$(echo ${extra} -w ${records}/video_${i}.${codec}) +fi + if [ ${osd} = "simple" ]; then osd_variant="--osd" fi diff --git a/general/package/vdec-openipc/files/vdec.conf b/general/package/vdec-openipc/files/vdec.conf index 692ed93b..0eab4c08 100644 --- a/general/package/vdec-openipc/files/vdec.conf +++ b/general/package/vdec-openipc/files/vdec.conf @@ -29,6 +29,10 @@ mavlink_port=14750 osd=simple +### Records archive (Mount ssd, set up full path to records archive, file names generated automatically. example: /mnt/sda1/recorder) + +records= + ### Extra param (write in one line split by space): # --ar [mode] - Aspect ratio mode (Default: keep) diff --git a/general/scripts/excludes/gk7205v200_fpv.list b/general/scripts/excludes/gk7205v200_fpv.list index 20499f70..4d68aa29 100644 --- a/general/scripts/excludes/gk7205v200_fpv.list +++ b/general/scripts/excludes/gk7205v200_fpv.list @@ -1,3 +1,14 @@ +etc/sensors/bt656_720p.ini +etc/sensors/gc2053_i2c_1080p.ini +etc/sensors/gc4653_i2c_4M.ini +etc/sensors/jxf23_i2c_1080p.ini +etc/sensors/jxf23_i2c_dc_1080p.ini +etc/sensors/sc200ai_i2c_1080p.ini +etc/sensors/sc2232h_i2c_1080p.ini +etc/sensors/sc2239_i2c_1080p.ini +etc/sensors/sc223a_i2c_1080p.ini +etc/sensors/4_sc223a_i2c_1080p.ini +etc/sensors/sc2335_i2c_1080p.ini etc/sensors/iq/f23.ini etc/sensors/iq/gc2053.ini etc/sensors/iq/sc2232.ini @@ -34,3 +45,4 @@ usr/lib/sensors/libsns_sc3335.so usr/lib/sensors/libsns_sc4236.so usr/lib/sensors/libsns_sc500ai.so usr/lib/sensors/libsns_sc223a.so +usr/lib/sensors/libsns_sc223a_4l.so diff --git a/general/scripts/excludes/hi3516ev200_fpv.list b/general/scripts/excludes/hi3516ev200_fpv.list index 6e27ff08..d527e5b7 100644 --- a/general/scripts/excludes/hi3516ev200_fpv.list +++ b/general/scripts/excludes/hi3516ev200_fpv.list @@ -1,4 +1,15 @@ -etc/senors/iq/f23.ini +etc/sensors/gc2053_i2c_1080p.ini +etc/sensors/jxf22_i2c_1080p.ini +etc/sensors/jxf23_i2c_1080p.ini +etc/sensors/jxf37_i2c_1080p.ini +etc/sensors/sc2231_i2c_1080p.ini +etc/sensors/sc2232h_i2c_1080p.ini +etc/sensors/sc2239_i2c_1080p.ini +etc/sensors/sc2315e_i2c_1080p.ini +etc/sensors/sc3235_i2c_3M.ini +etc/sensors/sc4236_i2c_3M.ini +etc/sensors/sp2305_i2c_1080p.ini +etc/sensors/iq/f23.ini etc/sensors/iq/gc2053.ini etc/sensors/iq/sc2232.ini etc/sensors/iq/sc2335.ini diff --git a/general/scripts/excludes/t31_fpv.list b/general/scripts/excludes/t31_fpv.list new file mode 100644 index 00000000..511e259f --- /dev/null +++ b/general/scripts/excludes/t31_fpv.list @@ -0,0 +1,15 @@ +etc/sensor/gc2083.yaml +etc/sensor/gc2083-t31.bin +etc/sensor/gc4023.yaml +etc/sensor/gc4023-t31.bin +etc/sensor/jxq03.yaml +etc/sensor/jxq03-t31.bin +etc/sensor/jxq03p.yaml +etc/sensor/jxq03p-t31.bin +etc/sensor/sc2232h.yaml +etc/sensor/sc2232h-t31.bin +lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc2083_t31.ko +lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_gc4023_t31.ko +lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03_t31.ko +lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_jxq03p_t31.ko +lib/modules/3.10.14__isvp_swan_1.0__/ingenic/sensor_sc2232h_t31.ko