Merge branch 'master' of https://gitee.com/openLuat/luatos-soc-2024

openLuat · Dec 11, 2024 · 2bd675a · 2bd675a
2 parents 5dedc7b + f3a3d7d
commit 2bd675a
Show file tree

Hide file tree

Showing 34 changed files with 112 additions and 109 deletions.
diff --git a/PLAT/libs/metas.json b/PLAT/libs/metas.json
@@ -1,66 +1,66 @@
 {
   "version": "1.0",
-  "update_time": "2024-12-09 19:10:00.635494",
+  "update_time": "2024-12-11 11:36:18.070856",
   "libs": {
     "ec718u": {
-      "sha1": "3edd33aeef5ac992982137b6aca394cd2a1393ce",
-      "size": 7208439
+      "sha1": "06b5103831d312ddc15fda5b23ce27c01467dc9a",
+      "size": 7204375
     },
     "ec718u-ims": {
-      "sha1": "6d79af416261bda81629c3bc8c1a9d9b0d619fb8",
-      "size": 7332334
+      "sha1": "5e71ee16bcf8faf8d7141421fe6239606999e5a7",
+      "size": 7335341
     },
     "ec718um": {
-      "sha1": "7ea7779c5bcd7cef86ba2a5f51204e008613ed7d",
-      "size": 7291471
+      "sha1": "c1f508b07644ad5dc9eb155ecd1c3333a0a4e7d1",
+      "size": 7291813
     },
     "ec718um-ims": {
-      "sha1": "e162c04ce0840dc59a378edbd7a69245cdd357e9",
-      "size": 7420595
+      "sha1": "058f84111beb0a1530b5f24154480486155e5da2",
+      "size": 7415589
     },
     "ec718hm": {
-      "sha1": "c49ca7df04722e4637e945e7f9813b542e35cab1",
-      "size": 7277313
+      "sha1": "6da2222ce5061aba45b9efa43861176d778f8a0a",
+      "size": 7278060
     },
     "ec718hm-ims": {
-      "sha1": "b8c4d8a83e355b14b86f4606183ded98f512c196",
-      "size": 7413726
+      "sha1": "82b98a349df424fbf7774bfb48726188818e45db",
+      "size": 7414872
     },
     "ec718pm": {
-      "sha1": "110d4dc9656ec5741794b216dcfb2f5465f58af4",
-      "size": 7274526
+      "sha1": "d97c327c4507ec9b915f66cc5ee1ee8aae7d5ac0",
+      "size": 7270963
     },
     "ec718pm-ims": {
-      "sha1": "9b635225e12e804bd2d5980a128ea3d81b97b6aa",
-      "size": 7433642
+      "sha1": "8bf9910517b88531a10d0bd07342802e56cf5a0a",
+      "size": 7436454
     },
     "ec716e": {
-      "sha1": "9576aeccc284ace823f8bea7d04e4b33e9d516ca",
-      "size": 7120611
+      "sha1": "e8923e391a35d067500db1213218ae0c2d7b61f0",
+      "size": 7118776
     },
     "ec718p": {
-      "sha1": "cfc30fd5614f2d0ad7132000c48462a52dd69341",
-      "size": 7220129
+      "sha1": "0a980bca5d4dd2923c2e7ecbef913e4abcba4288",
+      "size": 7225868
     },
     "ec718pv": {
-      "sha1": "353bb4c6f4188a220754e4def670a76ae8aa943d",
-      "size": 7353474
+      "sha1": "5e9145c11fc2a8d373e5829da1d1451acfffaa31",
+      "size": 7351849
     },
     "ec718s": {
-      "sha1": "ebac5db901ca0d1ae0902f275a1d8c709cccec6e",
-      "size": 13580654
+      "sha1": "d8f40c0530dc4764d0ccf46eafb41838871893a3",
+      "size": 13575901
     },
     "ec718s-mid": {
-      "sha1": "2d4cb58b071af6a2c0431c93b1e971e56ecdb7c4",
-      "size": 13336684
+      "sha1": "ef2eb341b53397950a5897a682ad199ab66ec41c",
+      "size": 13336569
     },
     "ec716s": {
-      "sha1": "b9f8aed8a3d5e87c3e7f1f22cad857c5b7529cb9",
-      "size": 13534392
+      "sha1": "b1c811703384b2c0591c3e571ac602a8f749fe14",
+      "size": 13531857
     },
     "ec716s-mid": {
-      "sha1": "9e8d9d57cc1b53aca14ff395ee2b547263a8d63b",
-      "size": 13292640
+      "sha1": "6cbbb227fa0cd518cfb062107815930f564d668f",
+      "size": 13296352
     }
   }
 }
diff --git a/PLAT/middleware/developed/debug/inc/dbversion.h b/PLAT/middleware/developed/debug/inc/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 19:07:53 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:34:20 2024
 
-#define DB_VERSION_UNIQ_ID "0x5d42622a"
+#define DB_VERSION_UNIQ_ID "0x00e3776c"
 
 #endif //_DB_VERSION_H
diff --git a/PLAT/os/freertos/src/heap_6_psram.c b/PLAT/os/freertos/src/heap_6_psram.c
@@ -1,5 +1,7 @@
 
 #include "FreeRTOS.h"
+#if (defined __USER_CODE__) && (defined TYPE_EC718M)
+#else
 #if defined (PSRAM_FEATURE_ENABLE) && (PSRAM_EXIST==1)
 #if( configSUPPORT_DYNAMIC_ALLOC_HEAP == 6 )
 #include <string.h>//add for memset
@@ -343,3 +345,4 @@ FREERTOS_HEAP6_TEXT_SECTION void GetPSRAMHeapInfo(uint32_t *total, uint32_t *all
 #endif
 #endif
 
+#endif

diff --git a/PLAT/prebuild/metas.json b/PLAT/prebuild/metas.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0",
-  "update_time": "2024-12-09 19:15:36.109059",
+  "update_time": "2024-12-11 11:41:37.237384",
   "libs": {},
   "prebuild": {
     "sha1": "ea7f47042ec3d6bfe36a0a753d3dcc3b9e458edd",

diff --git a/PLAT/tools/ec716e/comdb.txt b/PLAT/tools/ec716e/comdb.txt
@@ -1,8 +1,8 @@
 DbVersion
-1009976907,100
+2041202974,100
 <end>
 BuildInfo
-The current data file was built by the Application Ver. 2.2.81.216, Mon Dec  9 18:59:18 2024
+The current data file was built by the Application Ver. 2.2.81.216, Wed Dec 11 11:26:58 2024
 <end>
 EnumVals
 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_1,P_ERROR,swLogPrintf("Incorrect ICS stage ( %d ) for new euArfcn arranged for ICS MEAS ");
@@ -9661,5 +9661,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
 plat_config,plat_config_fs_t
 <end>
 OptionalSegment
-optional_sk_01,F2816A76DB77591A9BB96FCD198C0218F5DBEB0EE393C04F9194767AF508702B
+optional_sk_01,42D13A180F0FD78FEC3F88CDE3299FED43D8946E2922BFA1F0F7E91492B51672
 <end>
diff --git a/PLAT/tools/ec716e/dbversion.h b/PLAT/tools/ec716e/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 18:59:19 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:26:58 2024
 
-#define DB_VERSION_UNIQ_ID "0x3c33064b"
+#define DB_VERSION_UNIQ_ID "0x79aa491e"
 
 #endif //_DB_VERSION_H
diff --git a/PLAT/tools/ec716s-mid/comdb.txt b/PLAT/tools/ec716s-mid/comdb.txt
@@ -1,8 +1,8 @@
 DbVersion
-1564631594,100
+14907244,100
 <end>
 BuildInfo
-The current data file was built by the Application Ver. 2.2.81.216, Mon Dec  9 19:07:53 2024
+The current data file was built by the Application Ver. 2.2.81.216, Wed Dec 11 11:34:20 2024
 <end>
 EnumVals
 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_1,P_ERROR,swLogPrintf("Incorrect ICS stage ( %d ) for new euArfcn arranged for ICS MEAS ");
@@ -8929,5 +8929,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
 plat_config,plat_config_fs_t
 <end>
 OptionalSegment
-optional_sk_01,6683AD21DB57F7045F90A1A91FC38FEEF64980B347C8C7B19B7E3FECEFF9184D
+optional_sk_01,5D56389913A8CDF17487ED63470A869F8BC89D6964536A7963C8A0B18CFC6927
 <end>
diff --git a/PLAT/tools/ec716s-mid/dbversion.h b/PLAT/tools/ec716s-mid/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 19:07:53 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:34:20 2024
 
-#define DB_VERSION_UNIQ_ID "0x5d42622a"
+#define DB_VERSION_UNIQ_ID "0x00e3776c"
 
 #endif //_DB_VERSION_H
diff --git a/PLAT/tools/ec716s/comdb.txt b/PLAT/tools/ec716s/comdb.txt
@@ -1,8 +1,8 @@
 DbVersion
-134708800,100
+1042111867,100
 <end>
 BuildInfo
-The current data file was built by the Application Ver. 2.2.81.216, Mon Dec  9 19:05:45 2024
+The current data file was built by the Application Ver. 2.2.81.216, Wed Dec 11 11:32:34 2024
 <end>
 EnumVals
 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_1,P_ERROR,swLogPrintf("Incorrect ICS stage ( %d ) for new euArfcn arranged for ICS MEAS ");
@@ -8952,5 +8952,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
 plat_config,plat_config_fs_t
 <end>
 OptionalSegment
-optional_sk_01,8CB30E65131309E7C1F1B524DA2004BB2477360A5D3D03E93B3B4EFA8CEF6C25
+optional_sk_01,3B93615F2C0CE0FF61AA156569A59A6C4DA574971BE3DB29E52241FF3F73D28D
 <end>
diff --git a/PLAT/tools/ec716s/dbversion.h b/PLAT/tools/ec716s/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 19:05:46 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:32:35 2024
 
-#define DB_VERSION_UNIQ_ID "0x08077e40"
+#define DB_VERSION_UNIQ_ID "0x3e1d5d7b"
 
 #endif //_DB_VERSION_H
diff --git a/PLAT/tools/ec718hm-ims/comdb.txt b/PLAT/tools/ec718hm-ims/comdb.txt
@@ -1,8 +1,8 @@
 DbVersion
-967838190,100
+299045879,100
 <end>
 BuildInfo
-The current data file was built by the Application Ver. 2.2.81.216, Mon Dec  9 18:55:37 2024
+The current data file was built by the Application Ver. 2.2.81.216, Wed Dec 11 11:25:09 2024
 <end>
 EnumVals
 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_0,P_INFO,swLogPrintf("ICS MEAS of euArfcn %d will be started ");
@@ -17597,5 +17597,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
 plat_config,plat_config_fs_t
 <end>
 OptionalSegment
-optional_sk_01,B630A80442924882D5C166F15C70D1301694AA70967A1ED8FD7D64C2580B0B9A
+optional_sk_01,8C5DA912DAA3D917DCBD0BA5DF0EBF894F84A9C2E69A32E66A80E6C42C361B2D
 <end>
diff --git a/PLAT/tools/ec718hm-ims/dbversion.h b/PLAT/tools/ec718hm-ims/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 18:55:38 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:25:10 2024
 
-#define DB_VERSION_UNIQ_ID "0x39b009ee"
+#define DB_VERSION_UNIQ_ID "0x11d313f7"
 
 #endif //_DB_VERSION_H
diff --git a/PLAT/tools/ec718hm/comdb.txt b/PLAT/tools/ec718hm/comdb.txt
@@ -1,8 +1,8 @@
 DbVersion
-378541572,100
+850031938,100
 <end>
 BuildInfo
-The current data file was built by the Application Ver. 2.2.81.216, Mon Dec  9 18:54:54 2024
+The current data file was built by the Application Ver. 2.2.81.216, Wed Dec 11 11:24:32 2024
 <end>
 EnumVals
 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_0,P_INFO,swLogPrintf("ICS MEAS of euArfcn %d will be started ");
@@ -9945,5 +9945,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
 plat_config,plat_config_fs_t
 <end>
 OptionalSegment
-optional_sk_01,376BB01C44AD08C23FA9D0D7EC872415C27306D4847FD4605EDABEFFF697B80E
+optional_sk_01,8106B22AEC4EE4D7C414067542C92B869DD79DA4DDD71CF5343CEF13C37954F6
 <end>
diff --git a/PLAT/tools/ec718hm/dbversion.h b/PLAT/tools/ec718hm/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 18:54:55 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:24:32 2024
 
-#define DB_VERSION_UNIQ_ID "0x16901604"
+#define DB_VERSION_UNIQ_ID "0x32aa7542"
 
 #endif //_DB_VERSION_H
diff --git a/PLAT/tools/ec718p/comdb.txt b/PLAT/tools/ec718p/comdb.txt
@@ -1,8 +1,8 @@
 DbVersion
-1729649577,100
+607412154,100
 <end>
 BuildInfo
-The current data file was built by the Application Ver. 2.2.81.216, Mon Dec  9 19:00:02 2024
+The current data file was built by the Application Ver. 2.2.81.216, Wed Dec 11 11:27:31 2024
 <end>
 EnumVals
 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_0,P_INFO,swLogPrintf("ICS MEAS of euArfcn %d will be started ");
@@ -9931,5 +9931,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
 plat_config,plat_config_fs_t
 <end>
 OptionalSegment
-optional_sk_01,21B65E691EE3EA05446DE539334AD5D2D89FFBB356FAFD99089B363289C7D4AB
+optional_sk_01,0F12D8EBDCA9531EAA04D7A652ACD919E69B26CA003C655EA32931E79DD3C247
 <end>
diff --git a/PLAT/tools/ec718p/dbversion.h b/PLAT/tools/ec718p/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 19:00:02 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:27:32 2024
 
-#define DB_VERSION_UNIQ_ID "0x67185ba9"
+#define DB_VERSION_UNIQ_ID "0x24345fba"
 
 #endif //_DB_VERSION_H
diff --git a/PLAT/tools/ec718pm-ims/comdb.txt b/PLAT/tools/ec718pm-ims/comdb.txt
@@ -1,8 +1,8 @@
 DbVersion
-2044686447,100
+755835391,100
 <end>
 BuildInfo
-The current data file was built by the Application Ver. 2.2.81.216, Mon Dec  9 18:58:13 2024
+The current data file was built by the Application Ver. 2.2.81.216, Wed Dec 11 11:26:22 2024
 <end>
 EnumVals
 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_0,P_INFO,swLogPrintf("ICS MEAS of euArfcn %d will be started ");
@@ -17597,5 +17597,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
 plat_config,plat_config_fs_t
 <end>
 OptionalSegment
-optional_sk_01,DF282F7BB63F7B912C5CD19FD49C07292080B69406D8DD456F2E4EE9864142BE
+optional_sk_01,8751740A3D41CBBD780EC3CF9F7A7CB0C7BD20A61630767A07DE06FB1C223C3A
 <end>
diff --git a/PLAT/tools/ec718pm-ims/dbversion.h b/PLAT/tools/ec718pm-ims/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 18:58:13 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:26:23 2024
 
-#define DB_VERSION_UNIQ_ID "0x79df706f"
+#define DB_VERSION_UNIQ_ID "0x2d0d21ff"
 
 #endif //_DB_VERSION_H
diff --git a/PLAT/tools/ec718pm/comdb.txt b/PLAT/tools/ec718pm/comdb.txt
@@ -1,8 +1,8 @@
 DbVersion
-214202204,100
+1464078073,100
 <end>
 BuildInfo
-The current data file was built by the Application Ver. 2.2.81.216, Mon Dec  9 18:56:44 2024
+The current data file was built by the Application Ver. 2.2.81.216, Wed Dec 11 11:25:45 2024
 <end>
 EnumVals
 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_0,P_INFO,swLogPrintf("ICS MEAS of euArfcn %d will be started ");
@@ -9945,5 +9945,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
 plat_config,plat_config_fs_t
 <end>
 OptionalSegment
-optional_sk_01,61DCC222247171E5195B5FD39C2F6AC3CDC72A6537D9D661923C30FA558F4FF0
+optional_sk_01,573626871B9EA41FD07A2355F9B4EEE83DDE06EC2D0C84E1DA7607DB3612C03C
 <end>
diff --git a/PLAT/tools/ec718pm/dbversion.h b/PLAT/tools/ec718pm/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 18:56:44 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:25:45 2024
 
-#define DB_VERSION_UNIQ_ID "0x0cc4775c"
+#define DB_VERSION_UNIQ_ID "0x57440ef9"
 
 #endif //_DB_VERSION_H
diff --git a/PLAT/tools/ec718pv/comdb.txt b/PLAT/tools/ec718pv/comdb.txt
@@ -1,8 +1,8 @@
 DbVersion
-709708357,100
+1896162975,100
 <end>
 BuildInfo
-The current data file was built by the Application Ver. 2.2.81.216, Mon Dec  9 19:00:47 2024
+The current data file was built by the Application Ver. 2.2.81.216, Wed Dec 11 11:28:07 2024
 <end>
 EnumVals
 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_0,P_INFO,swLogPrintf("ICS MEAS of euArfcn %d will be started ");
@@ -17601,5 +17601,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
 plat_config,plat_config_fs_t
 <end>
 OptionalSegment
-optional_sk_01,4639F3248A0857BFF4D120158CAEA7E37764781B4FF81E0CE8C361C61E959D76
+optional_sk_01,648E599C3A34700AB2D443054D22482811D3D7E9934577C15BCF9AA5D344A91C
 <end>
diff --git a/PLAT/tools/ec718pv/dbversion.h b/PLAT/tools/ec718pv/dbversion.h
@@ -1,8 +1,8 @@
 #if !defined _DB_VERSION_H 
 #define _DB_VERSION_H
 
-//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec  9 19:00:48 2024
+//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Wed Dec 11 11:28:08 2024
 
-#define DB_VERSION_UNIQ_ID "0x2a4d4a45"
+#define DB_VERSION_UNIQ_ID "0x7105269f"
 
 #endif //_DB_VERSION_H