Merge branch 'dev' into dev1

kendryte · Sep 16, 2022 · 8d1e4d5 · 8d1e4d5
2 parents 44bc533 + 02607af
commit 8d1e4d5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/board/canaan/k510/k510_rootfs_skeleton/etc/init.d/rc.sysinit b/board/canaan/k510/k510_rootfs_skeleton/etc/init.d/rc.sysinit
@@ -104,6 +104,6 @@ ntpdate  ntp.aliyun.com >/dev/null 2>&1 &
 i2ctransfer -f -y 0 w3@0x10 0x01 0x00 0x00
 
 cd /app/mediactl_lib/
-./v4l2_drm.out -f video_drm_1920x1080.conf -e 1 -s &
+taskset 0x2 ./v4l2_drm.out -f video_drm_1920x1080.conf -e 1 -s &
 cd /
 /usr/sbin/ifplugd -d 0 -u 0 -n -p  -I -i eth0 -r /etc/network/ifplug.sh &
diff --git a/board/canaan/k510/uboot-emmc.env b/board/canaan/k510/uboot-emmc.env
@@ -12,7 +12,7 @@ ipaddr=10.100.226.221
 netmask=255.255.255.0
 gatewayip=10.100.226.254
 serverip=10.100.226.63
-bootargs=root=/dev/mmcblk0p3 ro console=ttyS0,115200n8 debug loglevel=7  rootfstype=ext2
+bootargs=root=/dev/mmcblk0p3 ro console=ttyS0,115200n8 debug loglevel=7  rootfstype=ext2 isolcpus=1
 
 bootcmd=fatload mmc 0:2 0x600000 bootm-bbl.img;fatload mmc 0:2 0x2000000 k510.dtb;bootm 0x600000 - 0x2000000
 bootcmd_nfs=tftp 0x600000 bootm-bbl.img;tftp 0x2000000 k510_nfsroot.dtb;bootm 0x600000 - 0x2000000
diff --git a/board/canaan/k510/uboot-nand.env b/board/canaan/k510/uboot-nand.env
@@ -12,7 +12,7 @@ ipaddr=10.100.226.221
 netmask=255.255.255.0
 gatewayip=10.100.226.254
 serverip=10.100.226.63
-bootargs=root=ubi0:ubi_rootfs_part rootfstype=ubifs ubi.mtd=6,2048 console=ttyS0,115200n8 debug loglevel=7
+bootargs=root=ubi0:ubi_rootfs_part rootfstype=ubifs ubi.mtd=6,2048 console=ttyS0,115200n8 debug loglevel=7 isolcpus=1
 
 bootcmd=mtd read spi-nand0 0x600000 0x380000 0xf00000;mtd read spi-nand0 0x2000000 0x340000 0x40000;bootm 0x600000 - 0x2000000
 

diff --git a/board/canaan/k510/uboot-sdcard.env b/board/canaan/k510/uboot-sdcard.env
@@ -12,7 +12,7 @@ ipaddr=10.100.226.221
 netmask=255.255.255.0
 gatewayip=10.100.226.254
 serverip=10.100.226.63
-bootargs=root=/dev/mmcblk2p2 ro console=ttyS0,115200n8 debug loglevel=7 rootfstype=ext2
+bootargs=root=/dev/mmcblk2p2 ro console=ttyS0,115200n8 debug loglevel=7 rootfstype=ext2 isolcpus=1
 
 bootcmd=while  true ; do  fatload mmc 1:1 0x600000 bootm-bbl.img && fatload mmc 1:1 0x2000000 k510.dtb && bootm 0x600000 - 0x2000000 ;done
 bootcmd_nfs=tftp 0x600000 bootm-bbl.img;tftp 0x2000000 k510_nfsroot.dtb;bootm 0x600000 - 0x2000000