diff --git a/device/config/chips/v851s3/configs/fastboot_sl100_front/board.dts b/device/config/chips/v851s3/configs/fastboot_sl100_front/board.dts index 77bd63364..6bc37b99a 100755 --- a/device/config/chips/v851s3/configs/fastboot_sl100_front/board.dts +++ b/device/config/chips/v851s3/configs/fastboot_sl100_front/board.dts @@ -335,13 +335,14 @@ }; scaler30:scaler@12 { - work_mode = <0>; + work_mode = <1>; iommus = <&mmu_aw 1 0>; delay_init = <1>; }; scaler31:scaler@13 { - status = "disabled"; + iommus = <&mmu_aw 1 0>; + delay_init = <1>; }; scaler32:scaler@14 { @@ -597,7 +598,7 @@ vinc12_rear_sensor_sel = <0>; vinc12_front_sensor_sel = <0>; vinc12_sensor_list = <0>; - work_mode = <0x0>; + work_mode = <0x1>; iommus = <&mmu_aw 1 0>; delay_init = <1>; status = "okay"; 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 a752c894b..4d66419c8 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 @@ -1164,7 +1164,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_GT82X is not set # CONFIG_TOUCHSCREEN_IT7257_TS is not set # CONFIG_TOUCHSCREEN_FT6336 is not set -CONFIG_TOUCHSCREEN_GSLX680NEW=m +# CONFIG_TOUCHSCREEN_GSLX680NEW is not set # CONFIG_TOUCHSCREEN_FT5X16_TS is not set # CONFIG_TOUCHSCREEN_FTS is not set # CONFIG_TOUCHSCREEN_GT9XXNEW_TS is not set @@ -1593,7 +1593,7 @@ CONFIG_WATCHDOG_CORE=y # CONFIG_CADENCE_WATCHDOG is not set # CONFIG_DW_WATCHDOG is not set CONFIG_SUNXI_WATCHDOG=y -# CONFIG_SUNXI_WDOG_BOOTON is not set +CONFIG_SUNXI_WDOG_BOOTON=y # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MEN_A21_WDT is not set diff --git a/lichee/melis-v3.0/source/projects/v851s3-e907-sl100-front-board/src/main.c b/lichee/melis-v3.0/source/projects/v851s3-e907-sl100-front-board/src/main.c index 9ac56c1a1..bf6ce9895 100755 --- a/lichee/melis-v3.0/source/projects/v851s3-e907-sl100-front-board/src/main.c +++ b/lichee/melis-v3.0/source/projects/v851s3-e907-sl100-front-board/src/main.c @@ -28,6 +28,7 @@ int app_entry(void *param) rpmsg_notify("scaler8", NULL, 0); rpmsg_notify("scaler9", NULL, 0); rpmsg_notify("scaler12", NULL, 0); + rpmsg_notify("scaler13", NULL, 0); rpmsg_notify("vinc0", NULL, 0); rpmsg_notify("vinc1", NULL, 0); rpmsg_notify("vinc4", NULL, 0); @@ -35,6 +36,7 @@ int app_entry(void *param) rpmsg_notify("vinc8", NULL, 0); rpmsg_notify("vinc9", NULL, 0); rpmsg_notify("vinc12", NULL, 0); + rpmsg_notify("vinc13", NULL, 0); #endif #else hal_msleep(200); 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 0d5f9eeda..25f423554 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/APP/picture/menu_btn_bg.png b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/picture/menu_btn_bg.png new file mode 100755 index 000000000..bb0cf8ba5 Binary files /dev/null and b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/picture/menu_btn_bg.png differ diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/picture/menu_btn_bg1.png b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/picture/menu_btn_bg1.png deleted file mode 100755 index abc576490..000000000 Binary files a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/picture/menu_btn_bg1.png and /dev/null differ diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/picture/menu_btn_bg2.png b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/picture/menu_btn_bg2.png deleted file mode 100755 index f717d3d91..000000000 Binary files a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/APP/picture/menu_btn_bg2.png and /dev/null differ diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/_rc.final b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/_rc.final deleted file mode 100755 index b63faf9c5..000000000 --- a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-files/etc/init.d/_rc.final +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh - -echo "------run rc.final file-----" -#echo "insmod wifi modules" -#insmod /lib/modules/3.4.39/8723ds.ko -#insmod /lib/modules/3.4.39/bcmdhd.ko -#insmod /lib/modules/3.4.39/xradio_mac.ko -#insmod /lib/modules/3.4.39/xradio_core.ko -#insmod /lib/modules/3.4.39/xradio_wlan.ko - -export LD_LIBRARY_PATH=/usr/lib/eyesee-mpp:${LD_LIBRARY_PATH} -ulimit -c unlimited -echo /mnt/extsd/coredump-%e-%p-%s-%t > /proc/sys/kernel/core_pattern - -for i in /etc/init.d/S??* ;do - - # Ignore dangling symlinks (if any). - [ ! -f "$i" ] && continue - - case "$i" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - set start - . $i - ) - ;; - *) - # No sh extension, so fork subprocess. - $i start - ;; - esac -done - -LOOP_CNT=0 -SD_DEV= -while [ 1 ];do - if [ $LOOP_CNT -eq 3 ];then - echo wait SD Card ready timeout - break; - fi - if [ -b /dev/mmcblk1p1 ];then - SD_DEV=/dev/mmcblk1p1 - break; - elif [ -b /dev/mmcblk1 ];then - SD_DEV=/dev/mmcblk1 - break; - elif [ -b /dev/mmcblk0p1 ];then - SD_DEV=/dev/mmcblk0p1 - break; - elif [ -b /dev/mmcblk0 ];then - SD_DEV=/dev/mmcblk0 - break; - else - echo SD Card not ready, wait - fi - LOOP_CNT=$(($LOOP_CNT+1)) - sleep 1 -done - -# repair sd card file -if [ "x$SD_DEV" != "x" ]; then - echo SD Card is ready - - if [ -f /usr/bin/fsck_msdos ]; then - /usr/bin/fsck_msdos -pfS $SD_DEV - fi -fi - -if [ -z "$(grep '\' /proc/mounts)" ]; then - ! /bin/mount -t vfat /dev/mmcblk0 /mnt/extsd 2>/dev/null && - /bin/mount -t vfat /dev/mmcblk0p1 /mnt/extsd -fi - -sleep 1 -if [ -n "$(grep '/mnt/extsd' /proc/mounts)" ]; then -echo "start mv stream..." -ls /tmp/ -rm -rf /mnt/extsd/stream*.h264 -rm -rf /mnt/extsd/data*.jpg -mv /tmp/stream*.h264 /mnt/extsd/ -mv /tmp/data*.jpg /mnt/extsd/ -echo "---/mnt/extsd/---" -ls /mnt/extsd/ -fi - -echo "run_usb_adb start!" -run_usb_adb - -#echo "sample_virvi2vo start!" - -#/usr/bin/sample_virvi2vo -path /usr/bin/sample_virvi2vo_v851s_sc1721v_dual.conf & -#catch jpg 0 -#demo_video_in -n 40 -s0 800x608 -f0 0 -pf 4 -trd 1 -snd 1 -s1 800x608 -f1 0 -pf1 4 -vn1 1 - -#catch jpg 1 -#demo_video_in -n 40 -s0 800x608 -f0 0 -pf 4 -snd 1 -s1 800x608 -f1 0 -pf1 4 -trd 1 -vn1 1 -vn2 5 - -#set ir -echo 6 > /sys/class/pwm/pwmchip0/export -echo 50000 > /sys/class/pwm/pwmchip0/pwm6/period -echo 30000 > /sys/class/pwm/pwmchip0/pwm6/duty_cycle - -#disable ir -echo 0 > /sys/class/pwm/pwmchip0/pwm6/enable -#enable ir -#echo 1 > /sys/class/pwm/pwmchip0/pwm6/enable - -#/usr/bin/rt_media-uvc -D 0 -b 0 -d 2 & - -#run_otg - -#sleep 2 - -#/usr/bin/rt_media-uvc -D 0 -d 2 & - 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 0b38ce706..c19c17d98 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 @@ -30,7 +30,7 @@ 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/rt-media.ko insmod $MODULES_DIR/cst9220.ko #ctp 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 e6a15bd35..dafe838e3 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 @@ -548,7 +548,7 @@ 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 +# check_update_system_state mount_usr [ x"$MOUNT_ETC" = x"1" ] && mount_etc diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-ota-files/etc/init.d/SL100FRONTPANEL b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-ota-files/etc/init.d/SL100FRONTPANEL new file mode 100755 index 000000000..57d283c65 Binary files /dev/null and b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-ota-files/etc/init.d/SL100FRONTPANEL differ diff --git a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-ota-files/etc/init.d/_rc.final b/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-ota-files/etc/init.d/_rc.final deleted file mode 100755 index b63faf9c5..000000000 --- a/target/allwinner/v851s3-fastboot_sl100_front/busybox-init-base-ota-files/etc/init.d/_rc.final +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh - -echo "------run rc.final file-----" -#echo "insmod wifi modules" -#insmod /lib/modules/3.4.39/8723ds.ko -#insmod /lib/modules/3.4.39/bcmdhd.ko -#insmod /lib/modules/3.4.39/xradio_mac.ko -#insmod /lib/modules/3.4.39/xradio_core.ko -#insmod /lib/modules/3.4.39/xradio_wlan.ko - -export LD_LIBRARY_PATH=/usr/lib/eyesee-mpp:${LD_LIBRARY_PATH} -ulimit -c unlimited -echo /mnt/extsd/coredump-%e-%p-%s-%t > /proc/sys/kernel/core_pattern - -for i in /etc/init.d/S??* ;do - - # Ignore dangling symlinks (if any). - [ ! -f "$i" ] && continue - - case "$i" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - set start - . $i - ) - ;; - *) - # No sh extension, so fork subprocess. - $i start - ;; - esac -done - -LOOP_CNT=0 -SD_DEV= -while [ 1 ];do - if [ $LOOP_CNT -eq 3 ];then - echo wait SD Card ready timeout - break; - fi - if [ -b /dev/mmcblk1p1 ];then - SD_DEV=/dev/mmcblk1p1 - break; - elif [ -b /dev/mmcblk1 ];then - SD_DEV=/dev/mmcblk1 - break; - elif [ -b /dev/mmcblk0p1 ];then - SD_DEV=/dev/mmcblk0p1 - break; - elif [ -b /dev/mmcblk0 ];then - SD_DEV=/dev/mmcblk0 - break; - else - echo SD Card not ready, wait - fi - LOOP_CNT=$(($LOOP_CNT+1)) - sleep 1 -done - -# repair sd card file -if [ "x$SD_DEV" != "x" ]; then - echo SD Card is ready - - if [ -f /usr/bin/fsck_msdos ]; then - /usr/bin/fsck_msdos -pfS $SD_DEV - fi -fi - -if [ -z "$(grep '\' /proc/mounts)" ]; then - ! /bin/mount -t vfat /dev/mmcblk0 /mnt/extsd 2>/dev/null && - /bin/mount -t vfat /dev/mmcblk0p1 /mnt/extsd -fi - -sleep 1 -if [ -n "$(grep '/mnt/extsd' /proc/mounts)" ]; then -echo "start mv stream..." -ls /tmp/ -rm -rf /mnt/extsd/stream*.h264 -rm -rf /mnt/extsd/data*.jpg -mv /tmp/stream*.h264 /mnt/extsd/ -mv /tmp/data*.jpg /mnt/extsd/ -echo "---/mnt/extsd/---" -ls /mnt/extsd/ -fi - -echo "run_usb_adb start!" -run_usb_adb - -#echo "sample_virvi2vo start!" - -#/usr/bin/sample_virvi2vo -path /usr/bin/sample_virvi2vo_v851s_sc1721v_dual.conf & -#catch jpg 0 -#demo_video_in -n 40 -s0 800x608 -f0 0 -pf 4 -trd 1 -snd 1 -s1 800x608 -f1 0 -pf1 4 -vn1 1 - -#catch jpg 1 -#demo_video_in -n 40 -s0 800x608 -f0 0 -pf 4 -snd 1 -s1 800x608 -f1 0 -pf1 4 -trd 1 -vn1 1 -vn2 5 - -#set ir -echo 6 > /sys/class/pwm/pwmchip0/export -echo 50000 > /sys/class/pwm/pwmchip0/pwm6/period -echo 30000 > /sys/class/pwm/pwmchip0/pwm6/duty_cycle - -#disable ir -echo 0 > /sys/class/pwm/pwmchip0/pwm6/enable -#enable ir -#echo 1 > /sys/class/pwm/pwmchip0/pwm6/enable - -#/usr/bin/rt_media-uvc -D 0 -b 0 -d 2 & - -#run_otg - -#sleep 2 - -#/usr/bin/rt_media-uvc -D 0 -d 2 & -