[Feature][ZXW-130]merge P50U02 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I4f29ec5bb7c59385f23738d2b7ca84e67c100f69
diff --git a/ap/project/pubconf.mk b/ap/project/pubconf.mk
index 9c36248..6f9c3d5 100755
--- a/ap/project/pubconf.mk
+++ b/ap/project/pubconf.mk
@@ -13,7 +13,7 @@
export PRJ_BIN_DIR=$(PRJ_PRODUCT_DIR)/bin/$(RF_TYPE)
endif
-export SIGN=$(TOPDIR_AP)/../tools/SignImage/SignImage
+export SIGN=$(TOPDIR_AP)/../tools/SignTool/SignImage
export OBFU_TOOL=$(TOPDIR_AP)/../tools/stunnix/bin/cxx-obfus
export LIBPS_BUILD_SHELL ?= build_modem_merge.sh
export USE_TestHarness ?= no
@@ -72,4 +72,6 @@
export LIBSOFT_TIMER_API_NEW ?= no
export USE_OPTEE ?= no
export USE_VEHICLE_DC_REF ?= no
+export USE_NVRO_BACKUP ?= no
+
export MK_SDK_VERSION=yes
diff --git a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/hostapd_2_10.elf b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/hostapd_2_10.elf
index 11e6592..8079eb8 100755
--- a/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/hostapd_2_10.elf
+++ b/ap/project/zx297520v3/prj_vehicle/bin/220A1/elfs/normalelfs/hostapd_2_10.elf
Binary files differ
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 ffc0046..3167c95 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 189df93..0aac030 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 58e26bd..893781b 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 7c55995..a1c601b 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/Makefile b/ap/project/zx297520v3/prj_vehicle/build/Makefile
index 00855a3..041613d 100755
--- a/ap/project/zx297520v3/prj_vehicle/build/Makefile
+++ b/ap/project/zx297520v3/prj_vehicle/build/Makefile
@@ -2,7 +2,7 @@
include ../../chip_pubconf.mk
include config.mk
-export PRIVATE_KEY_PATH=$(TOPDIR_AP)/../tools/SignImage/test_key/mdl/private.k
+export PRIVATE_KEY_PATH=$(TOPDIR_AP)/../tools/SignTool/key/RSA_1024/private.k
help:
@cd $(TOPDIR_AP); ./build/build.sh help
diff --git a/ap/project/zx297520v3/prj_vehicle/config/normal/config.linux b/ap/project/zx297520v3/prj_vehicle/config/normal/config.linux
index c6ef55f..0ed18ff 100755
--- a/ap/project/zx297520v3/prj_vehicle/config/normal/config.linux
+++ b/ap/project/zx297520v3/prj_vehicle/config/normal/config.linux
@@ -2007,4 +2007,6 @@
# CONFIG_CORDIC is not set
# CONFIG_VOLTE_DRV is not set
CONFIG_AMR_DRV=y
-# CONFIG_VOICE_BUFFER_DRV is not set
\ No newline at end of file
+# CONFIG_VOICE_BUFFER_DRV is not set
+CONFIG_FLAGS_UTILS=y
+# CONFIG_TEST_FLAGS_UTILS is not set
\ No newline at end of file
diff --git a/ap/project/zx297520v3/prj_vehicle/config/normal/config_app.mk b/ap/project/zx297520v3/prj_vehicle/config/normal/config_app.mk
index 9004dcd..6f1a945 100755
--- a/ap/project/zx297520v3/prj_vehicle/config/normal/config_app.mk
+++ b/ap/project/zx297520v3/prj_vehicle/config/normal/config_app.mk
@@ -10,7 +10,7 @@
#yes only when klocwork static analysis
ifneq ($(KW_SKIP),yes)
-zte_app += iproute2 iptables c-ares pppd
+zte_app += iproute2 iptables pppd
endif
ifneq ($(MK_SDK_VERSION),yes)
diff --git a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/hostapd b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/hostapd
index 11e6592..8079eb8 100755
--- a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/hostapd
+++ b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/bin/hostapd
Binary files differ
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 ffc0046..3167c95 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 756de59..feae1e0 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/etc_ro/default/default_parameter_sys b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/etc_ro/default/default_parameter_sys
index e2f045e..5aaf8be 100755
--- a/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/etc_ro/default/default_parameter_sys
+++ b/ap/project/zx297520v3/prj_vehicle/fs/normal/rootfs/etc_ro/default/default_parameter_sys
@@ -371,6 +371,8 @@
IMS_APN=
IMS_CONFURI=
IMS_URI_TYPE=0
+IMS_CC_URI_TYPE=0
+IMS_SMS_URI_TYPE=0
IMS_REG_EXPIRES=600000
IMS_REG_SUB_EXPIRES=600000
NET_IMS_CAP=0
@@ -392,5 +394,6 @@
not_supp_hmac_md5_96=0
not_supp_des_ede3_cbc=0
not_supp_aes_cbc=0
+IMS_PCSCF_PORT=5060s
G_IMS_CMGF=0
#for volte end
\ No newline at end of file
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 b70fd1e..4c207ab 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 2b8916c..0ce775e 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 189df93..0aac030 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 58e26bd..893781b 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/hostapd_2_10.elf b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/hostapd_2_10.elf
index 11e6592..8079eb8 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/hostapd_2_10.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc/bin/220A1/elfs/normalelfs/hostapd_2_10.elf
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 ffc0046..3167c95 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 189df93..0aac030 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 58e26bd..893781b 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 7c55995..a1c601b 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/Makefile b/ap/project/zx297520v3/prj_vehicle_dc/build/Makefile
index 00855a3..93ae173 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/build/Makefile
+++ b/ap/project/zx297520v3/prj_vehicle_dc/build/Makefile
@@ -2,7 +2,7 @@
include ../../chip_pubconf.mk
include config.mk
-export PRIVATE_KEY_PATH=$(TOPDIR_AP)/../tools/SignImage/test_key/mdl/private.k
+export PRIVATE_KEY_PATH=$(TOPDIR_AP)/../tools/SignTool/key/RSA_2048/private.k
help:
@cd $(TOPDIR_AP); ./build/build.sh help
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/build/config.mk b/ap/project/zx297520v3/prj_vehicle_dc/build/config.mk
index c0043b7..cd9dd06 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/build/config.mk
+++ b/ap/project/zx297520v3/prj_vehicle_dc/build/config.mk
@@ -113,4 +113,7 @@
export USE_OPTEE := yes
#install time zone files
-export CONFIG_TZDATA_MODULE=Asia
\ No newline at end of file
+export CONFIG_TZDATA_MODULE=Asia
+
+export USE_NVRO_BACKUP := yes
+
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config.busybox b/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config.busybox
index 71df975..869aaaa 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config.busybox
+++ b/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config.busybox
@@ -435,7 +435,7 @@
# CONFIG_FEATURE_KILL_REMOVED is not set
CONFIG_FEATURE_KILL_DELAY=0
CONFIG_FEATURE_INIT_SCTTY=y
-CONFIG_FEATURE_INIT_SYSLOG=y
+# CONFIG_FEATURE_INIT_SYSLOG is not set
CONFIG_FEATURE_EXTRA_QUIET=y
CONFIG_FEATURE_INIT_COREDUMPS=y
# CONFIG_FEATURE_INITRD is not set
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config.linux b/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config.linux
index ed7857f..33698e7 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config.linux
+++ b/ap/project/zx297520v3/prj_vehicle_dc/config/normal/config.linux
@@ -2032,3 +2032,5 @@
CONFIG_VOLTE_DRV=y
CONFIG_AMR_DRV=y
CONFIG_VOICE_DRV=y
+CONFIG_FLAGS_UTILS=y
+# CONFIG_TEST_FLAGS_UTILS is not set
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 ee07f9b..ecaeeaf 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
@@ -1,5 +1,5 @@
-zte_app := busybox fs_check ab_bootinfo zte_log_agent e2fsprogs \
+zte_app := busybox fs_check ab_bootinfo nvro_tool zte_log_agent e2fsprogs \
zte_uicc_agt_svr \
dnsmasq \
Script \
@@ -17,7 +17,7 @@
#yes only when klocwork static analysis
ifneq ($(KW_SKIP),yes)
-zte_app += iproute2 iptables c-ares pppd
+zte_app += iproute2 iptables pppd
endif
ifneq ($(MK_SDK_VERSION),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 f0a1c59..4fa84ce 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,13 +1,13 @@
zte_lib := libtinyalsa libsoftap \
-libatutils libatext libcpnv libamt libzte_dmapp libkey libdebug_info libflags binder
+libatutils libatext libamt libzte_dmapp libkey libdebug_info libflags binder
#yes only when klocwork static analysis
ifneq ($(KW_SKIP),yes)
zte_lib += zlib liblzma libsqlite libssl libnl libcurl libzcore
endif
-zte_lib += liblpa
+zte_lib += liblpa libcpnv
ifneq ($(MK_SDK_VERSION),yes)
zte_lib += libzte_vsim
endif
diff --git a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/hostapd b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/hostapd
index 11e6592..8079eb8 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/hostapd
+++ b/ap/project/zx297520v3/prj_vehicle_dc/fs/normal/rootfs/bin/hostapd
Binary files differ
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 ffc0046..3167c95 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 756de59..feae1e0 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 7c55bc9..2594931 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
@@ -20,6 +20,7 @@
#mount -t jffs2 mtd:userdata /mnt/userdata
mdev -s
fs_check "normal"
+nvro_tool check
ab_bootinfo
if [ $? -eq 1 ]; then
@@ -154,11 +155,11 @@
#echo 1 >/sys/dwc_usb/usbconfig/usbPlug
-zcat_mode=`nv get zcat_mode`
+ramdump_mode=`nv get ramdump_mode`
-if [ "$zcat_mode" == "CAPFS" ]; then
- if [ -e /proc/sys/zcatkern/log_save_mode ]; then
- echo 1 > /proc/sys/zcatkern/log_save_mode
+if [ "$ramdump_mode" == "CAPEMMC" ]; then
+ if [ -e /proc/sys/zcatkern/ramdump_save_mode ]; then
+ echo 1 > /proc/sys/zcatkern/ramdump_save_mode
fi
fi
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 b70fd1e..4c207ab 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 2b8916c..0ce775e 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 189df93..0aac030 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 58e26bd..893781b 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
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/hostapd_2_10.elf b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/hostapd_2_10.elf
index 11e6592..8079eb8 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/hostapd_2_10.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/hostapd_2_10.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_bip.elf b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_bip.elf
index ffc0046..3167c95 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_bip.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_bip.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf
index 189df93..0aac030 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_ipv6_slaac.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_ndp.elf b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_ndp.elf
index 58e26bd..893781b 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_ndp.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_ndp.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_volte_main.elf b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_volte_main.elf
index 7c55995..a1c601b 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_volte_main.elf
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/bin/220A1/elfs/normalelfs/zte_volte_main.elf
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/build/Makefile b/ap/project/zx297520v3/prj_vehicle_dc_ref/build/Makefile
index 00855a3..93ae173 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/build/Makefile
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/build/Makefile
@@ -2,7 +2,7 @@
include ../../chip_pubconf.mk
include config.mk
-export PRIVATE_KEY_PATH=$(TOPDIR_AP)/../tools/SignImage/test_key/mdl/private.k
+export PRIVATE_KEY_PATH=$(TOPDIR_AP)/../tools/SignTool/key/RSA_2048/private.k
help:
@cd $(TOPDIR_AP); ./build/build.sh help
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/build/config.mk b/ap/project/zx297520v3/prj_vehicle_dc_ref/build/config.mk
index acb9177..b2d24ca 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/build/config.mk
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/build/config.mk
@@ -117,3 +117,6 @@
#install time zone files
export CONFIG_TZDATA_MODULE=Asia
+
+export USE_NVRO_BACKUP := yes
+
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.busybox b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.busybox
index 71df975..869aaaa 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.busybox
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.busybox
@@ -435,7 +435,7 @@
# CONFIG_FEATURE_KILL_REMOVED is not set
CONFIG_FEATURE_KILL_DELAY=0
CONFIG_FEATURE_INIT_SCTTY=y
-CONFIG_FEATURE_INIT_SYSLOG=y
+# CONFIG_FEATURE_INIT_SYSLOG is not set
CONFIG_FEATURE_EXTRA_QUIET=y
CONFIG_FEATURE_INIT_COREDUMPS=y
# CONFIG_FEATURE_INITRD is not set
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.linux b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.linux
index db583e2..c0e0ea2 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.linux
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.linux
@@ -115,7 +115,7 @@
CONFIG_EMBEDDED=y
CONFIG_HAVE_PERF_EVENTS=y
CONFIG_PERF_USE_VMALLOC=y
-# CONFIG_IPC_SOCKET is not set
+#CONFIG_IPC_SOCKET=y
#
# Kernel Performance Events And Counters
#
@@ -2035,3 +2035,5 @@
CONFIG_VOLTE_DRV=y
CONFIG_AMR_DRV=y
CONFIG_VOICE_DRV=y
+CONFIG_FLAGS_UTILS=y
+# CONFIG_TEST_FLAGS_UTILS is not set
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config_app.mk b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config_app.mk
index 2a7a33d..7955989 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config_app.mk
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config_app.mk
@@ -1,5 +1,5 @@
-zte_app := busybox fs_check ab_bootinfo zte_log_agent e2fsprogs \
+zte_app := busybox fs_check ab_bootinfo nvro_tool zte_log_agent e2fsprogs \
zte_uicc_agt_svr \
dnsmasq \
Script \
@@ -16,7 +16,7 @@
#yes only when klocwork static analysis
ifneq ($(KW_SKIP),yes)
-zte_app += iproute2 iptables c-ares pppd
+zte_app += iproute2 iptables pppd
endif
ifneq ($(CONFIG_WIFI_FUNCTION)), )
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config_lib.mk b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config_lib.mk
index a0e19e4..8d005f8 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config_lib.mk
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config_lib.mk
@@ -1,13 +1,13 @@
zte_lib := libtinyalsa libsoftap \
-libatutils libatext libcpnv libamt libzte_dmapp libkey libdebug_info libflags binder
+libatutils libatext libamt libzte_dmapp libkey libdebug_info libflags binder
#yes only when klocwork static analysis
ifneq ($(KW_SKIP),yes)
zte_lib += zlib liblzma libsqlite libssl libnl libcurl libzcore
endif
-zte_lib += liblpa
+zte_lib += liblpa libcpnv
ifneq ($(CONFIG_WIFI_MODULE),)
zte_lib += libwlan_interface
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/hostapd b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/hostapd
index 11e6592..8079eb8 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/hostapd
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/hostapd
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_bip b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_bip
index ffc0046..3167c95 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_bip
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_bip
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_volte_main b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_volte_main
index 756de59..feae1e0 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_volte_main
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/bin/zte_volte_main
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/etc/rc b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/etc/rc
index 4b3b5d6..a4ed59d 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/etc/rc
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/etc/rc
@@ -20,6 +20,7 @@
#mount -t jffs2 mtd:userdata /mnt/userdata
mdev -s
fs_check "normal"
+nvro_tool check
ab_bootinfo
if [ $? -eq 1 ]; then
@@ -150,11 +151,11 @@
#echo 1 >/sys/dwc_usb/usbconfig/usbPlug
-zcat_mode=`nv get zcat_mode`
+ramdump_mode=`nv get ramdump_mode`
-if [ "$zcat_mode" == "CAPFS" ]; then
- if [ -e /proc/sys/zcatkern/log_save_mode ]; then
- echo 1 > /proc/sys/zcatkern/log_save_mode
+if [ "$ramdump_mode" == "CAPEMMC" ]; then
+ if [ -e /proc/sys/zcatkern/ramdump_save_mode ]; then
+ echo 1 > /proc/sys/zcatkern/ramdump_save_mode
fi
fi
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/lib/libnvram.so b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/lib/libnvram.so
index b70fd1e..4c207ab 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/lib/libnvram.so
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/lib/libnvram.so
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/lib/libsoft_timer.so b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/lib/libsoft_timer.so
index 2b8916c..0ce775e 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/lib/libsoft_timer.so
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/lib/libsoft_timer.so
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/sbin/zte_ipv6_slaac b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/sbin/zte_ipv6_slaac
index 189df93..0aac030 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/sbin/zte_ipv6_slaac
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/sbin/zte_ipv6_slaac
Binary files differ
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/sbin/zte_ndp b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/sbin/zte_ndp
index 58e26bd..893781b 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/sbin/zte_ndp
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/fs/normal/rootfs/sbin/zte_ndp
Binary files differ