Skip to content

ARCH_PRO: Remove uARM tooolchain support #12853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2020
Merged

ARCH_PRO: Remove uARM tooolchain support #12853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_ARM_MICRO/LPC1768.sct
View file
Open in desktop

This file was deleted.

220 changes: 0 additions & 220 deletions targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_ARM_MICRO/startup_LPC17xx.S
View file
Open in desktop

This file was deleted.

32 changes: 21 additions & 11 deletions targets/TARGET_NXP/TARGET_LPC176X/device/TOOLCHAIN_ARM_STD/LPC1768.sct
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,65 @@
#! armcc -E

#if !defined(MBED_APP_START)
#define MBED_APP_START 0x00000000
#define MBED_APP_START 0x00000000
#endif

; 32K flash
#if !defined(MBED_APP_SIZE)
#define MBED_APP_SIZE 0x80000
#define MBED_APP_SIZE 0x80000
#endif

; 4KB
#if !defined(MBED_RAM_START)
#define MBED_RAM_START 0x10000000
#define MBED_RAM_START 0x10000000
#endif

#if !defined(MBED_RAM_SIZE)
#define MBED_RAM_SIZE 0x00008000
#define MBED_RAM_SIZE 0x00008000
#endif


#if !defined(MBED_BOOT_STACK_SIZE)
#define MBED_BOOT_STACK_SIZE 0x400
#define MBED_BOOT_STACK_SIZE 0x400
#endif

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

#define RAM_FIXED_SIZE (MBED_BOOT_STACK_SIZE+VECTOR_SIZE+0x20)

LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region
ER_IROM0 MBED_APP_START 0x2FC { ; load address = execution address
LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region

ER_IROM0 MBED_APP_START 0x2FC { ; load address = execution address
*.o (RESET, +First)
.ANY (+RO)
}
ER_CRP (MBED_APP_START + 0x2FC) FIXED 4 {

ER_CRP (MBED_APP_START + 0x2FC) FIXED 4 {
*.o (.CRPSection)
}

ER_IROM1 (MBED_APP_START + (0x2FC + 4)) FIXED (MBED_APP_SIZE - (0x2FC + 4)) {
*(InRoot$$Sections)
.ANY (+RO)
*(InRoot$$Sections)
.ANY (+RO)
}
; 8_byte_aligned(49 vect * 4 bytes) = 8_byte_aligned(0xC4) = 0xC8

; 32KB (RAM size) - 0xC8 (NIVT) - 32 (topmost 32 bytes used by IAP functions) = 0x7F18
RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-VECTOR_SIZE-0x20) { ; RW data
.ANY (+RW +ZI)
}

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

RW_IRAM2 0x2007C000 0x4000 { ; RW data, USB RAM
.ANY (AHBSRAM0)
}

RW_IRAM3 0x20080000 0x4000 { ; RW data, ETH RAM
.ANY (AHBSRAM1)
}

RW_IRAM4 0x40038000 0x0800 { ; RW data, CAN RAM
.ANY (CANRAM)
}
Expand Down
10 changes: 5 additions & 5 deletions targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,10 +541,14 @@
"core": "Cortex-M3",
"supported_toolchains": [
"ARM",
"uARM",
"GCC_ARM",
"IAR"
],
"supported_c_libs": {
"arm": ["std", "small"],
"gcc_arm": ["std", "small"],
"iar": ["std"]
},
"extra_labels": [
"NXP",
"LPC176X",
Expand Down Expand Up @@ -583,10 +587,6 @@
"WATCHDOG",
"RESET_REASON"
],
"release_versions": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was this already somehow deprecated and we dont use it ? I recall tools relied on this information

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will not be used in Mbed 6. More information coming in the Mbed 2 target porting guide. Currently it only really matters for Mbed 2 only targets.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I havent seen that update. I assume the clean up will come for all targets (just removing release version).

cc @MarceloSalazar

Copy link
Contributor

@evedon evedon Apr 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come you did not need to override supported_c_libs to build with Microlib?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

"2",
"5"
],
"device_name": "LPC1768",
"bootloader_supported": true,
"overrides": {
Expand Down