解决luyuan分支合并冲突

Merge remote-tracking branch 'origin/luyuan' into luyuan

buildroot-external/board/arkmicro/ark1668e_devb_emmc/rootfs_overlay/etc/init.d/S03Wland

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+#kmem 0xe490005c 0x000000a6
+#insmod  /lib/modules/3.4.0/kernel/drivers/ark/sdmmc/ark_dw_mmc.ko
+start() {
+	mv /dev/random /dev/random.orig
+	ln -s /dev/urandom /dev/random
+	#insmod /lib/modules/4.19.192/kernel/drivers/net/wireless/realtek/bcmdhd/bcmdhd.ko
+	insmod /lib/modules/4.19.192/kernel/drivers/net/wireless/realtek/rtl8821cs/rtl8821cs.ko
+	#sleep 1
+	mkdir -p /var/lib/misc/
+	touch /var/lib/misc/udhcpd.leases
+	ifconfig wlan0 up
+	ifconfig wlan0 192.168.2.1 netmask 255.255.255.0
+	echo 1 > /proc/sys/net/ipv4/ip_forward 
+	echo 1 > /proc/sys/net/ipv6/conf/wlan0/disable_ipv6
+	udhcpd -f /etc/udhcpd.conf wlan0 &
+	#hostapd -B /etc/hostapd/hostapd.conf
+	#route add default gw 192.168.2.1
+
+	echo 2097152 > /proc/sys/net/core/rmem_default
+	echo 2097152 > /proc/sys/net/core/rmem_max
+	echo 1048576 > /proc/sys/net/core/wmem_default
+	echo 1048576 > /proc/sys/net/core/wmem_max
+	echo 0 > /proc/sys/net/ipv4/tcp_timestamps
+	echo 1 > /proc/sys/net/ipv4/tcp_sack
+	echo 1 > /proc/sys/net/ipv4/tcp_fack
+	echo 1 > /proc/sys/net/ipv4/tcp_window_scaling
+	
+	echo "hostapd is start"
+}
+
+stop() {
+	rmmod /lib/modules/4.19.192/kernel/drivers/net/wireless/realtek/rtl8821cs/rtl8821cs.ko
+	echo "umount wlan driver ,stop wlan service!!!!"
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+case "$1" in
+	start|stop|restart)
+		"$1";;
+	reload)
+		# Restart, since there is no true "reload" feature.
+		restart;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac

linux/drivers/soc/arkmicro/carback/ark_track.c

@@ -1696,6 +1696,10 @@ unsigned int track_paint_fill(void *dest, unsigned int width, unsigned int heigh
 		if(ph->append2_total)  
 			subjoin_append2_pic(dest);
 	}else{
+		if(!g_carback_context->track_append_setting){
+            memset(dest,0,g_carback_context->track_display_size);
+            g_carback_context->track_append_setting = 1;
+		}
 		if(g_carback_context->layer_status){
 			if(ph->track_total )
 				subjoin_track_pic(dest);
@@ -1705,6 +1709,12 @@ unsigned int track_paint_fill(void *dest, unsigned int width, unsigned int heigh
 
 			if(ph->radar_total)  
 				subjoin_radar_pic(dest);
+
+			if(ph->append1_total)  
+				subjoin_append1_pic(dest);
+
+			if(ph->append2_total)  
+				subjoin_append2_pic(dest);
 		 
 			if(ph->track2_total) 
 				subjoin_track2_pic(dest);