Merge "Revert "[Feature][T8TSK-274][syslog] syslog 4k/8k/16k buffer"" into GSW3.0-No-Connman
diff --git a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
index 7a28f31..68e4183 100755
--- a/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
+++ b/meta/meta-mediatek-mt2735/recipes-core/images/mtk-image-2735.bb
@@ -217,6 +217,15 @@
echo "${NATA_SERIAL_NUMBER}" >> ${IMAGE_ROOTFS}/sdcard/nata_serial.txt
}
ROOTFS_POSTPROCESS_COMMAND += " gen_feature_property;"
+
+set_tmpconfig() {
+ echo "x /tmp/ap_speech" >> ${IMAGE_ROOTFS}/usr/lib/tmpfiles.d/tmp.conf
+ echo "x /tmp/audio_ctrl_service" >> ${IMAGE_ROOTFS}/usr/lib/tmpfiles.d/tmp.conf
+ echo "x /tmp/libmodem-afe-ctrl" >> ${IMAGE_ROOTFS}/usr/lib/tmpfiles.d/tmp.conf
+ echo "x /tmp/tel_demo_single_proc.lock" >> ${IMAGE_ROOTFS}/usr/lib/tmpfiles.d/tmp.conf
+}
+ROOTFS_POSTPROCESS_COMMAND += " set_tmpconfig;"
+
#xf.li 2022.11.17 modify for userdata recover start
do_packdata() {
origin=$(pwd)
diff --git a/meta/meta-mediatek-mt2735/recipes-core/initial/files/lynq_data_recover b/meta/meta-mediatek-mt2735/recipes-core/initial/files/lynq_data_recover
index cc27802..97e16c4 100644
--- a/meta/meta-mediatek-mt2735/recipes-core/initial/files/lynq_data_recover
+++ b/meta/meta-mediatek-mt2735/recipes-core/initial/files/lynq_data_recover
@@ -84,8 +84,38 @@
format_ubi
}
-cd /
+recover_tmp_conf()
+{
+ FIND_FILE="/usr/lib/tmpfiles.d/tmp.conf"
+ FIND_STR="x /tmp/ap_speech"
+ if [ `grep -c "$FIND_STR" $FIND_FILE` -ne '0' ];then
+ echo "This str exit" > /dev/kmsg
+ else
+ echo "$FIND_STR" >> "$FIND_FILE"
+ fi
+ FIND_STR2="x /tmp/audio_ctrl_service"
+ if [ `grep -c "$FIND_STR2" $FIND_FILE` -ne '0' ];then
+ echo "This str2 exit" > /dev/kmsg
+ else
+ echo "$FIND_STR2" >> "$FIND_FILE"
+ fi
+ FIND_STR3="x /tmp/libmodem-afe-ctrl"
+ if [ `grep -c "$FIND_STR3" $FIND_FILE` -ne '0' ];then
+ echo "This str3 exit" > /dev/kmsg
+ else
+ echo "$FIND_STR3" >> "$FIND_FILE"
+ fi
+ FIND_STR4="x /tmp/tel_demo_single_proc.lock"
+ if [ `grep -c "$FIND_STR4" $FIND_FILE` -ne '0' ];then
+ echo "This str4 exit" > /dev/kmsg
+ else
+ echo "$FIND_STR4" >> "$FIND_FILE"
+ fi
+}
+
+cd /
+#recover some files start
echo "$TAG: Before recover radio_property" > /dev/kmsg
rm -rf /etc/config/.*.uci*
@@ -94,6 +124,8 @@
cp /data_backup/terminal_controller.conf /data/atsvc/terminal_controller.conf
echo "$TAG: After recover radio_property" > /dev/kmsg
+recover_tmp_conf
+#recover some files end
IFRO="$(cat /sys/class/ubi/ubi1/ro_mode)"
echo "$TAG the ro_mode:$IFRO" > /dev/kmsg
diff --git a/src/bsp/lk/platform/mt2735/drivers/rtc/rtc.c b/src/bsp/lk/platform/mt2735/drivers/rtc/rtc.c
index df570c8..3620798 100644
--- a/src/bsp/lk/platform/mt2735/drivers/rtc/rtc.c
+++ b/src/bsp/lk/platform/mt2735/drivers/rtc/rtc.c
@@ -888,8 +888,10 @@
check_mode_flag = true;
}
+ /*
RTC_LOG("%s#1 powerkey1 = 0x%x, powerkey2 = 0x%x, %s LPD\n", __func__, RTC_Read(RTC_POWERKEY1), RTC_Read(RTC_POWERKEY2)
, (RTC_Read(RTC_CON) & RTC_CON_LPSTA_RAW) ? "with" : "without" );
+ */
RTC_LOG("bbpu = 0x%x, con = 0x%x, osc32con = 0x%x, sec = 0x%x, yea = 0x%x\n", RTC_Read(RTC_BBPU), RTC_Read(RTC_CON), RTC_Read(RTC_OSC32CON)
, RTC_Read(RTC_AL_SEC), RTC_Read(RTC_AL_YEA));
@@ -900,7 +902,7 @@
}
} else {
/* normally HW reload is done in BROM but check again here */
- RTC_LOG("%s#2 powerkey1 = 0x%x, powerkey2 = 0x%x\n", __func__, RTC_Read(RTC_POWERKEY1), RTC_Read(RTC_POWERKEY2));
+ //RTC_LOG("%s#2 powerkey1 = 0x%x, powerkey2 = 0x%x\n", __func__, RTC_Read(RTC_POWERKEY1), RTC_Read(RTC_POWERKEY2));
RTC_Write(RTC_BBPU, RTC_Read(RTC_BBPU) | RTC_BBPU_KEY | RTC_BBPU_RELOAD);
if (!Write_trigger()) {
rtc_recovery_flow();
@@ -910,7 +912,7 @@
} else {
RTC_LOG("%s Writeif_unlock\n", __func__);
if (RTC_Read(RTC_POWERKEY1) != RTC_POWERKEY1_KEY || RTC_Read(RTC_POWERKEY2) != RTC_POWERKEY2_KEY) {
- RTC_LOG("%s#3 powerkey1 = 0x%x, powerkey2 = 0x%x\n", __func__, RTC_Read(RTC_POWERKEY1), RTC_Read(RTC_POWERKEY2));
+ //RTC_LOG("%s#3 powerkey1 = 0x%x, powerkey2 = 0x%x\n", __func__, RTC_Read(RTC_POWERKEY1), RTC_Read(RTC_POWERKEY2));
if (!rtc_first_boot_init(result)) {
rtc_recovery_flow();
}
diff --git a/src/bsp/trustzone/teeloader/mt2735/src/security/seclib.c b/src/bsp/trustzone/teeloader/mt2735/src/security/seclib.c
index 59419d8..8aae8a5 100644
--- a/src/bsp/trustzone/teeloader/mt2735/src/security/seclib.c
+++ b/src/bsp/trustzone/teeloader/mt2735/src/security/seclib.c
@@ -43,7 +43,7 @@
/**************************************************************************
* DEBUG FUNCTIONS
**************************************************************************/
-#define TEE_DEBUG
+//#define TEE_DEBUG
#ifdef TEE_DEBUG
#define DBG_MSG(str, ...) do {print(str, ##__VA_ARGS__);} while(0)
#define DBG_INFO(str, ...) do {print(str, ##__VA_ARGS__);} while(0)
@@ -97,4 +97,4 @@
int seclib_get_hwid_key(u8 *key, u32 key_size)
{
return seclib_get_key(SOC_DATA, key, key_size, 2);
-}
\ No newline at end of file
+}
diff --git a/src/bsp/trustzone/teeloader/mt2735/src/security/tz_emi_mpu.c b/src/bsp/trustzone/teeloader/mt2735/src/security/tz_emi_mpu.c
index d7e006b..9441d09 100644
--- a/src/bsp/trustzone/teeloader/mt2735/src/security/tz_emi_mpu.c
+++ b/src/bsp/trustzone/teeloader/mt2735/src/security/tz_emi_mpu.c
@@ -47,7 +47,7 @@
#define writel(b,addr) __raw_writel(b,addr)
#define IOMEM(reg) (reg)
-#define TEE_DEBUG
+//#define TEE_DEBUG
#ifdef TEE_DEBUG
#define DBG_MSG(str, ...) do {print(str, ##__VA_ARGS__);} while(0)
#define DBG_INFO(str, ...) do {print(str, ##__VA_ARGS__);} while(0)
diff --git a/src/bsp/trustzone/teeloader/mt2735/src/security/tz_init.c b/src/bsp/trustzone/teeloader/mt2735/src/security/tz_init.c
index fa9e374..b261180 100644
--- a/src/bsp/trustzone/teeloader/mt2735/src/security/tz_init.c
+++ b/src/bsp/trustzone/teeloader/mt2735/src/security/tz_init.c
@@ -53,7 +53,7 @@
**************************************************************************/
#define MOD "[TZ_INIT]"
-#define TEE_DEBUG
+//#define TEE_DEBUG
#ifdef TEE_DEBUG
#define DBG_MSG(str, ...) do {print(str, ##__VA_ARGS__);} while(0)
#define DBG_INFO(str, ...) do {print(str, ##__VA_ARGS__);} while(0)
diff --git a/src/bsp/trustzone/teeloader/mt2735/src/security/tz_sec_cfg.c b/src/bsp/trustzone/teeloader/mt2735/src/security/tz_sec_cfg.c
index dd49816..fc44ba0 100644
--- a/src/bsp/trustzone/teeloader/mt2735/src/security/tz_sec_cfg.c
+++ b/src/bsp/trustzone/teeloader/mt2735/src/security/tz_sec_cfg.c
@@ -39,7 +39,7 @@
#define MOD "[TZ_SEC_CFG]"
-#define TEE_DEBUG
+//#define TEE_DEBUG
#ifdef TEE_DEBUG
#define DBG_MSG(str, ...) do {print(str, ##__VA_ARGS__);} while(0)
#else
diff --git a/src/bsp/trustzone/teeloader/mt2735/src/security/tz_tbase.c b/src/bsp/trustzone/teeloader/mt2735/src/security/tz_tbase.c
index 8e14488..2311550 100644
--- a/src/bsp/trustzone/teeloader/mt2735/src/security/tz_tbase.c
+++ b/src/bsp/trustzone/teeloader/mt2735/src/security/tz_tbase.c
@@ -43,7 +43,7 @@
#define MOD "[TZ_TBASE]"
-#define TEE_DEBUG
+//#define TEE_DEBUG
#ifdef TEE_DEBUG
#define DBG_MSG(str, ...) do {print(str, ##__VA_ARGS__);} while(0)
#else