diff --git a/device/config/chips/v851s3/configs/fastboot_sl100_front/linux/config-4.9 b/device/config/chips/v851s3/configs/fastboot_sl100_front/linux/config-4.9 index 773ae782d..c116ececf 100755 --- a/device/config/chips/v851s3/configs/fastboot_sl100_front/linux/config-4.9 +++ b/device/config/chips/v851s3/configs/fastboot_sl100_front/linux/config-4.9 @@ -1038,10 +1038,7 @@ CONFIG_FIXED_PHY=y # Host-side USB support is needed for USB Network Adapter support # # CONFIG_USB_NET_DRIVERS is not set -CONFIG_WLAN=y -CONFIG_XR806_WLAN=m -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_VIRT_WIFI is not set +# CONFIG_WLAN is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -2738,11 +2735,7 @@ CONFIG_VIRTIO=y # Microsoft Hyper-V guest support # CONFIG_STAGING=y -# CONFIG_PRISM2_USB is not set # CONFIG_COMEDI is not set -# CONFIG_RTLLIB is not set -# CONFIG_R8712U is not set -# CONFIG_R8188EU is not set # # Speakup console speech diff --git a/external/eyesee-mpp/middleware/sun8iw21/media/LIBRARY/AudioLib/midware/decoding/src/AudioDec_Decode.c b/external/eyesee-mpp/middleware/sun8iw21/media/LIBRARY/AudioLib/midware/decoding/src/AudioDec_Decode.c index f003215c8..84799b635 100755 --- a/external/eyesee-mpp/middleware/sun8iw21/media/LIBRARY/AudioLib/midware/decoding/src/AudioDec_Decode.c +++ b/external/eyesee-mpp/middleware/sun8iw21/media/LIBRARY/AudioLib/midware/decoding/src/AudioDec_Decode.c @@ -1068,7 +1068,7 @@ static int AC320DecInit(AudioDecoderContextLib *pAudioDecodeLib,BsInFor *pBsInFo pExtraData = (unsigned char*)pAudioStreamInfo->pCodecSpecificData; nExtraDataLen = pAudioStreamInfo->nCodecSpecificDataLen; - #if 1 + #if 0 alib_logd("*************pAudioStreamInfo start******************"); alib_logd("eCodecFormat :id(%d), name(%s)", pAudioStreamInfo->eCodecFormat, CodecIDtoFormatName(pAudioStreamInfo->eCodecFormat)); alib_logd("eSubCodecFormat :%d", pAudioStreamInfo->eSubCodecFormat ); @@ -1683,7 +1683,7 @@ int InitializeAudioDecodeLib(AudioDecoderLib* pDecoder, int ret = 0; int idx = 0; - LogVersionInfo(); + // LogVersionInfo(); AudioDecoderContextLib *pAudioDecodeLib = (AudioDecoderContextLib *)pDecoder; pAudioDecodeLib->DecFileInfo.tmpGlobalAudioDecData = (void*)pDecoder; diff --git a/external/eyesee-mpp/middleware/sun8iw21/media/mpi_sys.c b/external/eyesee-mpp/middleware/sun8iw21/media/mpi_sys.c index 731a35d67..d45c93488 100755 --- a/external/eyesee-mpp/middleware/sun8iw21/media/mpi_sys.c +++ b/external/eyesee-mpp/middleware/sun8iw21/media/mpi_sys.c @@ -927,7 +927,7 @@ static ERRORTYPE ion_iommu_over() } #endif -int MPP_GLOBAL_LOG_LEVEL = OPTION_LOG_LEVEL_DEBUG; +int MPP_GLOBAL_LOG_LEVEL = OPTION_LOG_LEVEL_WARN; int MPP_GLOBAL_VENC_SEI_CONFIG_LEVEL = 0; int MPP_GLOBAL_VENC_SEI_UPDATE_INTERVAL = 0; int MPP_GLOBAL_VENC_SEI_DATA_BUFFER_SIZE = 0; @@ -1434,7 +1434,7 @@ ERR_EXIT0: ERRORTYPE AW_MPI_SYS_Init(void) { ERRORTYPE eError = SUCCESS; - MPPLogVersionInfo(); + // MPPLogVersionInfo(); mpp_log_set_level(GetEnvMppLogLevel()); #if (MPPCFG_DEMUXER == OPTION_DEMUXER_ENABLE) int cedarx_log_level = GetConfigParamterInt("log_level", 0); //only for that log_set_level() can be called to set loglevel of cedarx.conf. diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/SL100FRONTPANEL b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/SL100FRONTPANEL index aed376d6f..0e5dc882b 100755 Binary files a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/SL100FRONTPANEL and b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/SL100FRONTPANEL differ diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/rc.modules b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/rc.modules index 401860dd4..f2a5ad3f8 100755 --- a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/rc.modules +++ b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/rc.modules @@ -1,22 +1,8 @@ #!/bin/sh -echo "------run rc.modules file-----" -MODULES_DIR="/lib/modules/`uname -r`" -#disp -#echo "------insmod display modules start-----" -#insmod /lib/modules/4.9.191/fb.ko -#insmod /lib/modules/4.9.191/disp.ko -#wifi -#echo "------insmod wifi modules xr806 start-----" -#insmod /lib/modules/4.9.191/xr806.ko -#insmod /lib/modules/4.9.191/vipcore.ko -#input -#echo "------insmod input modules start-----" -#insmod /lib/modules/4.9.191/input-core.ko -#insmod /lib/modules/4.9.191/evdev.ko - #audio echo "------insmod audio modules start-----" +MODULES_DIR="/lib/modules/`uname -r`" insmod $MODULES_DIR/soundcore.ko insmod $MODULES_DIR/snd.ko insmod $MODULES_DIR/snd-timer.ko @@ -30,14 +16,3 @@ insmod $MODULES_DIR/snd_soc_sunxi_daudio.ko insmod $MODULES_DIR/snd_soc_sunxi_internal_codec.ko insmod $MODULES_DIR/snd_soc_sunxi_machine.ko echo "------insmod audio modules end-----" -# insmod $MODULES_DIR/rt-media.ko -# insmod $MODULES_DIR/cst9220.ko - -#ctp -#echo "------insmod ctp modules gslx680 start-----" -#insmod /lib/modules/4.9.191/gslX680new.ko -#l-sen -#echo "------insmod l-sen modules gpadc start-----" -#insmod /lib/modules/4.9.191/sunxi_gpadc.ko - - diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/rc.preboot b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/rc.preboot deleted file mode 100755 index 39df103c2..000000000 --- a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/rc.preboot +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo "------run rc.preboot file-----" - diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/S79fat b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/~S79fat similarity index 100% rename from target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/S79fat rename to target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/~S79fat diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/inittab b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/inittab index d4aec1458..29ea14749 100755 --- a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/inittab +++ b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/inittab @@ -14,14 +14,14 @@ # process == program to run # Startup the system -::sysinit:/etc/preinit +# ::sysinit:/etc/preinit ::sysinit:/bin/mount -t proc proc /proc -::sysinit:/bin/mount -t tmpfs tmpfs /run +# ::sysinit:/bin/mount -t tmpfs tmpfs /run ::sysinit:/bin/mount -o remount,rw / ::sysinit:/bin/mkdir -p /dev/pts ::sysinit:/bin/mkdir -p /dev/shm ::sysinit:/bin/mount -a -::sysinit:/bin/hostname -F /etc/hostname +# ::sysinit:/bin/hostname -F /etc/hostname # now run any rc scripts #::sysinit:/etc/init.d/rcS ::sysinit:/etc/init.d/rcS boot diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/files/pseudo_init b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/files/pseudo_init index dafe838e3..1a03d9ad4 100755 --- a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/files/pseudo_init +++ b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/files/pseudo_init @@ -5,7 +5,6 @@ MOUNT_OVERLAY=1 ################################## functions ################################## -#mkfs_jffs2() mkfs_jffs2() { ! [ -x /usr/sbin/mkfs.jffs2 ] \ && ! [ -x /sbin/mkfs.jffs2 ] \ @@ -142,105 +141,6 @@ mount_usr(){ } -mount_sec_storage(){ - [ -e /dev/by-name/sec_storage ] || return - - local root_dev="$(readlink /dev/by-name/rootfs)" - - # mount sec_storage - if [ -h /dev/by-name/sec_storage -a -d /data/tee ]; then - case "${root_dev}" in - /dev/mtdblock*) - /bin/busybox mount -t jffs2 /dev/by-name/sec_storage /data/tee 2>/dev/null - if [ "$?" -ne "0" ]; then - mkfs_jffs2 "/dev/by-name/sec_storage" - /bin/busybox mount -t jffs2 /dev/by-name/sec_storage /data/tee 2>/dev/null - fi - ;; - /dev/ubi*) - /bin/busybox mount -t ubifs /dev/by-name/sec_storage /data/tee 2>/dev/null - if [ "$?" -ne "0" ]; then - mkfs_ubifs "/dev/by-name/sec_storage" - /bin/busybox mount -t ubifs /dev/by-name/sec_storage /data/tee 2>/dev/null - fi - ;; - *) - /usr/sbin/fsck.ext4 -y /dev/by-name/sec_storage &>/dev/null - /bin/busybox mount -t ext4 /dev/by-name/sec_storage /data/tee 2>/dev/null - if [ "$?" -ne "0" ]; then - mkfs.ext4 /dev/by-name/sec_storage >/dev/null - /bin/busybox mount -t ext4 /dev/by-name/sec_storage /data/tee 2>/dev/null - fi - ;; - esac - fi -} - -mount_single_app(){ - /usr/sbin/fsck.ext4 -y /dev/by-name/app &>/dev/null - /bin/mount /dev/by-name/app /mnt/app -} - -mount_dual_app(){ - local appAB=$(fw_printenv -n appAB) - local first_app=app - local second_app=app_sub - local applimit=$(fw_printenv -n applimit) - [ x"$applimit" != x"" -a "$applimit" -ne 0 ] && { - local appcount=$(fw_printenv -n appcount) - let appcount+=1 - [ "$appcount" -gt "$applimit" ] && { - echo "Warning: applimit ($applimit) exceeded. Switch app partition." - if [ x"$appAB" = x"A" ]; then - appAB=B - elif [ x"$appAB" = x"B" ]; then - appAB=A - else - echo "check appAB error: appAB=$appAB" - appAB=A - fi - fw_setenv appAB $appAB - echo "Switch appAB to $appAB" - appcount=1 - } - fw_setenv appcount $appcount - } - echo "appAB=$appAB" - if [ x"$appAB" = x"A" ]; then - first_app=app - second_app=app_sub - elif [ x"$appAB" = x"B" ]; then - first_app=app_sub - second_app=app - else - echo "check appAB error: appAB=$appAB" - fi - - /usr/sbin/fsck.ext4 -y /dev/by-name/$first_app &> /dev/null - /bin/mount -t ext4 /dev/by-name/$first_app /mnt/app \ - && echo "mount $first_app success" \ - && return - - echo "mount $first_app fail, now try mount $second_app" - - #mount first_app fail, try second_app - /usr/sbin/fsck.ext4 -y /dev/by-name/$second_app &> /dev/null - /bin/mount -t ext4 /dev/by-name/$second_app /mnt/app \ - && echo "mount $second_app success" \ - && return - - echo "mount app fail" -} - -mount_app() { - [ -L /dev/by-name/app ] || return - - if [ -L /dev/by-name/app_sub ]; then - mount_dual_app - else - mount_single_app - fi -} mount_overlay() { @@ -360,179 +260,10 @@ set_parts_by_name() { etc_part=/dev/nande -#hardcode rootfs_data partition as nande -mount_etc_hardcode() { - - # fix fs - /usr/sbin/fsck.ext4 -y $etc_part &>/dev/null - - /bin/mount -t ext4 $etc_part /etc \ - && [ -e /etc/etc_complete ] \ - && return - - /bin/echo "mount Failed or etc_complete not exist" - /bin/echo "now format $etc_part to ext4 ..." - /bin/umount /etc - mkfs.ext4 -m 0 $etc_part >/dev/null || return 1 - /bin/mount -t ext4 -o sync,data=journal $etc_part /mnt - - /bin/cp -af /etc/* /mnt/ - sync - /bin/mount -o move /mnt /etc - - #prepare by-name in /etc for next boot - set_parts_by_name - cp -fpr /dev/by-name /etc - sync - #now rootfs_data is ready, next boot can mount it as etc - touch /etc/etc_complete - sync # this sync not necessary, but sync after modify something is good -} - -set_parts_by_name_hardcode() { - - #UDISK is the last partition, when UDISK is there, the /etc/by-name is ready - [ -e /etc/by-name/UDISK ] && { - #set_part_by_name may cost more than 100ms, now just copy it from /etc - cp -fpr /etc/by-name /dev/ - return - } - - #should not go here. now just show warning and do set_parts_by_name - echo "warning: no /etc/by-name/UDISK, please check it" - set_parts_by_name -} - -check_update_system_state() { - swu_mode=`fw_printenv | grep swu_mode | awk -F '=' '{print $2}'` - echo "swu_mode:$swu_mode" - if [ $swu_mode == ]; then - echo "Not thing todo" - else - # update_flash_flag && boot_partition_flag - # bit3~7: reserve - # bit2 : extend(/usr) 1:extend 0:extend_back - # bit1 : rootfs 1:rootfs 0:rootfs_backup - # bit0 : kernel 1:kernel 0:kernel_back - - dd if=/dev/mtdblock0 of=/tmp/boot0_flag skip=61439 ibs=1 bs=1 count=1 1>/dev/null 2>&1 - boot_flash_flag=0x`xxd /tmp/boot0_flag | awk -F ' ' '{print $2}'` - boot_partition_flag=0x`fw_printenv | grep update_partition_flag | awk 'BEGIN{FS="="} {print $2}'` - echo "boot_flash_flag:$boot_flash_flag, boot_partition_flag:$boot_partition_flag" - if [ $boot_flash_flag == $boot_partition_flag ]; then - - boot_flash_flag_tmp=$((boot_flash_flag&0x7)) - echo "boot_flash_flag_tmp:$boot_flash_flag_tmp" - # The system has been updated, but env has not been updated - case $boot_flash_flag_tmp in - 0) - fw_setenv boot_partition bootB - fw_setenv root_partition rootfsB - fw_setenv extend_parttion extendB - fw_setenv swu_mode - ;; - - 1) - fw_setenv boot_partition bootA - fw_setenv root_partition rootfsB - fw_setenv extend_parttion extendB - fw_setenv swu_mode - ;; - 2) - fw_setenv boot_partition bootB - fw_setenv root_partition rootfsA - fw_setenv extend_parttion extendB - fw_setenv swu_mode - ;; - 3) - - fw_setenv boot_partition bootB - fw_setenv root_partition rootfsB - fw_setenv extend_parttion extendA - fw_setenv swu_mode - ;; - 4) - - fw_setenv boot_partition bootA - fw_setenv root_partition rootfsA - fw_setenv extend_parttion extendB - fw_setenv swu_mode - ;; - 5) - fw_setenv boot_partition bootA - fw_setenv root_partition rootfsB - fw_setenv extend_parttion extendA - fw_setenv swu_mode - ;; - 6) - fw_setenv boot_partition bootB - fw_setenv root_partition rootfsA - fw_setenv extend_parttion extendA - fw_setenv swu_mode - ;; - 7) - fw_setenv boot_partition bootA - fw_setenv root_partition rootfsA - fw_setenv extend_parttion extendA - fw_setenv swu_mode - ;; - *) - echo "not match boot_flash_flag_tmp" - ;; - - esac - - else - echo "update system fail, not clean swu_mode" - fi - fi -} - - -#---------------------------------------------------------------- /bin/mount -t proc /proc /proc /bin/mount -t tmpfs tmpfs /tmp /bin/mount -t sysfs sys /sys -# /bin/mount -t devtmpfs none /dev -#/bin/mount -t jffs2 /dev/mtdblock3 /home -#/bin/mount -t jffs2 /dev/mtdblock6 /home - -# /bin/mount -t jffs2 /dev/mtdblock4 /home - -# cur_time=`cat /proc/uptime` -# echo "mount /data partition [${cur_time}]" - - -# cur_time=`cat /proc/uptime` -#echo "initialization led pwm [${cur_time}]" -#echo 6 > /sys/class/pwm/pwmchip0/export -#echo 50000 > /sys/class/pwm/pwmchip0/pwm6/period -#echo 30000 > /sys/class/pwm/pwmchip0/pwm6/duty_cycle -# echo "initialization led gpio [${cur_time}]" -#echo 134 > /sys/class/gpio/export -#echo out > /sys/class/gpio/gpio134/direction - -# cur_time=`cat /proc/uptime` -# echo "enable ir led [${cur_time}]" -#echo 1 > /sys/class/pwm/pwmchip0/pwm6/enable -#echo 0 > /sys/class/gpio/gpio134/value - -# cur_time=`cat /proc/uptime` -# echo "start demo_video_in [${cur_time}]" -#demo_video_in -n 40 -s0 800x600 -f0 0 -pf 4 -trd 1 -snd 1 -s1 800x600 -f1 0 -pf1 4 -vn1 1 -#demo_video_in -n 40 -s0 800x600 -f0 0 -pf 4 -snd 1 -s1 800x600 -f1 0 -pf1 4 -trd 1 -vn1 1 -vn2 5 - -# cur_time=`cat /proc/uptime` -# echo "start uvc out [${cur_time}]" -# /bin/setusbconfig uvc -#/bin/setusbconfig uvc -# /usr/bin/setusbconfig uvc -#/usr/bin/rt_media-uvc -D 0 -d 2 -B 10 & - -#sleep 2 -#/bin/rt_media-uvc -D 1 -d 2 -B 10 & -# sleep 3 fgrep -sq pstore /proc/filesystems && { /bin/mount -t pstore pstore /sys/fs/pstore @@ -544,20 +275,8 @@ mkdir -p /var/lock #common but slow set_parts_by_name -mount_sec_storage - -# OTA's configuration is not turned on by default exit returns, -# which does not affect the startup speed -# check_update_system_state - mount_usr [ x"$MOUNT_ETC" = x"1" ] && mount_etc [ x"$MOUNT_OVERLAY" = x"1" ] && mount_overlay rootfs_data #choose rootfs_data or UDISK -mount_app - -#hardcode but fast -#mount_etc_hardcode -#set_parts_by_name_hardcode -#mount_usr exec /sbin/init diff --git a/target/allwinner/v851s3-fastboot_sl100_front/defconfig b/target/allwinner/v851s3-fastboot_sl100_front/defconfig index e50b1406a..ea8d4c6c3 100755 --- a/target/allwinner/v851s3-fastboot_sl100_front/defconfig +++ b/target/allwinner/v851s3-fastboot_sl100_front/defconfig @@ -2218,7 +2218,7 @@ CONFIG_WMG_DEFAULT_DEBUG_LV_INFO=y # CONFIG_WMG_DEFAULT_DEBUG_LV_DUMP is not set # CONFIG_WMG_DEFAULT_DEBUG_LV_EXCE is not set CONFIG_PACKAGE_wifimanager-v2.0-lib=y -CONFIG_PACKAGE_wifimanager-v2.0-demo=y +# CONFIG_PACKAGE_wifimanager-v2.0-demo is not set CONFIG_PACKAGE_wirelesscommon=y # @@ -2273,8 +2273,8 @@ CONFIG_gc2083=y # CONFIG_os02g10 is not set # CONFIG_mpp_log_level_close is not set # CONFIG_mpp_log_level_error is not set -# CONFIG_mpp_log_level_warn is not set -CONFIG_mpp_log_level_debug=y +CONFIG_mpp_log_level_warn=y +# CONFIG_mpp_log_level_debug is not set # CONFIG_mpp_log_level_verbose is not set CONFIG_mpp_fwrite_method_vfs=y # CONFIG_mpp_fwrite_method_directIO is not set @@ -2309,10 +2309,8 @@ CONFIG_mpp_adec_aac=y # CONFIG_mpp_adec_flac is not set # CONFIG_mpp_adec_ogg is not set # CONFIG_mpp_adec_opus is not set -CONFIG_mpp_muxer=y -# CONFIG_mpp_gps_pack_in_track is not set -CONFIG_mpp_gps_pack_in_mdat=y -CONFIG_mpp_demuxer=y +# CONFIG_mpp_muxer is not set +# CONFIG_mpp_demuxer is not set # CONFIG_mpp_adas_detect is not set # CONFIG_mpp_adas_detect_v2 is not set CONFIG_mpp_aec=y @@ -2324,16 +2322,16 @@ CONFIG_mpp_ans=y CONFIG_mpp_ans_libwebrtc=y # CONFIG_mpp_ans_liblstm is not set # CONFIG_mpp_ans_libnosc is not set -CONFIG_mpp_uvc=y +# CONFIG_mpp_uvc is not set CONFIG_mpp_iommu=y CONFIG_mpp_compile_static_lib=y # CONFIG_mpp_compile_dynamic_lib is not set # CONFIG_mpp_systrace is not set CONFIG_mpp_filerepair=y -CONFIG_mpp_sample_configfileparser=y +# CONFIG_mpp_sample_configfileparser is not set # CONFIG_mpp_sample is not set # CONFIG_PACKAGE_eyesee-mpp-private-onvif is not set -CONFIG_PACKAGE_eyesee-mpp-private-rtsp=y +# CONFIG_PACKAGE_eyesee-mpp-private-rtsp is not set CONFIG_PACKAGE_eyesee-mpp-system=y # CONFIG_wifi_8189ftv is not set # CONFIG_wifi_ap6181 is not set @@ -3171,7 +3169,7 @@ CONFIG_PACKAGE_kmod-vin-v4l2=y # CONFIG_PACKAGE_kmod-net-qca9377 is not set # CONFIG_PACKAGE_kmod-net-rtl8188eu is not set # CONFIG_PACKAGE_kmod-net-rtl8723bs is not set -CONFIG_PACKAGE_kmod-net-xr806=y +# CONFIG_PACKAGE_kmod-net-xr806 is not set # CONFIG_PACKAGE_kmod-net-xr819s is not set # CONFIG_PACKAGE_kmod-net-xr819s-40M is not set # CONFIG_PACKAGE_kmod-net-xr829 is not set