[Feature][ZXW-41] merged 0601 version
Change-Id: I667af6bb09d65581d455b73f8984c160b2c67ad8
diff --git a/ap/project/pubconf.mk b/ap/project/pubconf.mk
index cedcba0..0d2c972 100755
--- a/ap/project/pubconf.mk
+++ b/ap/project/pubconf.mk
@@ -70,5 +70,5 @@
export LIBGCC_KERNEL ?= libgcc.a
export LIBNVRAM_API_NEW ?= no
export LIBSOFT_TIMER_API_NEW ?= no
-
+export USE_OPTEE ?= no
export MK_SDK_VERSION=yes
diff --git a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_bip.elf b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_bip.elf
index ba6a5c3..e4c32f9 100755
--- a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_bip.elf
+++ b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_bip.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf
index cbdf75f..d98fed6 100755
--- a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf
+++ b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_ndp.elf b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_ndp.elf
index ccc17d1..044020d 100755
--- a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_ndp.elf
+++ b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_ndp.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_volte_main.elf b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_volte_main.elf
index 96589de..3f0d8b0 100755
--- a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_volte_main.elf
+++ b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/zte_volte_main.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle/build/config.mk b/ap/project/zx297520v3/prj_vehicle/build/config.mk
index 75403de..d45a092 100755
--- a/ap/project/zx297520v3/prj_vehicle/build/config.mk
+++ b/ap/project/zx297520v3/prj_vehicle/build/config.mk
@@ -17,9 +17,9 @@
#export ROOTFS_SIZE=16
#userdata type
-export USERDATA_FS_TYPE=jffs2
+export USERDATA_FS_TYPE=ubifs
#only for ubifs partition userdata size (MB),È¥µôСÊýµã²¿·Ö
-#export USERDATA_SIZE=89
+export USERDATA_SIZE=40
#libstdc++.so.6 for fota_dm app
export USE_LIBSTDCPP := yes
diff --git a/ap/project/zx297520v3/prj_vehicle/config/normal/config.busybox b/ap/project/zx297520v3/prj_vehicle/config/normal/config.busybox
index ebc2d3a..1f1c38b 100755
--- a/ap/project/zx297520v3/prj_vehicle/config/normal/config.busybox
+++ b/ap/project/zx297520v3/prj_vehicle/config/normal/config.busybox
@@ -646,12 +646,12 @@
# CONFIG_NANDWRITE is not set
# CONFIG_NANDDUMP is not set
# CONFIG_SETSERIAL is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_UBIMKVOL is not set
-# CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
-# CONFIG_UBIUPDATEVOL is not set
+CONFIG_UBIATTACH=y
+CONFIG_UBIDETACH=y
+CONFIG_UBIMKVOL=y
+CONFIG_UBIRMVOL=y
+CONFIG_UBIRSVOL=y
+CONFIG_UBIUPDATEVOL=y
# CONFIG_ADJTIMEX is not set
# CONFIG_BBCONFIG is not set
# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
diff --git a/ap/project/zx297520v3/prj_vehicle/config/normal/config.linux b/ap/project/zx297520v3/prj_vehicle/config/normal/config.linux
index 88d4f2f..c6ef55f 100755
--- a/ap/project/zx297520v3/prj_vehicle/config/normal/config.linux
+++ b/ap/project/zx297520v3/prj_vehicle/config/normal/config.linux
@@ -1703,7 +1703,12 @@
CONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_JFFS2_CMODE_SIZE is not set
# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-# CONFIG_UBIFS_FS is not set
+CONFIG_UBIFS_FS=y
+# CONFIG_UBIFS_FS_XATTR is not set
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
# CONFIG_LOGFS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
diff --git a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/zte_bip b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/zte_bip
index ba6a5c3..e4c32f9 100755
--- a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/zte_bip
+++ b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/zte_bip
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/zte_volte_main b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/zte_volte_main
index 8a544ba..e65bdef 100755
--- a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/zte_volte_main
+++ b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/zte_volte_main
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/lib/libnvram.so b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/lib/libnvram.so
index 7272e8b..2c0325b 100755
--- a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/lib/libnvram.so
+++ b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/lib/libnvram.so
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/lib/libsoft_timer.so b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/lib/libsoft_timer.so
index 1eca733..95dbf22 100755
--- a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/lib/libsoft_timer.so
+++ b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/lib/libsoft_timer.so
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/sbin/zte_ipv6_slaac b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/sbin/zte_ipv6_slaac
index cbdf75f..d98fed6 100755
--- a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/sbin/zte_ipv6_slaac
+++ b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/sbin/zte_ipv6_slaac
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/sbin/zte_ndp b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/sbin/zte_ndp
index ccc17d1..044020d 100755
--- a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/sbin/zte_ndp
+++ b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/sbin/zte_ndp
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_bip.elf b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_bip.elf
index ba6a5c3..e4c32f9 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_bip.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_bip.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf
index cbdf75f..d98fed6 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_ndp.elf b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_ndp.elf
index ccc17d1..044020d 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_ndp.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_ndp.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_volte_main.elf b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_volte_main.elf
index 96589de..3f0d8b0 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_volte_main.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/zte_volte_main.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/build/config.mk b/ap/project/zx297520v3/prj_vehicle_dc/build/config.mk
index 1a7361d..d4bf832 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/build/config.mk
+++ b/ap/project/zx297520v3/prj_vehicle_dc/build/config.mk
@@ -25,8 +25,8 @@
export USE_LIBSTDCPP := yes
# pagesize 2K and block size 128K default
-export PAGESIZE=0x1000
-export ERASEBLOCK=0x40000
+export PAGESIZE=0x800
+export ERASEBLOCK=0x20000
# yes is debug mode,other value is release mode.
export GLOBAL_DEBUG=no
@@ -110,3 +110,5 @@
export LIBSOFT_TIMER_API_NEW:=yes
CUSTOM_MACRO += -DLIBSOFT_TIMER_API_NEW
+export USE_OPTEE := yes
+
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config_app.mk b/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config_app.mk
index 54093bf..80940c2 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config_app.mk
+++ b/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config_app.mk
@@ -5,7 +5,8 @@
Script \
zte_mdl \
fota_upi_ab \
- zte_amt
+ zte_amt \
+ sc_absvr
#yes only when klocwork static analysis
ifneq ($(KW_SKIP),yes)
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config_lib.mk b/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config_lib.mk
index 2fdd0f1..65e9fa8 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config_lib.mk
+++ b/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config_lib.mk
@@ -1,5 +1,5 @@
-zte_lib := libtinyalsa libvoice libsoftap \
+zte_lib := libtinyalsa libsoftap \
libatutils libatext libcpnv libamt libzte_dmapp libkey libdebug_info
#yes only when klocwork static analysis
@@ -11,7 +11,7 @@
ifneq ($(MK_SDK_VERSION),yes)
zte_lib += libzte_vsim
endif
-zte_lib += libsoft_timer libnvram libupi_ab
+zte_lib += libsoft_timer libnvram libupi_ab libvoice
ifeq ($(USE_MIXDATA_SUPPORT),yes)
zte_lib += libaudiomix
@@ -19,6 +19,8 @@
populate_sdk_lib := libsqlite libcurl libssl expat dbus glib
+zte_lib += libupi_ab
+
export CONFIG_LIBSSL_SHARE_LIB=y
export CONFIG_LIBCURL_SHARE_LIB=y
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/zte_bip b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/zte_bip
index ba6a5c3..e4c32f9 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/zte_bip
+++ b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/zte_bip
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/zte_volte_main b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/zte_volte_main
index 8a544ba..e65bdef 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/zte_volte_main
+++ b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/zte_volte_main
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/etc/rc b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/etc/rc
index 98f56a3..707f4ca 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/etc/rc
+++ b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/etc/rc
@@ -248,6 +248,7 @@
echo "Starting FOTA apps......!!"
#/sbin/start_update_app.sh &
+sc_absvr &
if [[ $bootflag == "1" ]]; then
#/usr/sbin/telnetd -p 4719 &
@@ -264,13 +265,9 @@
rm -rf /etc_rw/udhcpd*.pid
sh /sbin/rm_dev.sh
echo 2000 > /proc/sys/net/nf_conntrack_max
-# read nv for which core to occupy uart console
-coreid_uart_cons=$(nv get uart_console_coreid)
-if [[ $coreid_uart_cons == "1" ]]; then
-echo 1 > /sys/devices/platform/zx29_uart.1/coreid_occupy_uart
-cat /sys/devices/platform/zx29_uart.1/coreid_occupy_uart
-fi
-if [[ $coreid_uart_cons == "2" ]]; then
-echo 2 > /sys/devices/platform/zx29_uart.1/coreid_occupy_uart
-cat /sys/devices/platform/zx29_uart.1/coreid_occupy_uart
+
+adb_agent=`nv get adb_core_id`
+
+if [ "$adb_agent" == "1" ]; then
+echo 1 >/sys/dwc_usb/usbconfig/adb_agent
fi
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/etc_ro/systemPartitionInfo.conf b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/etc_ro/systemPartitionInfo.conf
new file mode 100755
index 0000000..bea1ff9
--- /dev/null
+++ b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/etc_ro/systemPartitionInfo.conf
@@ -0,0 +1,28 @@
+[Head]
+magic=SUPI
+plat=0
+plat_partition_num=4
+oem_partition_num=1
+
+
+[Platform_Partition_Info]
+name=uboot
+system_type=0
+partition_type=0
+
+name=imagefs
+system_type=0
+partition_type=0
+
+name=rootfs
+system_type=0
+partition_type=0
+
+name=caprootfs
+system_type=0
+partition_type=0
+
+[Oem_Partition_Info]
+name=oem
+system_type=1
+partition_type=0
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/lib/libnvram.so b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/lib/libnvram.so
index 7272e8b..2c0325b 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/lib/libnvram.so
+++ b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/lib/libnvram.so
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/lib/libsoft_timer.so b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/lib/libsoft_timer.so
index 1eca733..95dbf22 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/lib/libsoft_timer.so
+++ b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/lib/libsoft_timer.so
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/sbin/zte_ipv6_slaac b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/sbin/zte_ipv6_slaac
index cbdf75f..d98fed6 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/sbin/zte_ipv6_slaac
+++ b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/sbin/zte_ipv6_slaac
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/sbin/zte_ndp b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/sbin/zte_ndp
index ccc17d1..044020d 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/sbin/zte_ndp
+++ b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/sbin/zte_ndp
Binary files differ