diff --git a/BSP/linux-kernel/arch/arm/configs/na51089_evb_cardv_defconfig_release b/BSP/linux-kernel/arch/arm/configs/na51089_evb_cardv_defconfig_release index 5e6849477..637cdd6a7 100755 --- a/BSP/linux-kernel/arch/arm/configs/na51089_evb_cardv_defconfig_release +++ b/BSP/linux-kernel/arch/arm/configs/na51089_evb_cardv_defconfig_release @@ -2059,7 +2059,7 @@ CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y # CONFIG_NVT_OTP_SUPPORT=y CONFIG_NVT_HDAL_BUILD_IN=y -# CONFIG_NVT_HDAL_BUILD_IN_ADV is not set +CONFIG_NVT_HDAL_BUILD_IN_ADV=y # CONFIG_NVT_PERF_MEASURE is not set # @@ -2070,6 +2070,24 @@ CONFIG_NVT_DMA_MONITOR=y CONFIG_NVT_VOS_KWRAP=y CONFIG_NVT_HDAL_KDRV_BUILTIN=y # CONFIG_NVT_FAST_ISP_FLOW is not set +CONFIG_NVT_HDAL_KDRV_COMM=y +CONFIG_NVT_HDAL_KDRV_GFX2D=y +CONFIG_NVT_HDAL_KDRV_VIDEOCAPTURE=y +CONFIG_NVT_HDAL_KDRV_VIDEOPROCESS=y +CONFIG_NVT_HDAL_KDRV_VIDEOCODEC=y +CONFIG_NVT_HDAL_KDRV_AUDIO_COMMON=y +CONFIG_NVT_HDAL_KDRV_AUDIO=y +CONFIG_NVT_HDAL_KFLOW_COMMON=y +CONFIG_NVT_HDAL_KFLOW_VIDEOCAPTURE=y +CONFIG_NVT_HDAL_KFLOW_VIDEOPROCESS=y +CONFIG_NVT_HDAL_KFLOW_VIDEOENC=y +CONFIG_NVT_HDAL_KFLOW_GFX2D=y +CONFIG_NVT_HDAL_KFLOW_VIDEOSPRITE=y +CONFIG_NVT_HDAL_KFLOW_AUDIOCAPTURE=y +CONFIG_NVT_HDAL_ISP_ISP=y +CONFIG_NVT_HDAL_ISP_AE=y +CONFIG_NVT_HDAL_ISP_AWB=y +CONFIG_NVT_HDAL_ISP_IQ=y # CONFIG_PM_DEVFREQ is not set # CONFIG_EXTCON is not set # CONFIG_MEMORY is not set diff --git a/BSP/root-fs/Makefile b/BSP/root-fs/Makefile index 39b0bd62e..951a3b8a5 100755 --- a/BSP/root-fs/Makefile +++ b/BSP/root-fs/Makefile @@ -84,7 +84,11 @@ gen_rootfs_ubinize_cfg_param = \ define gen_rootfs_tmp rm -rf $(ROOTFS_DIR)/rootfs.tmp; - mkdir $(ROOTFS_DIR)/rootfs.tmp; cd $(ROOTFS_DIR)/rootfs; cp -arf `ls | grep -v etc` $(ROOTFS_DIR)/rootfs.tmp; + if [ "$(NVT_STATIC_DEVNODE)" == "NVT_STATIC_DEVNODE_ON" ]; then \ + mkdir $(ROOTFS_DIR)/rootfs.tmp; cd $(ROOTFS_DIR)/rootfs; sudo cp -arf `ls | grep -v etc` $(ROOTFS_DIR)/rootfs.tmp; \ + else \ + mkdir $(ROOTFS_DIR)/rootfs.tmp; cd $(ROOTFS_DIR)/rootfs; cp -arf `ls | grep -v etc` $(ROOTFS_DIR)/rootfs.tmp; \ + fi @# Generate etc folder @# List all etc folder files $(eval etc_files_list=`cd $(ROOTFS_DIR)/rootfs/etc; find .`) diff --git a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/fstab b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/fstab index 2d5c63782..e2e3edb9d 100755 --- a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/fstab +++ b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/fstab @@ -1,6 +1,6 @@ proc /proc proc defaults 0 0 sysfs /sys sysfs defaults 0 0 -tmpfs /dev tmpfs defaults 0 0 +#tmpfs /dev tmpfs defaults 0 0 tmpfs /tmp tmpfs defaults,noatime,nosuid,nodev,exec,mode=1777,size=5M 0 0 tmpfs /var/run tmpfs defaults,rw,nosuid,mode=0755 0 0 debugfs /sys/kernel/debug debugfs defaults 0 0 diff --git a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S05_FS_Overlay b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S05_FS_Overlay index 6e4b7771c..3b85d8186 100755 --- a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S05_FS_Overlay +++ b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S05_FS_Overlay @@ -33,8 +33,8 @@ wait_dev_or_exit() fi } -echo "/sbin/mdev" > /proc/sys/kernel/hotplug -mdev -s +#echo "/sbin/mdev" > /proc/sys/kernel/hotplug +#mdev -s if [ "$EMBMEM" == "EMBMEM_EMMC" ]; then # if /proc/mtd not exist, exit @@ -62,12 +62,14 @@ else exit 0 fi - mknod /dev/mtdblock$num b `cat /sys/block/mtdblock$num/dev | sed "s/:/\ /g"` + if [[ ! -d /sys/firmware/devicetree/base/hd_devnum ]]; then + mknod /dev/mtdblock$num b `cat /sys/block/mtdblock$num/dev | sed "s/:/\ /g"` + fi fi if [ "$NVT_ROOTFS_TYPE" == "NVT_ROOTFS_TYPE_NAND_UBI" ]; then - echo "[fs overlay] ubi mount rootfs1" + echo "[fs overlay] ubi mount rootfs" ubiattach /dev/ubi_ctrl -m $num wait_dev_or_exit /dev/ubi1_0 mount -t ubifs /dev/ubi1_0 /mnt/overlay_rw0; @@ -75,7 +77,7 @@ if [ "$NVT_ROOTFS_TYPE" == "NVT_ROOTFS_TYPE_NAND_UBI" ]; then sync echo 1 > /proc/sys/vm/drop_caches elif [ "$NVT_ROOTFS_TYPE" == "NVT_ROOTFS_TYPE_SQUASH" ] && [ "$EMBMEM" != "EMBMEM_NONE" ]; then - echo "[fs overlay] squash mount rootfs1" + echo "[fs overlay] squash mount rootfs" if [ "$EMBMEM" == "EMBMEM_SPI_NAND" ]; then ubiattach /dev/ubi_ctrl -m $num wait_dev_or_exit /dev/ubi1_0 @@ -100,7 +102,6 @@ elif [ "$NVT_ROOTFS_TYPE" == "NVT_ROOTFS_TYPE_RAMDISK" ] && [ "$EMBMEM" != "EMBM mount -t ext4 /dev/$mmcblkpn /lib/modules; else echo "[fs overlay] squash mount rootfs1" - #echo "mount -t squashfs /dev/mtdblock$num /lib/modules" mount -t squashfs /dev/mtdblock$num /lib/modules; fi mount /lib/modules/usr/bin/ /usr/bin/; diff --git a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S07_APP_Overlay b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S07_APP_Overlay index e48625bbe..82877eafd 100755 --- a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S07_APP_Overlay +++ b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S07_APP_Overlay @@ -14,16 +14,29 @@ wait_dev_or_exit() } # if /proc/mtd not exist, exit -if [ ! -f /proc/mtd ]; then - echo "[app overlay] /proc/mtd not ready" - exit -1 -fi +if [ "$EMBMEM" == "EMBMEM_EMMC" ]; then + # if /proc/mtd not exist, exit + if [ ! -f /proc/nvt_info/emmc ]; then + echo "[app overlay] /proc/nvt_info/emmc not ready" + exit -1 + fi + mmcblkpn=`cat /proc/nvt_info/emmc | grep ^app | awk -F' ' '{print $NF}'`; + mknod /dev/$mmcblkpn b `cat /sys/class/block/$mmcblkpn/dev | sed "s/:/\ /g"` +else + if [ ! -f /proc/mtd ]; then + echo "[app overlay] /proc/mtd not ready" + exit -1 + fi + # if the partition not found, exit + num=`cat /proc/mtd | grep \"app\" | awk -F' ' '{print $1}' | tr -d 'mtd' | tr -d ':'`; + if [ -z "$num" ]; then + echo "[app overlay] no app partition" + exit 0 + fi -# if the partition not found, exit -num=`cat /proc/mtd | grep \"app\" | awk -F' ' '{print $1}' | tr -d 'mtd' | tr -d ':'`; -if [ -z "$num" ]; then - echo "[app overlay] no app partition" - exit 0 + if [[ ! -d /sys/firmware/devicetree/base/hd_devnum ]]; then + mknod /dev/mtdblock$num b `cat /sys/block/mtdblock$num/dev | sed "s/:/\ /g"` + fi fi # mount app partition by type @@ -51,8 +64,8 @@ elif [ "$NVT_ROOTFS_TYPE" == "NVT_ROOTFS_TYPE_RAMDISK" ] && [ "$EMBMEM" != "EMBM #echo "[app overlay] jffs2 mount app" #cat /proc/mtd #ls /dev/mtdblock* - wait_dev_or_exit /dev/mtdblock$num - wait_dev_or_exit /mnt/app + #wait_dev_or_exit /dev/mtdblock$num + #wait_dev_or_exit /mnt/app #echo "mount -t jffs2 /dev/mtdblock$num /mnt/app" mount -t jffs2 /dev/mtdblock$num /mnt/app; fi diff --git a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S07_SysInit b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S07_SysInit index e6b5bc82d..2ff22c50b 100755 --- a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S07_SysInit +++ b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S07_SysInit @@ -7,43 +7,44 @@ device_node_create() mknod /dev/$1 c `cat /sys/class/$1/$1/dev | sed "s/:/\ /g"` } -SF_ADC_MUXA=224 -SF_ADC_MUXB=225 -DELAY=0.003 +#SF_ADC_MUXA=224 +#SF_ADC_MUXB=225 +#DELAY=0.003 -insmod /etc/lib/modules/$KERVER/extra/fs/exfat/exfat.ko +# insmod /etc/lib/modules/$KERVER/extra/fs/exfat/exfat.ko -echo ${SF_ADC_MUXA} > /sys/class/gpio/export -echo ${SF_ADC_MUXB} > /sys/class/gpio/export +#echo ${SF_ADC_MUXA} > /sys/class/gpio/export +#echo ${SF_ADC_MUXB} > /sys/class/gpio/export -sleep ${DELAY} +# sleep ${DELAY} -echo "out" > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXA}/direction -echo "out" > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXB}/direction +#echo "out" > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXA}/direction +#echo "out" > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXB}/direction -echo 1 > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXA}/value -echo 1 > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXB}/value +#echo 1 > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXA}/value +#echo 1 > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXB}/value -sleep ${DELAY} +#sleep ${DELAY} -echo "insert adc ko" -mem bit 0xF0020074 3 0 -insmod /lib/modules/$KERVER/kernel/drivers/iio/industrialio.ko -insmod /lib/modules/$KERVER/kernel/drivers/iio/adc/nvt_adc.ko -mem bit 0xF0020074 3 1 +#echo "insert adc ko" +#mem bit 0xF0020074 3 0 > /dev/null 2>&1 +#insmod /lib/modules/$KERVER/kernel/drivers/iio/industrialio.ko +#insmod /lib/modules/$KERVER/kernel/drivers/iio/adc/nvt_adc.ko +#mem bit 0xF0020074 3 1 > /dev/null 2>&1 # Setup mdev -echo "fs" > /proc/nvt_info/bootts -echo "/sbin/mdev" > /proc/sys/kernel/hotplug +#echo "fs" > /proc/nvt_info/bootts +#echo "/sbin/mdev" > /proc/sys/kernel/hotplug #modprobe mmc_na51055 -if [ 1 ] ; then +# if [ 1 ] ; then -sleep ${DELAY} +#sleep ${DELAY} + +#echo 0x5 > /proc/adc +#cat /sys/bus/iio/devices/iio\:device0/in_voltage0_raw +#echo 0x3 > /proc/adc -echo 0x5 > /proc/adc -cat /sys/bus/iio/devices/iio\:device0/in_voltage0_raw -echo 0x3 > /proc/adc #sleep ${DELAY} #echo 1 > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXA}/value @@ -67,9 +68,9 @@ echo 0x3 > /proc/adc #sleep ${DELAY} #cat /sys/bus/iio/devices/iio\:device0/in_voltage0_raw -fi +# fi -mdev -s +#mdev -s # Scan for without insert card if [ ! -f /tmp/.nvt_mounts ]; then diff --git a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S10_SysInit2 b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S10_SysInit2 index cf7ced486..d711c9cb6 100755 --- a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S10_SysInit2 +++ b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S10_SysInit2 @@ -7,6 +7,16 @@ else PREFIX="" fi +function insmod_if_exist() { + if [[ -f $1 ]]; then + for var in "$@" + do + #echo "insmod $var" + insmod $var + done + fi +} + HUNTING_BOOT_MODE_4G_ONLY=4G_ONLY # System Driver Init @@ -15,81 +25,110 @@ HUNTING_BOOT_MODE_4G_ONLY=4G_ONLY #modprobe nvt_status #modprobe nvt_pstore -HUNTING_BOOT_MODE=`dmesg | grep "Kernel command line" | sed 's/.* hunt_boot_mode=\(.*\) .*/\1/'` +#HUNTING_BOOT_MODE=`dmesg | grep "Kernel command line" | sed 's/.* hunt_boot_mode=\(.*\) .*/\1/'` -echo HUNTING_BOOT_MODE=${HUNTING_BOOT_MODE} +#echo HUNTING_BOOT_MODE=${HUNTING_BOOT_MODE} +#if [ "${HUNTING_BOOT_MODE_4G_ONLY}" = "${HUNTING_BOOT_MODE}" ]; then -if [ -f /usr/bin/sf_app ]; then - sf_app & -else - echo "sf_app not found" -fi +#echo "skip insert ko" -if [ "${HUNTING_BOOT_MODE_4G_ONLY}" = "${HUNTING_BOOT_MODE}" ]; then - -echo "skip insert ko" - -else +#else #insmod ${PREFIX}/lib/modules/$KERVER/extra/mcu/drv_sf_i2c_mcu.ko -insmod ${PREFIX}/lib/modules/$KERVER/extra/crypto/cryptodev-linux/cryptodev.ko +#insmod ${PREFIX}/lib/modules/$KERVER/extra/crypto/cryptodev-linux/cryptodev.ko #insmod /lib/modules/$KERVER/vos/kwrap/kwrap.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/comm/nvtmem/nvtmem.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/comm/nvtmem/nvtmem.ko +insmod_if_exist ${PREFIX}/lib/modules/$KERVER/hdal/comm/nvtmem/nvtmem.ko + #insmod /lib/modules/$KERVER/hdal/kdrv_builtin/kdrv_builtin.ko #insmod /lib/modules/$KERVER/kernel/fs/fat/fat.ko #insmod /lib/modules/$KERVER/kernel/fs/fat/vfat.ko #insmod /lib/modules/$KERVER/extra/fs/exfat/exfat.ko -if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/comm/kdrv_comm.ko ]]; then -insmod ${PREFIX}/lib/modules/$KERVER/hdal/comm/kdrv_comm.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_gfx2d/kdrv_gfx2d.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videocapture/kdrv_videocapture.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoprocess/kdrv_videoprocess.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_common/kflow_common.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_gfx/videosprite/nvt_videosprite.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videocapture/kflow_videocapture.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videoprocess/kflow_videoprocess.ko -fi +#if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/comm/kdrv_comm.ko ]]; then +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/comm/kdrv_comm.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_gfx2d/kdrv_gfx2d.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videocapture/kdrv_videocapture.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoprocess/kdrv_videoprocess.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_common/kflow_common.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_gfx/videosprite/nvt_videosprite.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videocapture/kflow_videocapture.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videoprocess/kflow_videoprocess.ko +#fi + +insmod_if_exist \ +${PREFIX}/lib/modules/$KERVER/hdal/comm/kdrv_comm.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kdrv_gfx2d/kdrv_gfx2d.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videocapture/kdrv_videocapture.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoprocess/kdrv_videoprocess.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kflow_common/kflow_common.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kflow_gfx/videosprite/nvt_videosprite.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kflow_videocapture/kflow_videocapture.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kflow_videoprocess/kflow_videoprocess.ko + + # kdrv_gfx2d -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_gfx2d/kdrv_affine/affine_neon/kdrv_afn_neon.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_gfx2d/kdrv_affine/kdrv_afn.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_gfx/nvt_gfx.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_gfx2d/kdrv_affine/affine_neon/kdrv_afn_neon.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_gfx2d/kdrv_affine/kdrv_afn.ko + +#if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/kflow_gfx/nvt_gfx.ko ]]; then +# insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_gfx/nvt_gfx.ko +#fi +insmod_if_exist ${PREFIX}/lib/modules/$KERVER/hdal/kflow_gfx/nvt_gfx.ko + # kdrv_vdoout -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/ide/nvt_ide.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/display_obj/kdrv_videoout.ko - # kflow_videoout -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videoout/unit/kflow_videoout.ko +#if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/display_obj/kdrv_videoout.ko ]]; then +# insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/ide/nvt_ide.ko +# insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/display_obj/kdrv_videoout.ko +# insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videoout/unit/kflow_videoout.ko +#fi + +insmod_if_exist \ +${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/ide/nvt_ide.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/display_obj/kdrv_videoout.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kflow_videoout/unit/kflow_videoout.ko + # panel device -insmod ${PREFIX}/lib/modules/$KERVER/hdal/display_panel/nvt_dispdev_panel.ko -case "${LCD1}" in - disp_off) - ;; - disp_if8b_lcd1_pw35p00) - insmod /lib/modules/$KERVER/hdal/display_panel/${LCD1}_hx8238d/$LCD1.ko - ;; - *) - if [[ $(echo $LCD1 | grep -c 'ifdsi') == "1" ]]; then - insmod /lib/modules/$KERVER/hdal/kdrv_videoout/dsi/nvt_dsi.ko - fi - insmod ${PREFIX}/lib/modules/$KERVER/hdal/display_panel/${LCD1}/${LCD1}.ko - ;; -esac +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/display_panel/nvt_dispdev_panel.ko +#case "${LCD1}" in +# disp_off) +# ;; +# disp_if8b_lcd1_pw35p00) +# insmod /lib/modules/$KERVER/hdal/display_panel/${LCD1}_hx8238d/$LCD1.ko +# ;; +# *) +# if [[ $(echo $LCD1 | grep -c 'ifdsi') == "1" ]]; then +# insmod /lib/modules/$KERVER/hdal/kdrv_videoout/dsi/nvt_dsi.ko +# fi +# insmod ${PREFIX}/lib/modules/$KERVER/hdal/display_panel/${LCD1}/${LCD1}.ko +# ;; +#esac -# nvt_h26x -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videocodec/kdrv_h26x.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/nvt_vencrc/nvt_vencrc.ko +insmod_if_exist \ +${PREFIX}/lib/modules/$KERVER/hdal/display_panel/nvt_dispdev_panel.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/display_panel/${LCD1}/${LCD1}.ko + + +# nvt_h26x # isf vdoenc -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videoenc/unit/kflow_videoenc.ko +#if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videocodec/kdrv_h26x.ko ]]; then +# insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videocodec/kdrv_h26x.ko +# insmod ${PREFIX}/lib/modules/$KERVER/hdal/nvt_vencrc/nvt_vencrc.ko +# insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videoenc/unit/kflow_videoenc.ko +#fi + +insmod_if_exist \ +${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videocodec/kdrv_h26x.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/nvt_vencrc/nvt_vencrc.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kflow_videoenc/unit/kflow_videoenc.ko -# isf vdodec -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videodec/unit/kflow_videodec.ko # audio if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_audioio/audio_common/nvt_audio.ko ]]; then @@ -99,38 +138,52 @@ insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_audiocapture/unit/kflow_audiocap insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_audioout/unit/kflow_audioout.ko fi -insmod /lib/modules/$KERVER/hdal/kdrv_audioio/audlib_anr/nvt_audlib_anr.ko +insmod_if_exist \ +${PREFIX}/lib/modules/$KERVER/hdal/kdrv_audioio/audio_common/nvt_audio.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kdrv_audioio/kdrv_audio/nvt_kdrv_audio.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kflow_audiocapture/unit/kflow_audiocap.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kflow_audioout/unit/kflow_audioout.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_audioio/audlib_aac/nvt_audlib_aac.ko - -# isf audenc -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_audioenc/unit/kflow_audioenc.ko - -# isf auddec -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kflow_audiodec/unit/kflow_audiodec.ko # iq, 3a #echo "isp_id_list: 0x3, ae_id_list: 0x3, awb_id_list: 0x3, iq_id_list 0x3" -insmod ${PREFIX}/lib/modules/$KERVER/hdal/isp/nvt_isp.ko +#if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/isp/nvt_isp.ko ]]; then +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/isp/nvt_isp.ko +#fi + +insmod_if_exist ${PREFIX}/lib/modules/$KERVER/hdal/isp/nvt_isp.ko + +#if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/awb/nvt_awb.ko ]]; then +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/ae/nvt_ae.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/awb/nvt_awb.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/iq/nvt_iq.ko +#fi + +insmod_if_exist \ +${PREFIX}/lib/modules/$KERVER/hdal/ae/nvt_ae.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/awb/nvt_awb.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/iq/nvt_iq.ko -if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/awb/nvt_awb.ko ]]; then -insmod ${PREFIX}/lib/modules/$KERVER/hdal/ae/nvt_ae.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/awb/nvt_awb.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/iq/nvt_iq.ko -fi insmod ${PREFIX}/lib/modules/$KERVER/hdal/${SENSOR1}/nvt_${SENSOR1}.ko sen_cfg_path=/mnt/app/sensor/${SENSOR1_CFG}.cfg #cv -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_md/kdrv_md.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_md/kdrv_md.ko #fb -if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/fbdev/nvt_fb.ko ]]; then -insmod ${PREFIX}/lib/modules/$KERVER/kernel/drivers/video/fbdev/core/cfbcopyarea.ko -insmod ${PREFIX}/lib/modules/$KERVER/kernel/drivers/video/fbdev/core/cfbfillrect.ko -insmod ${PREFIX}/lib/modules/$KERVER/kernel/drivers/video/fbdev/core/cfbimgblt.ko -insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/fbdev/nvt_fb.ko -fi +#if [[ -f ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/fbdev/nvt_fb.ko ]]; then +#insmod ${PREFIX}/lib/modules/$KERVER/kernel/drivers/video/fbdev/core/cfbcopyarea.ko +#insmod ${PREFIX}/lib/modules/$KERVER/kernel/drivers/video/fbdev/core/cfbfillrect.ko +#insmod ${PREFIX}/lib/modules/$KERVER/kernel/drivers/video/fbdev/core/cfbimgblt.ko +#insmod ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/fbdev/nvt_fb.ko +#fi + +insmod_if_exist \ +${PREFIX}/lib/modules/$KERVER/kernel/drivers/video/fbdev/core/cfbcopyarea.ko \ +${PREFIX}/lib/modules/$KERVER/kernel/drivers/video/fbdev/core/cfbfillrect.ko \ +${PREFIX}/lib/modules/$KERVER/kernel/drivers/video/fbdev/core/cfbimgblt.ko \ +${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/fbdev/nvt_fb.ko + #iio & adc (for keyscan) @@ -160,4 +213,25 @@ else echo "cardv not found" fi +if [ -f /usr/bin/sf_app ]; then + sf_app & +else + echo "sf_app not found" fi + +# isf vdodec +insmod_if_exist ${PREFIX}/lib/modules/$KERVER/hdal/kflow_videodec/unit/kflow_videodec.ko + +insmod_if_exist /lib/modules/$KERVER/hdal/kdrv_audioio/audlib_anr/nvt_audlib_anr.ko + +insmod_if_exist ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_audioio/audlib_aac/nvt_audlib_aac.ko + +# isf audenc +insmod_if_exist ${PREFIX}/lib/modules/$KERVER/hdal/kflow_audioenc/unit/kflow_audioenc.ko + +# isf auddec +insmod_if_exist ${PREFIX}/lib/modules/$KERVER/hdal/kflow_audiodec/unit/kflow_audiodec.ko + +insmod /etc/lib/modules/$KERVER/extra/fs/exfat/exfat.ko + +#fi \ No newline at end of file diff --git a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S15_NvtAppInit b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S15_NvtAppInit index 78a14265a..3972107c3 100755 --- a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S15_NvtAppInit +++ b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/init.d/S15_NvtAppInit @@ -1,17 +1,12 @@ #!/bin/sh # System Daemon Run echo "nvtapp" > /proc/nvt_info/bootts - +# mmc hot plug +echo "/sbin/mdev" > /proc/sys/kernel/hotplug +mdev -s inetd - crond - -#DeviceDiscovery -d & echo "nvtapp" > /proc/nvt_info/bootts -# for ISP tool -#echo "run isp_demon" -#/usr/bin/isp_demon - # disable childless pll echo d > /proc/nvt_info/nvt_clk/clk_childless diff --git a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/mdev-script/autosd.sh b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/mdev-script/autosd.sh index 304ef2a21..c806018e3 100755 --- a/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/mdev-script/autosd.sh +++ b/BSP/root-fs/rootfs/etc_Model/etc_565_HUNTING_EVB_LINUX_4G_S550/mdev-script/autosd.sh @@ -50,7 +50,7 @@ my_mount() mkdir -p "${MNT_PATH}/${MNT_DIR}" || exit 1 fat_type=`blkid "$MOUNTDEV" | awk -F'TYPE=' '{print $NF}'` if [ "${fat_type}" == "\"vfat\"" ]; then - if ! mount -o dirsync,time_offset=$time_offset_total_m "$MOUNTDEV" "${MNT_PATH}/${MNT_DIR}" 2>&1 | tee -a /tmp/mountstat; then + if ! mount -o usefree,dirsync,time_offset=$time_offset_total_m "$MOUNTDEV" "${MNT_PATH}/${MNT_DIR}" 2>&1 | tee -a /tmp/mountstat; then echo "$MOUNTDEV $MNT_PATH/$MNT_DIR ignore defaults 0 0" >> /tmp/.nvt_mounts exit 1 fi @@ -209,7 +209,7 @@ if [ -z $DEVPATH ]; then # Inserted but can't be mounted fat_type=`blkid "$MOUNTDEV" | awk -F'TYPE=' '{print $NF}'` if [ "${fat_type}" == "\"vfat\"" ]; then - if ! mount -o dirsync,time_offset=$time_offset_total_m "$MOUNTDEV" "${MNT_PATH}/${MNT_DIR}" 2>&1 | tee -a /tmp/mountstat; then + if ! mount -o usefree,dirsync,time_offset=$time_offset_total_m "$MOUNTDEV" "${MNT_PATH}/${MNT_DIR}" 2>&1 | tee -a /tmp/mountstat; then echo "$MOUNTDEV $MNT_PATH/$MNT_DIR ignore defaults 0 0" >> /tmp/.nvt_mounts continue fi diff --git a/BSP/root-fs/rootfs/usr/share/adc/adc.sh b/BSP/root-fs/rootfs/usr/share/adc/adc.sh new file mode 100755 index 000000000..eecfed611 --- /dev/null +++ b/BSP/root-fs/rootfs/usr/share/adc/adc.sh @@ -0,0 +1,29 @@ + +KERVER=`cat /proc/version | awk -F'version ' '{print $2}' | awk -F' ' '{print $1}'` + +SF_ADC_MUXA=224 +SF_ADC_MUXB=225 +DELAY=0.003 + +echo ${SF_ADC_MUXA} > /sys/class/gpio/export +echo ${SF_ADC_MUXB} > /sys/class/gpio/export + +echo "out" > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXA}/direction +echo "out" > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXB}/direction + +echo 1 > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXA}/value +echo 1 > /sys/devices/gpiochip0/gpio/gpio${SF_ADC_MUXB}/value + +sleep ${DELAY} + +echo "insert adc ko" +mem bit 0xF0020074 3 0 > /dev/null 2>&1 +insmod /lib/modules/$KERVER/kernel/drivers/iio/industrialio.ko +insmod /lib/modules/$KERVER/kernel/drivers/iio/adc/nvt_adc.ko +mem bit 0xF0020074 3 1 > /dev/null 2>&1 + +sleep ${DELAY} + +echo 0x5 > /proc/adc +cat /sys/bus/iio/devices/iio\:device0/in_voltage0_raw +echo 0x3 > /proc/adc \ No newline at end of file diff --git a/code/application/source/cardv/SrcCode/System/SysMain.c b/code/application/source/cardv/SrcCode/System/SysMain.c index 514ee476b..7f2e6945f 100644 --- a/code/application/source/cardv/SrcCode/System/SysMain.c +++ b/code/application/source/cardv/SrcCode/System/SysMain.c @@ -445,7 +445,7 @@ void lvglTimer(void) if(!max){ Ux_Get(UX_EVENT_QUEUE_MAX,&max); - DBG_DUMP("UX_EVENT_QUEUE_MAX = %lu\r\n", max); + DBG_IND("UX_EVENT_QUEUE_MAX = %lu\r\n", max); } Ux_Get(UX_EVENT_QUEUE_USED,&used); @@ -533,31 +533,64 @@ void UserMainProc(void) static unsigned long leftKeyPressingTime_ms = 0; ////////////////////////////////////////////////////////////// + vos_perf_list_mark(__func__, __LINE__, 0); + +#if POWERON_FAST_PREVIEW == ENABLE + if(PRIMARY_MODE_PHOTO == System_GetBootFirstMode()){ + System_InstallAppObj(); //install VControl type list of App Object and UIControl Object + System_InstallModeObj(); //install SYS_MODE objects + vos_perf_list_mark(__func__, __LINE__, 0); + System_OnVideoInit(); + vos_perf_list_mark(__func__, __LINE__, 0); + System_OnVideoInit2(); + vos_perf_list_mark(__func__, __LINE__, 0); + Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_EXE_OPEN, 1, 1); + } +#endif + + /* move adc cal here */ + system("sh /usr/share/adc/adc.sh"); + UserMainProc_Init(); if(is_fb_init == FALSE){ nvt_lvgl_init(); UIFlowLVGL(); - UIFlowSetupDateTime = NULL; is_fb_init = TRUE; } + vos_perf_list_mark(__func__, __LINE__, 0); + ////////////////////////////////////////////////////////////// #if(UCTRL_FUNC == ENABLE) System_OnUctrl(); #endif - System_InstallAppObj(); //install VControl type list of App Object and UIControl Object - System_InstallModeObj(); //install SYS_MODE objects +// System_InstallAppObj(); //install VControl type list of App Object and UIControl Object +// System_InstallModeObj(); //install SYS_MODE objects TM_BOOT_END("flow", "preboot"); +#if POWERON_FAST_PREVIEW == ENABLE + if(PRIMARY_MODE_PHOTO != System_GetBootFirstMode()){ + System_InstallAppObj(); //install VControl type list of App Object and UIControl Object + System_InstallModeObj(); //install SYS_MODE objects + } +#else + System_InstallAppObj(); //install VControl type list of App Object and UIControl Object + System_InstallModeObj(); //install SYS_MODE objects +#endif + Ux_SendEvent(0, NVTEVT_SYSTEM_BOOT, 1, 1); + + NVTEVT evt = 0; UINT32 paramNum = 0; //fix for CID 45082 UINT32 paramArray[MAX_MESSAGE_PARAM_NUM] = {0}; VOS_TICK ttick=0; INT32 result = NVTEVT_PASS; + vos_perf_list_mark(__func__, __LINE__, 0); + g_ui_task_id = LV_USER_GET_TID(); if ((vos_sem_create(&g_lv_task_handler_semid, 1, "LV_TSK_SEM")) != E_OK) { diff --git a/code/application/source/cardv/SrcCode/System/SysMain_Flow_Init.c b/code/application/source/cardv/SrcCode/System/SysMain_Flow_Init.c index 3c8ac2255..cbac1c173 100755 --- a/code/application/source/cardv/SrcCode/System/SysMain_Flow_Init.c +++ b/code/application/source/cardv/SrcCode/System/SysMain_Flow_Init.c @@ -97,9 +97,18 @@ void SystemInit(void) System_OnStrg_DownloadFW(); #endif #if (DISPLAY_FUNC == ENABLE) + +#if POWERON_FAST_PREVIEW == ENABLE + if(PRIMARY_MODE_PHOTO != System_GetBootFirstMode()){ + System_OnVideoInit(); + System_OnVideoInit2(); + } +#else System_OnVideoInit(); System_OnVideoInit2(); #endif + +#endif #if (FS_FUNC == ENABLE) System_OnStrgInit_EXMEM(); #endif diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c index c0740a58b..b3e803b6f 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c @@ -2282,6 +2282,7 @@ static void PhotoExe_DispCB(void) { tmp = 0; printf("[%s:%d]s\n", __FUNCTION__, __LINE__); + vos_perf_list_mark(__func__, __LINE__, 0); } #endif @@ -2589,7 +2590,22 @@ INT32 PhotoExe_OnOpen(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) USIZE ImageRatioSize = {0}; UINT32 ImageRatioIdx; + vos_perf_list_mark(__func__, __LINE__, 0); + +#if POWERON_FAST_PREVIEW == ENABLE + if(g_bPhotoOpened == TRUE){ + DBG_WRN("already opened\n"); + Ux_DefaultEvent(pCtrl, NVTEVT_EXE_OPEN, paramNum, paramArray); + return NVTEVT_CONSUME; + } + + g_bPhotoOpened = TRUE;; + +#else g_bPhotoOpened = FALSE; +#endif + + localInfo->isStartCapture = FALSE; ImageRatioIdx = GetPhotoSizeRatio(UI_GetData(FL_PHOTO_SIZE)); @@ -2720,7 +2736,6 @@ INT32 PhotoExe_OnOpen(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) ImageApp_Photo_Open(); - #if (SENSOR_INSERT_FUNCTION == ENABLE) System_EnableSensorDet(); #endif diff --git a/code/hdal/drivers/k_driver/source/comm/modules.builtin b/code/hdal/drivers/k_driver/source/comm/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_driver/source/kdrv_audioio/audio_common/modules.builtin b/code/hdal/drivers/k_driver/source/kdrv_audioio/audio_common/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_driver/source/kdrv_audioio/kdrv_audio/modules.builtin b/code/hdal/drivers/k_driver/source/kdrv_audioio/kdrv_audio/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_driver/source/kdrv_gfx2d/modules.builtin b/code/hdal/drivers/k_driver/source/kdrv_gfx2d/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_driver/source/kdrv_videocapture/modules.builtin b/code/hdal/drivers/k_driver/source/kdrv_videocapture/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_driver/source/kdrv_videocodec/modules.builtin b/code/hdal/drivers/k_driver/source/kdrv_videocodec/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_driver/source/kdrv_videoout/display_obj/Makefile b/code/hdal/drivers/k_driver/source/kdrv_videoout/display_obj/Makefile index 153c73ff9..0e43f1fe1 100755 --- a/code/hdal/drivers/k_driver/source/kdrv_videoout/display_obj/Makefile +++ b/code/hdal/drivers/k_driver/source/kdrv_videoout/display_obj/Makefile @@ -28,7 +28,12 @@ C_CFLAGS += -D__LINUX -Werror EXTRA_CFLAGS += $(C_CFLAGS) $(EXTRA_INCLUDE) -Wno-date-time -I$(src)/include -DDEBUG KBUILD_EXTRA_SYMBOLS = $(shell find $(VOS_DRIVER_DIR) -name Module.symvers) $(shell find $(KDRV_DIR) -name Module.symvers) +ifeq ($(CONFIG_NVT_HDAL_KDRV_VIDEOOUT),y) +obj-y += $(MODULE_NAME).o +else obj-m += $(MODULE_NAME).o +endif + OBJ := disp1.o display.o display_obj_api.o display_obj_drv.o display_obj_main.o display_obj_platform.o display_obj_proc.o kdrv_vdoout.o kdrv_vdoout_ver.o ifeq ($(CONFIG_FUNCTION_TRACER),y) diff --git a/code/hdal/drivers/k_driver/source/kdrv_videoout/display_obj/display_obj_proc.c b/code/hdal/drivers/k_driver/source/kdrv_videoout/display_obj/display_obj_proc.c index 9fdd59a46..8a8f72b90 100755 --- a/code/hdal/drivers/k_driver/source/kdrv_videoout/display_obj/display_obj_proc.c +++ b/code/hdal/drivers/k_driver/source/kdrv_videoout/display_obj/display_obj_proc.c @@ -33,7 +33,7 @@ typedef struct proc_cmd { //============================================================================ // Global variable //============================================================================ -PDISPOBJ_DRV_INFO pdrv_info_data; +static PDISPOBJ_DRV_INFO pdrv_info_data; //============================================================================ // Function define diff --git a/code/hdal/drivers/k_driver/source/kdrv_videoout/fbdev/Makefile b/code/hdal/drivers/k_driver/source/kdrv_videoout/fbdev/Makefile index d69001a81..75ef7fb0b 100755 --- a/code/hdal/drivers/k_driver/source/kdrv_videoout/fbdev/Makefile +++ b/code/hdal/drivers/k_driver/source/kdrv_videoout/fbdev/Makefile @@ -28,7 +28,12 @@ endif EXTRA_CFLAGS += $(EXTRA_INCLUDE) -D__LINUX -obj-m += $(MODULE_NAME).o +ifeq ($(CONFIG_NVT_HDAL_KDRV_VIDEOOUT),y) +obj-y += $(MODULE_NAME).o +else +obj-m += $(MODULE_NAME).o +endif + OBJ := nvt_fb_na51000.o nvt_fb_osd.o nvt_fb_video.o ccflags-y += -I$(NVT_DRIVER_DIR)/include ccflags-y += -I$(VOS_INC_PATH) diff --git a/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/Makefile b/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/Makefile index 44390b253..456b8f0c8 100755 --- a/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/Makefile +++ b/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/Makefile @@ -28,7 +28,13 @@ C_CFLAGS += -D__LINUX -Werror EXTRA_CFLAGS += $(C_CFLAGS) $(EXTRA_INCLUDE) -Wno-date-time -I$(src)/include -DDEBUG KBUILD_EXTRA_SYMBOLS = $(shell find $(VOS_DRIVER_DIR) -name Module.symvers) $(shell find $(KDRV_DIR) -name Module.symvers) +ifeq ($(CONFIG_NVT_HDAL_KDRV_VIDEOOUT),y) +obj-y += $(MODULE_NAME).o +else obj-m += $(MODULE_NAME).o +endif + + OBJ := ide2.o ide2_int.o ide2_osd.o ide2_video.o idec.o idec_cmd.o ide_api.o ide_drv.o ide_main.o ide_platform.o ide_proc.o ide_ver.o ifeq ($(CONFIG_FUNCTION_TRACER),y) diff --git a/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/ide_drv.c b/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/ide_drv.c index 734e78777..0bab4a3a4 100755 --- a/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/ide_drv.c +++ b/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/ide_drv.c @@ -26,7 +26,7 @@ typedef irqreturn_t (*irq_handler_t)(int, void *); /*===========================================================================*/ /* Global variable */ /*===========================================================================*/ -int i_event_flag = 0; +//int i_event_flag = 0; /*===========================================================================*/ /* Function define */ diff --git a/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/ide_proc.c b/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/ide_proc.c index 50ba578ca..e3287e904 100755 --- a/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/ide_proc.c +++ b/code/hdal/drivers/k_driver/source/kdrv_videoout/ide/ide_proc.c @@ -28,7 +28,7 @@ typedef struct proc_cmd { //============================================================================ // Global variable //============================================================================ -PIDE_DRV_INFO pdrv_info_data; +static PIDE_DRV_INFO pdrv_info_data; //============================================================================ // Function define diff --git a/code/hdal/drivers/k_driver/source/kdrv_videoprocess/modules.builtin b/code/hdal/drivers/k_driver/source/kdrv_videoprocess/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_flow/source/kflow_audiocapture/unit/modules.builtin b/code/hdal/drivers/k_flow/source/kflow_audiocapture/unit/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/Makefile b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/Makefile index d5968efef..d7326c8ea 100755 --- a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/Makefile +++ b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/Makefile @@ -26,7 +26,15 @@ EXTRA_CFLAGS += $(C_CFLAGS) $(EXTRA_INCLUDE) -Wno-date-time -Wno-missing-braces KBUILD_EXTRA_SYMBOLS = $(shell find $(VOS_DRIVER_DIR) -name Module.symvers) $(shell find $(KDRV_DIR) -name Module.symvers) $(shell find $(KFLOW_DIR) -name Module.symvers) #ccflags-y := $(EXTRA_CFLAGS) +#obj-m += $(MODULE_NAME).o + +ifeq ($(CONFIG_NVT_HDAL_KDRV_AUDIO),y) +obj-y += $(MODULE_NAME).o +else obj-m += $(MODULE_NAME).o +endif + + OBJ := \ linux/isf_audenc_main.o \ linux/isf_audenc_proc.o \ diff --git a/code/hdal/drivers/k_flow/source/kflow_common/modules.builtin b/code/hdal/drivers/k_flow/source/kflow_common/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_flow/source/kflow_gfx/modules.builtin b/code/hdal/drivers/k_flow/source/kflow_gfx/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_flow/source/kflow_gfx/videosprite/modules.builtin b/code/hdal/drivers/k_flow/source/kflow_gfx/videosprite/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_flow/source/kflow_videocapture/modules.builtin b/code/hdal/drivers/k_flow/source/kflow_videocapture/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_debug_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_debug_no_tracer.o index f86700053..a539594f3 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_debug_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_debug_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_input_mask_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_input_mask_no_tracer.o index 66df61ced..762d746d9 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_input_mask_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_input_mask_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_input_osd_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_input_osd_no_tracer.o index 62a1a58dd..30ea8d436 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_input_osd_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_input_osd_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_no_tracer.o index 37d2b8c4a..32044850e 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_verinfo_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_verinfo_no_tracer.o index 640846940..599ccbef9 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_verinfo_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/isf_vdoenc/isf_vdoenc_verinfo_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/modules.builtin b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h264/mp_h264_encoder_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h264/mp_h264_encoder_no_tracer.o index 12dc4e249..114f30123 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h264/mp_h264_encoder_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h264/mp_h264_encoder_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h264/mp_h264_encoder_obj_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h264/mp_h264_encoder_obj_no_tracer.o index de9f95c48..c4ecc7880 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h264/mp_h264_encoder_obj_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h264/mp_h264_encoder_obj_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h265/mp_h265_encoder_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h265/mp_h265_encoder_no_tracer.o index dca0ca9a8..a8ac7217f 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h265/mp_h265_encoder_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h265/mp_h265_encoder_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h265/mp_h265_encoder_obj_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h265/mp_h265_encoder_obj_no_tracer.o index f96abc167..1456e7815 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h265/mp_h265_encoder_obj_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_h265/mp_h265_encoder_obj_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_mjpg/mp_mjpg_encoder_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_mjpg/mp_mjpg_encoder_no_tracer.o index ee5130d26..a087be101 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_mjpg/mp_mjpg_encoder_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/mp_vcodec_mjpg/mp_mjpg_encoder_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nmediarec_vdoenc_tsk_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nmediarec_vdoenc_tsk_no_tracer.o index 7c589389f..14fb5a0ec 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nmediarec_vdoenc_tsk_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nmediarec_vdoenc_tsk_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nmediarec_vdotrig_tsk_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nmediarec_vdotrig_tsk_no_tracer.o index a2e9b9df2..9fe1f09e1 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nmediarec_vdotrig_tsk_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nmediarec_vdotrig_tsk_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nvt_media_interface_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nvt_media_interface_no_tracer.o index 17ba15d03..3fcfbe2c5 100644 Binary files a/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nvt_media_interface_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_videoenc/unit/nmediarec_vdoenc/nvt_media_interface_no_tracer.o differ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoout/unit/Makefile b/code/hdal/drivers/k_flow/source/kflow_videoout/unit/Makefile index 1b5f01c5c..2cd6cf944 100755 --- a/code/hdal/drivers/k_flow/source/kflow_videoout/unit/Makefile +++ b/code/hdal/drivers/k_flow/source/kflow_videoout/unit/Makefile @@ -22,7 +22,13 @@ C_CFLAGS += -D__LINUX -Werror EXTRA_CFLAGS += $(C_CFLAGS) $(EXTRA_INCLUDE) -Wno-date-time -Wno-missing-braces -I$(src)/include -DDEBUG KBUILD_EXTRA_SYMBOLS = $(shell find $(VOS_DRIVER_DIR) -name Module.symvers) $(shell find $(KDRV_DIR) -name Module.symvers) $(shell find $(KFLOW_DIR) -name Module.symvers) +ifeq ($(CONFIG_NVT_HDAL_KFLOW_VIDEOOUT),y) +obj-y += $(MODULE_NAME).o +else obj-m += $(MODULE_NAME).o +endif + + OBJ := \ linux/isf_vdoout_main.o \ linux/isf_vdoout_proc.o \ diff --git a/code/hdal/drivers/k_flow/source/kflow_videoprocess/modules.builtin b/code/hdal/drivers/k_flow/source/kflow_videoprocess/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/vendor/isp/drivers/source/ae/modules.builtin b/code/hdal/vendor/isp/drivers/source/ae/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/vendor/isp/drivers/source/awb/modules.builtin b/code/hdal/vendor/isp/drivers/source/awb/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/vendor/isp/drivers/source/iq/modules.builtin b/code/hdal/vendor/isp/drivers/source/iq/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/vendor/isp/drivers/source/isp/modules.builtin b/code/hdal/vendor/isp/drivers/source/isp/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/code/hdal/vendor/media/drivers/source/nvt_vencrc/modules.builtin b/code/hdal/vendor/media/drivers/source/nvt_vencrc/modules.builtin new file mode 100644 index 000000000..e69de29bb diff --git a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/make_post.sh b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/make_post.sh index 6d69af810..d224d5ea5 100755 --- a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/make_post.sh +++ b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/make_post.sh @@ -109,8 +109,6 @@ MV_KO_LIST=(\ #/lib/modules/$KERVER/hdal/comm/uvcp/nvt_uvcp.ko \ #/lib/modules/$KERVER/hdal/comm/usb2dev/nvt_usb2dev.ko \ - - if [ -d ${ROOTFS_DIR}/rootfs/etc/lib ]; then echo "remove old rootfs etc/lib" rm -r ${ROOTFS_DIR}/rootfs/etc/lib @@ -131,3 +129,33 @@ do done +# static device node +MAJOR=253 +rm -rf ${ROOTFS_DIR}/rootfs/dev/* +if grep -wq "NVT_STATIC_DEVNODE_ON" ${NVT_PRJCFG_MODEL_CFG}; then + echo -e "'\033[1;33m'NVT_STATIC_DEVNODE_ON'\033[0m'" + sudo mknod ${ROOTFS_DIR}/rootfs/dev/null c 1 3 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/fb0 c 29 0 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/mtdblock7 b 31 7 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/mtdblock8 b 31 8 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/mtdblock10 b 31 10 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/nvt_vos c ${MAJOR} 0 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/log_vg c ${MAJOR} 10 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/nvtmpp c ${MAJOR} 26 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/isf_flow0 c ${MAJOR} 27 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/isf_flow1 c ${MAJOR} 28 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/isf_flow2 c ${MAJOR} 29 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/isf_flow3 c ${MAJOR} 30 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/isf_flow4 c ${MAJOR} 31 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/isf_flow5 c ${MAJOR} 32 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/isf_flow6 c ${MAJOR} 33 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/isf_flow7 c ${MAJOR} 34 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/nvt_isp c ${MAJOR} 39 + sudo mknod ${ROOTFS_DIR}/rootfs/dev/fb_misc c ${MAJOR} 48 + sudo chown ${UID}:${UID} ${ROOTFS_DIR}/rootfs/dev/* + sudo chmod 664 ${ROOTFS_DIR}/rootfs/dev/* + sed -i 's/^tmpfs.*\/dev/#tmpfs\t\t\/dev/g' ${ROOTFS_DIR}/rootfs/etc/fstab +else + echo -e "'\033[1;33m'NVT_STATIC_DEVNODE_OFF'\033[0m'" + sed -i 's/^#tmpfs.*\/dev/tmpfs\t\t\/dev/g' ${ROOTFS_DIR}/rootfs/etc/fstab +fi \ No newline at end of file diff --git a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-evb.dts b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-evb.dts index dfdd8c5fa..a0b776e4c 100755 --- a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-evb.dts +++ b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-evb.dts @@ -19,3 +19,4 @@ #include "nvt-storage-partition.dtsi" /* flash partition */ #include "nvt-info.dtsi" /* used for turnkey information */ #include "nvt-nvtpack.dtsi" /* used for turnkey to make all-in-one bin */ +#include "nvt-devnum.dtsi" /* static device node */ diff --git a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-info.dtsi b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-info.dtsi index 04d9cf59e..9d84880bf 100755 --- a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-info.dtsi +++ b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-info.dtsi @@ -6,7 +6,7 @@ */ / { - nvt_info { /* Get from ModelConfig.txt */ + nvt_info:nvt_info { /* Get from ModelConfig.txt */ BIN_NAME = "FW98565A"; BIN_NAME_T = "FW98565T"; RTOS_APP_MAIN = "cardv"; /* Optional, if OS type is Linux, dont care it. */ @@ -212,7 +212,7 @@ * UBOOT_ONLY_LOAD_LINUX_OFF * UBOOT_ONLY_LOAD_LINUX_ON */ - UBOOT_ONLY_LOAD_LINUX = "UBOOT_ONLY_LOAD_LINUX_ON"; + UBOOT_ONLY_LOAD_LINUX = "UBOOT_ONLY_LOAD_LINUX_ON"; }; }; diff --git a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-storage-partition.dtsi b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-storage-partition.dtsi index bcd2a0e8d..d0bccbec5 100755 --- a/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-storage-partition.dtsi +++ b/configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/nvt-storage-partition.dtsi @@ -12,11 +12,11 @@ partition_fdt.app { label = "fdt.app"; reg = <0x0 0x30000 0x0 0x20000>; }; /* Fixed */ partition_uboot { label = "uboot"; reg = <0x0 0x50000 0x0 0xA0000>; }; partition_uenv { label = "uenv"; reg = <0x0 0xF0000 0x0 0x10000>; }; - partition_kernel { label = "kernel"; reg = <0x0 0x100000 0x0 0x290000>; }; - partition_rootfs { label = "rootfs"; reg = <0x0 0x390000 0x0 0x3C0000>; }; - partition_rootfs1 { label = "rootfs1"; reg = <0x0 0x750000 0x0 0xD40000>; }; - partition_rtos { label = "rtos"; reg = <0x0 0x1490000 0x0 0x930000>; }; - partition_app { label = "app"; reg = <0x0 0x1DC0000 0x0 0x50000>; }; /* app size depneds on hdal/samples/vendor_cfg/Makeile: ROOTFS_UBI_MAX_LEB_COUNT */ - partition_sys { label = "sys"; reg = <0x0 0x1E10000 0x0 0x10000>; }; + partition_kernel { label = "kernel"; reg = <0x0 0x100000 0x0 0x320000>; }; + partition_rootfs { label = "rootfs"; reg = <0x0 0x420000 0x0 0x3C0000>; }; + partition_rootfs1 { label = "rootfs1"; reg = <0x0 0x7E0000 0x0 0xD40000>; }; + partition_rtos { label = "rtos"; reg = <0x0 0x1520000 0x0 0x930000>; }; + partition_app { label = "app"; reg = <0x0 0x1E50000 0x0 0x50000>; }; /* app size depneds on hdal/samples/vendor_cfg/Makeile: ROOTFS_UBI_MAX_LEB_COUNT */ + partition_sys { label = "sys"; reg = <0x0 0x1EA0000 0x0 0x10000>; }; partition_all { label = "all"; reg = <0x0 0x0000000 0x0 0x2000000>; }; }; diff --git a/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c b/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c index ebf9a893e..c8c536007 100644 --- a/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c +++ b/rtos/code/application/source/cardv/SrcCode/System/sys_linuxboot.c @@ -34,7 +34,7 @@ #define CFG_LINUX_MAX_CODE_SIZE 0x01000000 //for 64MB dram, assume linux (ro+rw+bss) limited on this size //#define CFG_LINUX_COMP_MAX_SIZE 0xA00000 //max uImage size //#define CFG_RAMFS_COMP_MAX_SIZE 0x500000 //max ramdisk size -#define CFG_LINUX_COMP_MAX_SIZE 0x300000 //max uImage size +#define CFG_LINUX_COMP_MAX_SIZE 0x320000 //max uImage size #define CFG_RAMFS_COMP_MAX_SIZE 0x330000 //max ramdisk size #define CFG_MULTI_MKIMAGE_LEN 0x8 //mkimage's multi image always comes 8 bytes for sub-image size