Skip to content

Commit b6a2c7b

Browse files
0xc01700xc0170
authored
Merge pull request ARMmbed#10019 from deepikabhavnani/uarm_fix
uARM - Move heap region after IRAM1
2 parents d2e9fde + 36c7b2d commit b6a2c7b

File tree

17 files changed

+54
-54
lines changed

17 files changed

+54
-54
lines changed

‎targets/TARGET_NXP/TARGET_LPC11UXX/device/TOOLCHAIN_ARM_MICRO/TARGET_LPC11U24_301/LPC11U24.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4040
.ANY (+RW +ZI)
4141
}
4242

43-
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
44-
.ANY (USBRAM)
43+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
4544
}
4645

47-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
46+
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
47+
.ANY (USBRAM)
4848
}
4949

5050
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack

‎targets/TARGET_NXP/TARGET_LPC11UXX/device/TOOLCHAIN_ARM_MICRO/TARGET_LPC11U24_401/LPC11U24.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4040
.ANY (+RW +ZI)
4141
}
4242

43-
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
44-
.ANY (USBRAM)
43+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
4544
}
4645

47-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
46+
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
47+
.ANY (USBRAM)
4848
}
4949

5050
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack

‎targets/TARGET_NXP/TARGET_LPC11UXX/device/TOOLCHAIN_ARM_MICRO/TARGET_LPC11U34_421/LPC11U34.sct

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
3939
RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-VECTOR_SIZE) { ; RW data
4040
.ANY (+RW +ZI)
4141
}
42-
43-
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
44-
.ANY (USBRAM)
45-
}
4642

4743
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
4844
}
4945

46+
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
47+
.ANY (USBRAM)
48+
}
49+
5050
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack
5151
}
5252
}

‎targets/TARGET_NXP/TARGET_LPC11UXX/device/TOOLCHAIN_ARM_MICRO/TARGET_LPC11U35_401/LPC11U35.sct

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
3939
RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-VECTOR_SIZE) { ; RW data
4040
.ANY (+RW +ZI)
4141
}
42-
43-
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
44-
.ANY (USBRAM)
45-
}
4642

4743
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
4844
}
4945

46+
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
47+
.ANY (USBRAM)
48+
}
49+
5050
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack
5151
}
5252
}

‎targets/TARGET_NXP/TARGET_LPC11UXX/device/TOOLCHAIN_ARM_MICRO/TARGET_LPC11U37H_401/LPC11U37.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4040
.ANY (+RW +ZI)
4141
}
4242

43+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
44+
}
45+
4346
RW_IRAM2 0x20000000 0x800 { ; RW data, I/O Handler RAM
4447
.ANY (IOHANDLER_RAM)
4548
}
@@ -48,9 +51,6 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4851
.ANY (USBRAM)
4952
}
5053

51-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
52-
}
53-
5454
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack
5555
}
5656
}

‎targets/TARGET_NXP/TARGET_LPC11UXX/device/TOOLCHAIN_ARM_MICRO/TARGET_LPC11U37_501/LPC11U37.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4040
.ANY (+RW +ZI)
4141
}
4242

43+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
44+
}
45+
4346
RW_IRAM2 0x20000000 0x800 { ; RW data, I/O Handler RAM
4447
.ANY (IOHANDLER_RAM)
4548
}
@@ -48,9 +51,6 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4851
.ANY (USBRAM)
4952
}
5053

51-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
52-
}
53-
5454
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack
5555
}
5656
}

‎targets/TARGET_NXP/TARGET_LPC11UXX/device/TOOLCHAIN_ARM_MICRO/TARGET_MCU_LPC11U35_501/LPC11U35.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4040
.ANY (+RW +ZI)
4141
}
4242

43+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
44+
}
45+
4346
RW_IRAM2 0x20000000 0x800 { ; RW data, I/O Handler RAM
4447
.ANY (IOHANDLER_RAM)
4548
}
@@ -48,9 +51,6 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4851
.ANY (USBRAM)
4952
}
5053

51-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
52-
}
53-
5454
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack
5555
}
5656
}

‎targets/TARGET_NXP/TARGET_LPC11UXX/device/TOOLCHAIN_ARM_MICRO/TARGET_OC_MBUINO/LPC11U24.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4040
.ANY (+RW +ZI)
4141
}
4242

43-
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
44-
.ANY (USBRAM)
43+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
4544
}
4645

47-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
46+
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
47+
.ANY (USBRAM)
4848
}
4949

5050
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack

‎targets/TARGET_NXP/TARGET_LPC11XX_11CXX/device/TOOLCHAIN_ARM_MICRO/TARGET_LPC11CXX/LPC11C24.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4040
.ANY (+RW +ZI)
4141
}
4242

43+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
44+
}
45+
4346
RW_IRAM2 0x20004000 0x800 { ; RW data, USB RAM
4447
.ANY (USBRAM)
4548
}
4649

47-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
48-
}
49-
5050
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack
5151
}
5252
}

‎targets/TARGET_NXP/TARGET_LPC13XX/device/TOOLCHAIN_ARM_MICRO/LPC1347.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4040
.ANY (+RW +ZI)
4141
}
4242

43+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
44+
}
45+
4346
RW_IRAM2 0x20000000 0x800 { ; RW data, I/O Handler RAM
4447
.ANY (AHBSRAM0)
4548
}
@@ -48,9 +51,6 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4851
.ANY (AHBSRAM1)
4952
}
5053

51-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
52-
}
53-
5454
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack
5555
}
5656
}

‎targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_ARM_MICRO/LPC1768.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4949
.ANY (+RW +ZI)
5050
}
5151

52+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
53+
}
54+
5255
RW_IRAM2 0x2007C000 0x4000 { ; RW data, USB RAM
5356
.ANY (AHBSRAM0)
5457
}
@@ -61,9 +64,6 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
6164
.ANY (CANRAM)
6265
}
6366

64-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
65-
}
66-
6767
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack
6868
}
6969
}

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xG/device/TOOLCHAIN_ARM_MICRO/STM32F407xx.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
4343
.ANY (+RW +ZI)
4444
}
4545

46-
RW_IRAM2 MBED_RAM2_START MBED_RAM2_SIZE { ; CCM
47-
.ANY (CCMRAM)
46+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
4847
}
4948

50-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
49+
RW_IRAM2 MBED_RAM2_START MBED_RAM2_SIZE { ; CCM
50+
.ANY (CCMRAM)
5151
}
5252

5353
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/device/TOOLCHAIN_ARM_MICRO/stm32f439xx.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
7979
.ANY (+RW +ZI)
8080
}
8181

82-
RW_IRAM2 MBED_RAM2_START MBED_RAM2_SIZE {
83-
.ANY (+RW +ZI)
82+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
8483
}
8584

86-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
85+
RW_IRAM2 MBED_RAM2_START MBED_RAM2_SIZE {
86+
.ANY (+RW +ZI)
8787
}
8888

8989
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack

‎targets/TARGET_STM/TARGET_STM32L4/TARGET_MTS_DRAGONFLY_L471QG/device/TOOLCHAIN_ARM_MICRO/stm32l471xx.sct

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
7373
RW_IRAM1 MBED_RAM_START MBED_RAM_SIZE {
7474
.ANY (+RW +ZI)
7575
}
76-
77-
RW_IRAM2 (MBED_RAM2_START+VECTOR_SIZE) (MBED_RAM2_START-MBED_RAM2_SIZE) {
78-
.ANY (+RW +ZI)
79-
}
8076

8177
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
8278
}
8379

80+
RW_IRAM2 (MBED_RAM2_START+VECTOR_SIZE) (MBED_RAM2_START-MBED_RAM2_SIZE) {
81+
.ANY (+RW +ZI)
82+
}
83+
8484
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack
8585
}
8686
}

‎targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/device/TOOLCHAIN_ARM_MICRO/stm32l475xx.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
7979
.ANY (+RW +ZI)
8080
}
8181

82-
RW_IRAM2 (MBED_RAM2_START+VECTOR_SIZE) (MBED_RAM2_SIZE-VECTOR_SIZE) {
83-
.ANY (+RW +ZI)
82+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
8483
}
8584

86-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
85+
RW_IRAM2 (MBED_RAM2_START+VECTOR_SIZE) (MBED_RAM2_SIZE-VECTOR_SIZE) {
86+
.ANY (+RW +ZI)
8787
}
8888

8989
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack

‎targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/device/TOOLCHAIN_ARM_MICRO/stm32l476xx.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
7979
.ANY (+RW +ZI)
8080
}
8181

82-
RW_IRAM2 (MBED_RAM2_START+VECTOR_SIZE) (MBED_RAM2_SIZE-VECTOR_SIZE) {
83-
.ANY (+RW +ZI)
82+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
8483
}
8584

86-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
85+
RW_IRAM2 (MBED_RAM2_START+VECTOR_SIZE) (MBED_RAM2_SIZE-VECTOR_SIZE) {
86+
.ANY (+RW +ZI)
8787
}
8888

8989
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack

‎targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L486xG/device/TOOLCHAIN_ARM_MICRO/stm32l486xx.sct

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
7979
.ANY (+RW +ZI)
8080
}
8181

82-
RW_IRAM2 (MBED_RAM2_START+VECTOR_SIZE) (MBED_RAM2_SIZE-VECTOR_SIZE) {
83-
.ANY (+RW +ZI)
82+
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
8483
}
8584

86-
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
85+
RW_IRAM2 (MBED_RAM2_START+VECTOR_SIZE) (MBED_RAM2_SIZE-VECTOR_SIZE) {
86+
.ANY (+RW +ZI)
8787
}
8888

8989
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack

0 commit comments

Comments
 (0)