Skip to content

Commit 31df3d2

Browse files
author
Cruz Monrreal
authored
Merge pull request #7242 from davidsaada/david_uniform_text_region
Rename text region in ARM linker file for a few NXP CPUs
2 parents fcfe6e1 + 714d025 commit 31df3d2

File tree

13 files changed

+26
-26
lines changed

13 files changed

+26
-26
lines changed

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/device/TOOLCHAIN_ARM_STD/MK66FN2M0xxx18.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@
9191
#define Heap_Size 0x0400
9292
#endif
9393

94-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
94+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
9595
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
9696
* (RESET,+FIRST)
9797
}
9898
ER_m_flash_config m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
9999
* (FlashConfig)
100100
}
101-
ER_m_text m_text_start m_text_size { ; load address = execution address
101+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
102102
* (InRoot$$Sections)
103103
.ANY (+RO)
104104
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/device/TOOLCHAIN_ARM_STD/MK82FN256xxx15.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
#define Heap_Size 0x0400
9191
#endif
9292

93-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
93+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
9494
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
9595
* (RESET,+FIRST)
9696
}
@@ -100,7 +100,7 @@ LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; loa
100100
ER_m_flash_config m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
101101
* (FlashConfig)
102102
}
103-
ER_m_text m_text_start m_text_size { ; load address = execution address
103+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
104104
* (InRoot$$Sections)
105105
.ANY (+RO)
106106
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/device/TOOLCHAIN_ARM_STD/MKL27Z64xxx4.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@
8484
#define Heap_Size 0x0400
8585
#endif
8686

87-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
87+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
8888
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
8989
* (RESET,+FIRST)
9090
}
9191
ER_m_flash_config m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
9292
* (FlashConfig)
9393
}
94-
ER_m_text m_text_start m_text_size { ; load address = execution address
94+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
9595
* (InRoot$$Sections)
9696
.ANY (+RO)
9797
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/device/TOOLCHAIN_ARM_STD/MKL43Z256xxx4.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@
8181
#define Heap_Size 0x0400
8282
#endif
8383

84-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
84+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
8585
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
8686
* (RESET,+FIRST)
8787
}
8888
ER_m_flash_config m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
8989
* (FlashConfig)
9090
}
91-
ER_m_text m_text_start m_text_size { ; load address = execution address
91+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
9292
* (InRoot$$Sections)
9393
.ANY (+RO)
9494
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/device/TOOLCHAIN_ARM_STD/MKL82Z128xxx7.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
#define Heap_Size 0x0400
9595
#endif
9696

97-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
97+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
9898
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
9999
* (RESET,+FIRST)
100100
}
@@ -104,7 +104,7 @@ LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; loa
104104
ER_m_flash_config m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
105105
* (FlashConfig)
106106
}
107-
ER_m_text m_text_start m_text_size { ; load address = execution address
107+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
108108
* (InRoot$$Sections)
109109
.ANY (+RO)
110110
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/device/TOOLCHAIN_ARM_STD/MKW24D512xxx5.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@
9090
#define Heap_Size 0x0400
9191
#endif
9292

93-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
93+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
9494
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
9595
* (RESET,+FIRST)
9696
}
9797
ER_m_flash_config m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
9898
* (FlashConfig)
9999
}
100-
ER_m_text m_text_start m_text_size { ; load address = execution address
100+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
101101
* (InRoot$$Sections)
102102
.ANY (+RO)
103103
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/device/TOOLCHAIN_ARM_STD/MKW41Z512xxx4.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@
7979
#define Heap_Size 0x0400
8080
#endif
8181

82-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
82+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
8383
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
8484
* (RESET,+FIRST)
8585
}
8686
ER_m_flash_config m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
8787
* (FlashConfig)
8888
}
89-
ER_m_text m_text_start m_text_size { ; load address = execution address
89+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
9090
* (InRoot$$Sections)
9191
.ANY (+RO)
9292
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/TARGET_MCU_K22F512/device/TOOLCHAIN_ARM_STD/MK22FN512xxx12.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@
8888
#define Heap_Size 0x0400
8989
#endif
9090

91-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
91+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
9292
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
9393
* (RESET,+FIRST)
9494
}
9595
ER_m_flash_config m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
9696
* (FlashConfig)
9797
}
98-
ER_m_text m_text_start m_text_size { ; load address = execution address
98+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
9999
* (InRoot$$Sections)
100100
.ANY (+RO)
101101
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K24F/TARGET_MCU_K24F1M/device/TOOLCHAIN_ARM_STD/MK24FN1M0xxx12.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@
8282
#define m_data_2_size 0x00030000
8383

8484

85-
LR_m_text m_interrupts_start m_text_size+m_interrupts_size+m_flash_config_size { ; load region size_region
85+
LR_IROM1 m_interrupts_start m_text_size+m_interrupts_size+m_flash_config_size { ; load region size_region
8686
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
8787
* (RESET,+FIRST)
8888
}
8989
ER_m_flash_config m_flash_config_start m_flash_config_size { ; load address = execution address
9090
* (FlashConfig)
9191
}
92-
ER_m_text m_text_start m_text_size { ; load address = execution address
92+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
9393
* (InRoot$$Sections)
9494
.ANY (+RO)
9595
}

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/device/TOOLCHAIN_ARM_STD/MK64FN1M0xxx12.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@
9595
#define Heap_Size 0x0400
9696
#endif
9797

98-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
98+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
9999
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
100100
* (RESET,+FIRST)
101101
}
102102
ER_m_flash_config m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
103103
* (FlashConfig)
104104
}
105-
ER_m_text m_text_start m_text_size { ; load address = execution address
105+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
106106
* (InRoot$$Sections)
107107
.ANY (+RO)
108108
}

targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC54114/device/TARGET_LPC54114_M4/TOOLCHAIN_ARM_STD/LPC54114J256_cm4.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@
8888
#define Heap_Size 0x0400
8989
#endif
9090

91-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
91+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
9292
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
9393
* (RESET,+FIRST)
9494
}
95-
ER_m_text m_text_start m_text_size { ; load address = execution address
95+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
9696
* (InRoot$$Sections)
9797
.ANY (+RO)
9898
}

targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC546XX/device/TOOLCHAIN_ARM_STD/LPC54628J512.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
#define Heap_Size 0x0400
8181
#endif
8282

83-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
83+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_start { ; load region size_region
8484
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
8585
* (RESET,+FIRST)
8686
}
87-
ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
87+
ER_IROM1 m_text_start FIXED m_text_size { ; load address = execution address
8888
* (InRoot$$Sections)
8989
.ANY (+RO)
9090
}

targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT1050/device/TOOLCHAIN_ARM_STD/MIMXRT1052xxxxx.sct

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
#define Heap_Size 0x0400
8181
#endif
8282

83-
LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_size { ; load region size_region
83+
LR_IROM1 m_interrupts_start m_text_start+m_text_size-m_interrupts_size { ; load region size_region
8484
VECTOR_ROM m_interrupts_start m_interrupts_size { ; load address = execution address
8585
* (RESET,+FIRST)
8686
}
87-
ER_m_text m_text_start m_text_size { ; load address = execution address
87+
ER_IROM1 m_text_start m_text_size { ; load address = execution address
8888
* (InRoot$$Sections)
8989
.ANY (+RO)
9090
}

0 commit comments

Comments
 (0)