Skip to content

Commit

Permalink
add: csdk update a40a194f
Browse files Browse the repository at this point in the history
  • Loading branch information
wendal committed Dec 30, 2024
1 parent 762d053 commit 571330f
Show file tree
Hide file tree
Showing 37 changed files with 133 additions and 149 deletions.
13 changes: 5 additions & 8 deletions PLAT/core/ld/ec7xxxm_0h00_flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@ SECTIONS
Image$$LOAD_AP_PIRAM_UNCOMP_MSMB$$Length = SIZEOF(.load_ap_piram_uncomp_msmb);

// psram part3 for customer
.csdk_sect_ap_psram_p2_unued (NOLOAD): ALIGN(4)
{
. = ALIGN(4);
*(.csdk_sect_ap_psram_p2_unued.*)
. = ALIGN(4);
} >PSRAM_P2_AREA

.load_ap_psram_p2_ram : ALIGN(4)
{
Expand Down Expand Up @@ -499,14 +493,17 @@ SECTIONS
Image$$LOAD_AP_FPSRAM_P1_ZI$$Limit = .;
} >PSRAM_P1_AREA

.unload_voiceEng_buffer (.|PSRAM_PCACHE1_BASE) (NOLOAD):
. = ALIGN(4);
PROVIDE(end_ap_data = .|PSRAM_PCACHE1_BASE);
PROVIDE(start_up_buffer = up_buf_start);
.unload_voiceEng_buffer start_up_buffer (NOLOAD):
{
. = ALIGN(4);
*(.sect_voiceEngSharebuf.*)
. = ALIGN(4);
} >PSRAM_P1_AREA

.unload_up_buffer (.|PSRAM_PCACHE1_BASE) (NOLOAD):
.unload_up_buffer (up_buf_start+SIZEOF(.unload_voiceEng_buffer)) (NOLOAD):
{
. = ALIGN(1024);
*(.sect_catShareBuf_data.*)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,20 +360,20 @@ flash xip address(from both ap/cp view): 0x00800000---0x01000000
#define XP_DBGRESERVED_BASE_ADDR (0x08000f00)
#define IPC_SHAREDMEM_START_ADDR (0x08001000)

#ifdef OPEN_CPU_MODE

#if FEATURE_IMS_ENABLE
#ifdef FEATURE_IMS_USE_PSRAM_ENABLE
#define min_heap_size_threshold 0x57800//ims heap(250KB) will also use heap
#else
#define min_heap_size_threshold 0x5F000//ims heap(280KB) will also use heap
#endif
#if FEATURE_SUPPORT_APP_PCM_MEM_POOL//hal app mem pool 640*3+8align to 2K
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0xa086000 // should be 4 byte align
#else
#if defined(FEATURE_IMS_CC_ENABLE) || defined(FEATURE_AUDIO_ENABLE)
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0xa086000 // should be 4 byte align
#else
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0xa066000 // should be 4 byte align
#endif

#endif
Expand All @@ -382,23 +382,17 @@ flash xip address(from both ap/cp view): 0x00800000---0x01000000
#define min_heap_size_threshold 0x19000
#if defined (FEATURE_AMR_CP_ENABLE) && defined (FEATURE_VEM_CP_ENABLE)
#if FEATURE_SUPPORT_APP_PCM_MEM_POOL//hal app mem pool 640*3+8align to 2K
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a086000 // should be 4 byte align
#else
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a086000 // should be 4 byte align
#endif
#else
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a066000 // should be 4 byte align
#endif
#endif

#define UP_BUF_MAX_SIZE 0x3CA00//only upbuf size, need another 512B for other buf also in this region

#else
#define min_heap_size_threshold 0x20000
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define UP_BUF_MAX_SIZE 0x66D00//only upbuf size, need another 512B for other buf also in this region
#endif

#if (PSRAM_EXIST==1)
#define heap_boundary_psram PSRAM_END_ADDR
#define cust_min_heap_size_threshold (0x32000) // min heap size threshold is 200K.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,21 +379,20 @@ flash xip address(from both ap/cp view): 0x00800000---0x00c00000
#define IPC_SHAREDMEM_START_ADDR (0x08001000)


#ifdef OPEN_CPU_MODE
#if FEATURE_IMS_ENABLE
#ifdef FEATURE_IMS_USE_PSRAM_ENABLE
#define min_heap_size_threshold 0x57800//ims heap(250KB) will also use heap
#else
#define min_heap_size_threshold 0x5F000//ims heap(280KB) will also use heap
#endif
#if FEATURE_SUPPORT_APP_PCM_MEM_POOL//hal app mem pool 640*3+8align to 2K
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a086000 // should be 4 byte align
#else

#if defined(FEATURE_IMS_CC_ENABLE) || defined(FEATURE_AUDIO_ENABLE)
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0xa086000 // should be 4 byte align
#else
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0xa066000 // should be 4 byte align
#endif

#endif
Expand All @@ -402,23 +401,17 @@ flash xip address(from both ap/cp view): 0x00800000---0x00c00000
#define min_heap_size_threshold 0x19000
#if defined (FEATURE_AMR_CP_ENABLE) && defined (FEATURE_VEM_CP_ENABLE)
#if FEATURE_SUPPORT_APP_PCM_MEM_POOL//hal app mem pool 640*3+8align to 2K
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a086000 // should be 4 byte align
#else
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a086000 // should be 4 byte align
#endif
#else
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a066000 // should be 4 byte align
#endif
#endif

#define UP_BUF_MAX_SIZE 0x3CA00//only upbuf size, need another 512B for other buf also in this region

#else
#define min_heap_size_threshold 0x20000
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define UP_BUF_MAX_SIZE 0x66D00//only upbuf size, need another 512B for other buf also in this region

#endif

#if (PSRAM_EXIST==1)
#define heap_boundary_psram PSRAM_END_ADDR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -368,12 +368,12 @@ flash xip address(from both ap/cp view): 0x00800000---0x01000000
#define min_heap_size_threshold 0x5F000//ims heap(280KB) will also use heap
#endif
#if FEATURE_SUPPORT_APP_PCM_MEM_POOL//hal app mem pool 640*3+8align to 2K
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0xa086000 // should be 4 byte align
#else
#if defined(FEATURE_IMS_CC_ENABLE) || defined(FEATURE_AUDIO_ENABLE)
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0xa086000 // should be 4 byte align
#else
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0xa066000 // should be 4 byte align
#endif

#endif
Expand All @@ -382,12 +382,12 @@ flash xip address(from both ap/cp view): 0x00800000---0x01000000
#define min_heap_size_threshold 0x19000
#if defined (FEATURE_AMR_CP_ENABLE) && defined (FEATURE_VEM_CP_ENABLE)
#if FEATURE_SUPPORT_APP_PCM_MEM_POOL//hal app mem pool 640*3+8align to 2K
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a086000 // should be 4 byte align
#else
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a086000 // should be 4 byte align
#endif
#else
#define up_buf_start PSRAM_APMEM_END_ADDR // should be 4 byte align
#define up_buf_start 0x0a066000 // should be 4 byte align
#endif
#endif

Expand Down
62 changes: 31 additions & 31 deletions PLAT/libs/metas.json
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
{
"version": "1.0",
"update_time": "2024-12-27 18:33:43.370233",
"update_time": "2024-12-30 19:59:30.009037",
"libs": {
"ec718u": {
"sha1": "3a3adc74ce2e976c46ffafe0e511c3138036c853",
"size": 7246238
"sha1": "5010d6b0bf178ceb3b3b70cf1bf54f000fcb63b5",
"size": 7247292
},
"ec718u-ims": {
"sha1": "c688614477e02b3fe9a7c5976a3ca599ee05e80c",
"size": 7372481
"sha1": "b931d1071569ccbc73e128903936817814deb354",
"size": 7377323
},
"ec718um": {
"sha1": "c67ff21a0ac9ca1652169686755911221709b687",
"size": 7329760
"sha1": "5873bd8a7782a505d5d10c0bab9de4326b84bd17",
"size": 7327022
},
"ec718um-ims": {
"sha1": "c9d029d47869fa785161de39cf6d8553620cf77a",
"size": 7461894
"sha1": "7aa705ddc7037e67e6578cc650e2d235144953ee",
"size": 7463064
},
"ec718hm": {
"sha1": "a65534499e77259386fa117b6f8dcd4d2f8b3af8",
"size": 7321931
"sha1": "ef38d36836aae32b84e909081b51b333b62f6353",
"size": 7325246
},
"ec718hm-ims": {
"sha1": "6ab2a4278cc09b42705aa64f2fa99722e6dcd8ed",
"size": 7463254
"sha1": "cc4e6a2cc76a783a8f375bbc37ce5b7f7360e142",
"size": 7470712
},
"ec718pm": {
"sha1": "b39b539036b83bf0ea051e8ccc1e7ef830733658",
"size": 7325139
"sha1": "800feb6ee49b5a5f154fc0f6f53080a5744181fe",
"size": 7314106
},
"ec718pm-ims": {
"sha1": "09c4b8103d167b3923a663bf373c9a32fed4fd43",
"size": 7458043
"sha1": "d81966c92c1de01cf7959f2ade049893be4cb59a",
"size": 7458995
},
"ec716e": {
"sha1": "594a16ae591b4cf0c670f712eadd4356758f1556",
"size": 7141007
"sha1": "986ff61f00bb96b88d8bd51b71a0af8db771df4d",
"size": 7146530
},
"ec718p": {
"sha1": "1dcd2aa1ca6ef99d6a5bbc5cae1f752bb122d0db",
"size": 7242402
"sha1": "afe2271e544277447aabb223d4531c716dd6e4a2",
"size": 7247982
},
"ec718pv": {
"sha1": "043cc84a61f6ecb02d8baad87bff1e4de00887ab",
"size": 7389707
"sha1": "9f4a40162a4c8be38a8f26fe489f83b4294f55c8",
"size": 7394596
},
"ec718s": {
"sha1": "818639b42c10fccda81b2a06ba3ded02433743aa",
"size": 13627254
"sha1": "74cd6801ea9629915960d5eb25f3c31815133a77",
"size": 13616090
},
"ec718s-mid": {
"sha1": "681f1c24c210024f5b4cfb8e6a1c8cb3c56b098f",
"size": 13387754
"sha1": "3efab4e9f66b3fe5344d4ca24ecc3c09c0655791",
"size": 13383003
},
"ec716s": {
"sha1": "098a27f3f0d6f905d67232565a46485ae360a425",
"size": 13586721
"sha1": "4ed647c6ea25fdf5c45b768e67118836e801cb1f",
"size": 13593919
},
"ec716s-mid": {
"sha1": "b0c731a13f22015ac3f3cff24f1ac58a9ccebe3d",
"size": 13347998
"sha1": "094e76c5d85acb6b12c157d0b83b031c548bf420",
"size": 13343054
}
}
}
4 changes: 2 additions & 2 deletions PLAT/middleware/developed/debug/inc/dbversion.h
Original file line number Diff line number Diff line change
@@ -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, Fri Dec 27 18:31:43 2024
//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec 30 19:57:31 2024

#define DB_VERSION_UNIQ_ID "0x42d812cd"
#define DB_VERSION_UNIQ_ID "0x3ee47452"

#endif //_DB_VERSION_H
2 changes: 1 addition & 1 deletion PLAT/prebuild/metas.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "1.0",
"update_time": "2024-12-27 18:39:18.745314",
"update_time": "2024-12-30 20:04:52.502500",
"libs": {},
"prebuild": {
"sha1": "7f485f1f06171b4bc95466059adfce9df89995bb",
Expand Down
6 changes: 3 additions & 3 deletions PLAT/tools/ec716e/comdb.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
DbVersion
1717047824,100
80102041,100
<end>
BuildInfo
The current data file was built by the Application Ver. 2.2.81.216, Fri Dec 27 18:21:33 2024
The current data file was built by the Application Ver. 2.2.81.216, Mon Dec 30 19:49:35 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 ");
Expand Down Expand Up @@ -9683,5 +9683,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
plat_config,plat_config_fs_t
<end>
OptionalSegment
optional_sk_01,C215C6D3A78C744B38535DC8CA3FB7E871C8F995E2C7A4E0C5862A328052D3D3
optional_sk_01,A952B57CB7BE1370000940206C6ED2AF658BAD7F543C450F81902E62D88F48F0
<end>
4 changes: 2 additions & 2 deletions PLAT/tools/ec716e/dbversion.h
Original file line number Diff line number Diff line change
@@ -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, Fri Dec 27 18:21:34 2024
//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec 30 19:49:35 2024

#define DB_VERSION_UNIQ_ID "0x66581210"
#define DB_VERSION_UNIQ_ID "0x04c64299"

#endif //_DB_VERSION_H
6 changes: 3 additions & 3 deletions PLAT/tools/ec716s-mid/comdb.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
DbVersion
1121456845,100
1055159378,100
<end>
BuildInfo
The current data file was built by the Application Ver. 2.2.81.216, Fri Dec 27 18:31:43 2024
The current data file was built by the Application Ver. 2.2.81.216, Mon Dec 30 19:57:31 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 ");
Expand Down Expand Up @@ -8952,5 +8952,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
plat_config,plat_config_fs_t
<end>
OptionalSegment
optional_sk_01,DD7FAC749BA27D39A35CD7055AD6D88E0F44B6304A71EC66C0D422DAB2457314
optional_sk_01,A9F6A38E3B3B99318C230A0DD2F663798880C08F45766D4A764F6876F257716B
<end>
4 changes: 2 additions & 2 deletions PLAT/tools/ec716s-mid/dbversion.h
Original file line number Diff line number Diff line change
@@ -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, Fri Dec 27 18:31:43 2024
//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec 30 19:57:31 2024

#define DB_VERSION_UNIQ_ID "0x42d812cd"
#define DB_VERSION_UNIQ_ID "0x3ee47452"

#endif //_DB_VERSION_H
6 changes: 3 additions & 3 deletions PLAT/tools/ec716s/comdb.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
DbVersion
60126097,100
1976829701,100
<end>
BuildInfo
The current data file was built by the Application Ver. 2.2.81.216, Fri Dec 27 18:29:27 2024
The current data file was built by the Application Ver. 2.2.81.216, Mon Dec 30 19:55:25 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 ");
Expand Down Expand Up @@ -8975,5 +8975,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
plat_config,plat_config_fs_t
<end>
OptionalSegment
optional_sk_01,916088866D4F39616D95F78EF890BF39C8A76797F988ACAA1B0C1FAA8771AE1B
optional_sk_01,3FC236A4CBF3A14B42088F39EBBBB78E28B790B7BFC23617A74686014BF06843
<end>
4 changes: 2 additions & 2 deletions PLAT/tools/ec716s/dbversion.h
Original file line number Diff line number Diff line change
@@ -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, Fri Dec 27 18:29:28 2024
//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Mon Dec 30 19:55:25 2024

#define DB_VERSION_UNIQ_ID "0x03957391"
#define DB_VERSION_UNIQ_ID "0x75d40705"

#endif //_DB_VERSION_H
6 changes: 3 additions & 3 deletions PLAT/tools/ec718hm-ims/comdb.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
DbVersion
1634145156,100
487340154,100
<end>
BuildInfo
The current data file was built by the Application Ver. 2.2.81.216, Fri Dec 27 18:18:02 2024
The current data file was built by the Application Ver. 2.2.81.216, Mon Dec 30 19:45:36 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 ");
Expand Down Expand Up @@ -17623,5 +17623,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam
plat_config,plat_config_fs_t
<end>
OptionalSegment
optional_sk_01,BE1A7F4847B9949D4075AA9C4584613B35889827107935ECCB562C47CDFBA5B0
optional_sk_01,7AFFC0343F56ED130A6FE46DB34876E715360EED1CD096E5B8D44F4B6F2CBD6D
<end>
Loading

0 comments on commit 571330f

Please sign in to comment.