Skip to content

Commit 58c8d62

Browse files
committed
ARCH_PRO: Remove uARM tooolchain support
* Update scatter file for the ARM toolchain to use 2 region memory model. The scatter file changes affect the following boards: * LPC1768, ARCH_PRO, UBLOX_C027, XBED_LPC1768 (LPC1768.sct) * Remove the TOOLCHAIN_ARM_MICRO directory. * Remove release_version as not necessary and as the target can also run Mbed OS 6. * Remove uARM toolchain in the list of supported toolchains for the target. * Indicate that the target supports the small ARM toolchain C library.
1 parent ecf4008 commit 58c8d62

File tree

4 files changed

+26
-305
lines changed

4 files changed

+26
-305
lines changed

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

Lines changed: 0 additions & 69 deletions
This file was deleted.

targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_ARM_MICRO/startup_LPC17xx.S

Lines changed: 0 additions & 220 deletions
This file was deleted.

targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_ARM_STD/LPC1768.sct

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,65 @@
11
#! armcc -E
22

33
#if !defined(MBED_APP_START)
4-
#define MBED_APP_START 0x00000000
4+
#define MBED_APP_START 0x00000000
55
#endif
66

7+
; 32K flash
78
#if !defined(MBED_APP_SIZE)
8-
#define MBED_APP_SIZE 0x80000
9+
#define MBED_APP_SIZE 0x80000
910
#endif
1011

12+
; 4KB
1113
#if !defined(MBED_RAM_START)
12-
#define MBED_RAM_START 0x10000000
14+
#define MBED_RAM_START 0x10000000
1315
#endif
1416

1517
#if !defined(MBED_RAM_SIZE)
16-
#define MBED_RAM_SIZE 0x00008000
18+
#define MBED_RAM_SIZE 0x00008000
1719
#endif
1820

21+
1922
#if !defined(MBED_BOOT_STACK_SIZE)
20-
#define MBED_BOOT_STACK_SIZE 0x400
23+
#define MBED_BOOT_STACK_SIZE 0x400
2124
#endif
2225

2326
; 8_byte_aligned(49 vect * 4 bytes) = 8_byte_aligned(0xC4) = 0xC8
2427
#define VECTOR_SIZE 0xC8
2528

2629
#define RAM_FIXED_SIZE (MBED_BOOT_STACK_SIZE+VECTOR_SIZE+0x20)
2730

28-
LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
29-
ER_IROM0 MBED_APP_START 0x2FC { ; load address = execution address
31+
LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
32+
33+
ER_IROM0 MBED_APP_START 0x2FC { ; load address = execution address
3034
*.o (RESET, +First)
3135
.ANY (+RO)
3236
}
33-
ER_CRP (MBED_APP_START + 0x2FC) FIXED 4 {
37+
38+
ER_CRP (MBED_APP_START + 0x2FC) FIXED 4 {
3439
*.o (.CRPSection)
3540
}
41+
3642
ER_IROM1 (MBED_APP_START + (0x2FC + 4)) FIXED (MBED_APP_SIZE - (0x2FC + 4)) {
37-
*(InRoot$$Sections)
38-
.ANY (+RO)
43+
*(InRoot$$Sections)
44+
.ANY (+RO)
3945
}
40-
; 8_byte_aligned(49 vect * 4 bytes) = 8_byte_aligned(0xC4) = 0xC8
46+
4147
; 32KB (RAM size) - 0xC8 (NIVT) - 32 (topmost 32 bytes used by IAP functions) = 0x7F18
4248
RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-VECTOR_SIZE-0x20) { ; RW data
4349
.ANY (+RW +ZI)
4450
}
51+
4552
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) {
4653
}
54+
4755
RW_IRAM2 0x2007C000 0x4000 { ; RW data, USB RAM
4856
.ANY (AHBSRAM0)
4957
}
58+
5059
RW_IRAM3 0x20080000 0x4000 { ; RW data, ETH RAM
5160
.ANY (AHBSRAM1)
5261
}
62+
5363
RW_IRAM4 0x40038000 0x0800 { ; RW data, CAN RAM
5464
.ANY (CANRAM)
5565
}

targets/targets.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -541,10 +541,14 @@
541541
"core": "Cortex-M3",
542542
"supported_toolchains": [
543543
"ARM",
544-
"uARM",
545544
"GCC_ARM",
546545
"IAR"
547546
],
547+
"supported_c_libs": {
548+
"arm": ["std", "small"],
549+
"gcc_arm": ["std", "small"],
550+
"iar": ["std"]
551+
},
548552
"extra_labels": [
549553
"NXP",
550554
"LPC176X",
@@ -583,10 +587,6 @@
583587
"WATCHDOG",
584588
"RESET_REASON"
585589
],
586-
"release_versions": [
587-
"2",
588-
"5"
589-
],
590590
"device_name": "LPC1768",
591591
"bootloader_supported": true,
592592
"overrides": {

0 commit comments

Comments
 (0)