Merge "Revert "[Feature][T8TSK-274][syslog] syslog 4k/8k/16k buffer"" into GSW3.0-No-Connman
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