Pārlūkot izejas kodu

Merge pull request #3950 from PYGC/dev

[bsp] fix mm32 iar icf bugs
Bernard Xiong 4 gadi atpakaļ
vecāks
revīzija
2f7c5f06a9

+ 2 - 4
bsp/mm32l07x/drivers/linker_scripts/link.icf

@@ -14,8 +14,8 @@ define symbol __ICFEDIT_size_proc_stack__ = 0x0;
 define symbol __ICFEDIT_size_heap__       = 0x0800;
 define symbol __ICFEDIT_size_heap__       = 0x0800;
 /**** End of ICF editor section. ###ICF###*/
 /**** End of ICF editor section. ###ICF###*/
 define memory mem with size = 4G;
 define memory mem with size = 4G;
-define region IROM_region   =   mem:[from __ICFEDIT_region_IROM1_start__ to __ICFEDIT_region_IROM_end__];
-define region IRAM_region   =   mem:[from __ICFEDIT_region_IRAM1_start__ to __ICFEDIT_region_IRAM_end__];
+define region IROM_region   =   mem:[from __ICFEDIT_region_IROM_start__ to __ICFEDIT_region_IROM_end__];
+define region IRAM_region   =   mem:[from __ICFEDIT_region_IRAM_start__ to __ICFEDIT_region_IRAM_end__];
 define block CSTACK     with alignment = 8, size = __ICFEDIT_size_cstack__     { };
 define block CSTACK     with alignment = 8, size = __ICFEDIT_size_cstack__     { };
 define block PROC_STACK with alignment = 8, size = __ICFEDIT_size_proc_stack__ { };
 define block PROC_STACK with alignment = 8, size = __ICFEDIT_size_proc_stack__ { };
 define block HEAP       with alignment = 8, size = __ICFEDIT_size_heap__       { };
 define block HEAP       with alignment = 8, size = __ICFEDIT_size_heap__       { };
@@ -31,6 +31,4 @@ if (isdefinedsymbol(__USE_DLIB_PERTHREAD))
 place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
 place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
 
 
 place in IROM_region  { readonly };
 place in IROM_region  { readonly };
-place in EROM_region  { readonly section application_specific_ro };
 place in IRAM_region  { readwrite, block CSTACK, block PROC_STACK, block HEAP };
 place in IRAM_region  { readwrite, block CSTACK, block PROC_STACK, block HEAP };
-place in ERAM_region  { readwrite section application_specific_rw };

+ 2 - 4
bsp/mm32l3xx/drivers/linker_scripts/link.icf

@@ -14,8 +14,8 @@ define symbol __ICFEDIT_size_proc_stack__ = 0x0;
 define symbol __ICFEDIT_size_heap__       = 0x0800;
 define symbol __ICFEDIT_size_heap__       = 0x0800;
 /**** End of ICF editor section. ###ICF###*/
 /**** End of ICF editor section. ###ICF###*/
 define memory mem with size = 4G;
 define memory mem with size = 4G;
-define region IROM_region   =   mem:[from __ICFEDIT_region_IROM1_start__ to __ICFEDIT_region_IROM_end__];
-define region IRAM_region   =   mem:[from __ICFEDIT_region_IRAM1_start__ to __ICFEDIT_region_IRAM_end__];
+define region IROM_region   =   mem:[from __ICFEDIT_region_IROM_start__ to __ICFEDIT_region_IROM_end__];
+define region IRAM_region   =   mem:[from __ICFEDIT_region_IRAM_start__ to __ICFEDIT_region_IRAM_end__];
 define block CSTACK     with alignment = 8, size = __ICFEDIT_size_cstack__     { };
 define block CSTACK     with alignment = 8, size = __ICFEDIT_size_cstack__     { };
 define block PROC_STACK with alignment = 8, size = __ICFEDIT_size_proc_stack__ { };
 define block PROC_STACK with alignment = 8, size = __ICFEDIT_size_proc_stack__ { };
 define block HEAP       with alignment = 8, size = __ICFEDIT_size_heap__       { };
 define block HEAP       with alignment = 8, size = __ICFEDIT_size_heap__       { };
@@ -31,6 +31,4 @@ if (isdefinedsymbol(__USE_DLIB_PERTHREAD))
 place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
 place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
 
 
 place in IROM_region  { readonly };
 place in IROM_region  { readonly };
-place in EROM_region  { readonly section application_specific_ro };
 place in IRAM_region  { readwrite, block CSTACK, block PROC_STACK, block HEAP };
 place in IRAM_region  { readwrite, block CSTACK, block PROC_STACK, block HEAP };
-place in ERAM_region  { readwrite section application_specific_rw };