Skip to content

Remove deprecated --legacyalign from ARMC6 link #10373

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

Closed
wants to merge 5 commits into from
Closed

Remove deprecated --legacyalign from ARMC6 link #10373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
048fcb9
Remove deprecated --legacyalign from ARMC6 link
kjbracey Apr 11, 2019
f01760b
STM: Fix up ARMC6 alignment
kjbracey Apr 11, 2019
7f3bf07
Maxim: Position vectors manually, like other targets
kjbracey Apr 11, 2019
428c8ff
Maxim: Fix default handler build warnings
kjbracey Apr 11, 2019
0699512
ARM CM3DS: Align RAM for ARM linker
kjbracey Apr 11, 2019
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
2 changes: 1 addition & 1 deletion targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device/TOOLCHAIN_ARM_STD/MPS2.sct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ LR_IROM2 ZBT_SSRAM1_START ZBT_SSRAM1_SIZE {
}
; At execution, RAM is set to be in ZBT SSRAM2 and 3, just after the vector
; table previously moved from Flash.
RW_IRAM1 (ZBT_SSRAM23_START + NVIC_VECTORS_SIZE) (ZBT_SSRAM23_SIZE - NVIC_VECTORS_SIZE) {
RW_IRAM1 (ZBT_SSRAM23_START + AlignExpr(NVIC_VECTORS_SIZE,8)) (ZBT_SSRAM23_SIZE - AlignExpr(NVIC_VECTORS_SIZE,8)) {
.ANY (+RW +ZI)
}
}
Expand Down
18 changes: 9 additions & 9 deletions targets/TARGET_Maxim/TARGET_MAX32600/device/TOOLCHAIN_ARM_STD/startup_MAX32600.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,47 +128,47 @@ Reset_Handler PROC

NMI_Handler PROC
EXPORT NMI_Handler [WEAK]
B NMI_Handler
B .
ENDP

HardFault_Handler PROC
EXPORT HardFault_Handler [WEAK]
B HardFault_Handler
B .
ENDP

MemManage_Handler PROC
EXPORT MemManage_Handler [WEAK]
B MemManage_Handler
B .
ENDP

BusFault_Handler PROC
EXPORT BusFault_Handler [WEAK]
B BusFault_Handler
B .
ENDP

UsageFault_Handler PROC
EXPORT UsageFault_Handler [WEAK]
B UsageFault_Handler
B .
ENDP

SVC_Handler PROC
EXPORT SVC_Handler [WEAK]
B SVC_Handler
B .
ENDP

DebugMon_Handler PROC
EXPORT DebugMon_Handler [WEAK]
B DebugMon_Handler
B .
ENDP

PendSV_Handler PROC
EXPORT PendSV_Handler [WEAK]
B PendSV_Handler
B .
ENDP

SysTick_Handler PROC
EXPORT SysTick_Handler [WEAK]
B SysTick_Handler
B .
ENDP

Default_Handler PROC
Expand Down
2 changes: 1 addition & 1 deletion targets/TARGET_Maxim/TARGET_MAX32600/device/TOOLCHAIN_GCC_ARM/max32600.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ STACK_SIZE = MBED_BOOT_STACK_SIZE;
MEMORY
{
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000 /* start from 0x0, fullsize flash, 256k */
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000 /* full-size SRAM, 32k */
RAM (rwx) : ORIGIN = 0x20000140, LENGTH = 0x00008000 - 0x140 /* full-size SRAM, 32k */
}

/* Linker script to place sections and symbol values. Should be used together
Expand Down
6 changes: 3 additions & 3 deletions targets/TARGET_Maxim/TARGET_MAX32600/device/TOOLCHAIN_IAR/MAX32600.icf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ define symbol __region_ROM_start__ = 0x0;
define symbol __region_ROM_end__ = 0x0003FFFF;

/* [RAM] Vector table dynamic copy: 79 vectors * 4 bytes = 316 bytes (0x13C) */
define symbol __NVIC_start__ = 0x00000000;
define symbol __NVIC_end__ = 0x00000140; /* to be aligned on 8 bytes */
define symbol __region_RAM_start__ = 0x20000000;
define symbol __NVIC_start__ = 0x20000000;
define symbol __NVIC_end__ = 0x20000140; /* to be aligned on 8 bytes */
define symbol __region_RAM_start__ = 0x20000140;
define symbol __region_RAM_end__ = 0x20007FFF;

/* Memory regions */
Expand Down
4 changes: 1 addition & 3 deletions targets/TARGET_Maxim/TARGET_MAX32600/device/cmsis_nvic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
#ifndef MBED_CMSIS_NVIC_H
#define MBED_CMSIS_NVIC_H

extern void (*ramVectorTable[MXC_IRQ_COUNT])(void);

#define NVIC_NUM_VECTORS (MXC_IRQ_COUNT)
#define NVIC_RAM_VECTOR_ADDRESS (ramVectorTable) // Vectors positioned at start of RAM
#define NVIC_RAM_VECTOR_ADDRESS 0x20000000 // Vectors positioned at start of RAM

#endif /* MBED_CMSIS_NVIC_H */
24 changes: 0 additions & 24 deletions targets/TARGET_Maxim/TARGET_MAX32600/device/device_nvic.c
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions targets/TARGET_Maxim/TARGET_MAX32610/device/TOOLCHAIN_ARM_STD/startup_MAX32610.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,47 +128,47 @@ Reset_Handler PROC

NMI_Handler PROC
EXPORT NMI_Handler [WEAK]
B NMI_Handler
B .
ENDP

HardFault_Handler PROC
EXPORT HardFault_Handler [WEAK]
B HardFault_Handler
B .
ENDP

MemManage_Handler PROC
EXPORT MemManage_Handler [WEAK]
B MemManage_Handler
B .
ENDP

BusFault_Handler PROC
EXPORT BusFault_Handler [WEAK]
B BusFault_Handler
B .
ENDP

UsageFault_Handler PROC
EXPORT UsageFault_Handler [WEAK]
B UsageFault_Handler
B .
ENDP

SVC_Handler PROC
EXPORT SVC_Handler [WEAK]
B SVC_Handler
B .
ENDP

DebugMon_Handler PROC
EXPORT DebugMon_Handler [WEAK]
B DebugMon_Handler
B .
ENDP

PendSV_Handler PROC
EXPORT PendSV_Handler [WEAK]
B PendSV_Handler
B .
ENDP

SysTick_Handler PROC
EXPORT SysTick_Handler [WEAK]
B SysTick_Handler
B .
ENDP

Default_Handler PROC
Expand Down
2 changes: 1 addition & 1 deletion targets/TARGET_Maxim/TARGET_MAX32610/device/TOOLCHAIN_GCC_ARM/max32610.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ STACK_SIZE = MBED_BOOT_STACK_SIZE;
MEMORY
{
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000 /* start from 0x0, fullsize flash, 256k */
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000 /* full-size SRAM, 32k */
RAM (rwx) : ORIGIN = 0x20000140, LENGTH = 0x00008000 - 0x140 /* full-size SRAM, 32k */
}

/* Linker script to place sections and symbol values. Should be used together
Expand Down
6 changes: 3 additions & 3 deletions targets/TARGET_Maxim/TARGET_MAX32610/device/TOOLCHAIN_IAR/MAX32610.icf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ define symbol __region_ROM_start__ = 0x0;
define symbol __region_ROM_end__ = 0x0003FFFF;

/* [RAM] Vector table dynamic copy: 79 vectors * 4 bytes = 316 bytes (0x13C) */
define symbol __NVIC_start__ = 0x00000000;
define symbol __NVIC_end__ = 0x00000140; /* to be aligned on 8 bytes */
define symbol __region_RAM_start__ = 0x20000000;
define symbol __NVIC_start__ = 0x20000000;
define symbol __NVIC_end__ = 0x20000140; /* to be aligned on 8 bytes */
define symbol __region_RAM_start__ = 0x20000140;
define symbol __region_RAM_end__ = 0x20007FFF;

/* Memory regions */
Expand Down
4 changes: 1 addition & 3 deletions targets/TARGET_Maxim/TARGET_MAX32610/device/cmsis_nvic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
#ifndef MBED_CMSIS_NVIC_H
#define MBED_CMSIS_NVIC_H

extern void (*ramVectorTable[MXC_IRQ_COUNT])(void);

#define NVIC_NUM_VECTORS (MXC_IRQ_COUNT)
#define NVIC_RAM_VECTOR_ADDRESS (ramVectorTable) // Vectors positioned at start of RAM
#define NVIC_RAM_VECTOR_ADDRESS 0x20000000 // Vectors positioned at start of RAM

#endif /* MBED_CMSIS_NVIC_H */
24 changes: 0 additions & 24 deletions targets/TARGET_Maxim/TARGET_MAX32610/device/device_nvic.c
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions targets/TARGET_Maxim/TARGET_MAX32620/device/TOOLCHAIN_ARM_STD/MAX32620.sct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ LR_IROM1 0x00000000 0x200000 { ; load region size_region
.ANY (+RO)
}

; [RAM] Vector table dynamic copy: 65 vectors * 4 bytes = 260 (0x104) + 4
; [RAM] Vector table dynamic copy: 81 vectors * 4 bytes = 324 (0x144) + 4
; for 8 byte alignment
RW_IRAM1 (0x20000000+0x108) (0x40000-0x108-Stack_Size) { ; RW data
RW_IRAM1 (0x20000000+0x148) (0x40000-0x148-Stack_Size) { ; RW data
.ANY (+RW +ZI)
}
ARM_LIB_STACK (0x20000000+0x40000) EMPTY -Stack_Size { ; stack
Expand Down
18 changes: 9 additions & 9 deletions targets/TARGET_Maxim/TARGET_MAX32620/device/TOOLCHAIN_ARM_STD/startup_MAX32620.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,47 +131,47 @@ Reset_Handler PROC

NMI_Handler PROC
EXPORT NMI_Handler [WEAK]
B NMI_Handler
B .
ENDP

HardFault_Handler PROC
EXPORT HardFault_Handler [WEAK]
B HardFault_Handler
B .
ENDP

MemManage_Handler PROC
EXPORT MemManage_Handler [WEAK]
B MemManage_Handler
B .
ENDP

BusFault_Handler PROC
EXPORT BusFault_Handler [WEAK]
B BusFault_Handler
B .
ENDP

UsageFault_Handler PROC
EXPORT UsageFault_Handler [WEAK]
B UsageFault_Handler
B .
ENDP

SVC_Handler PROC
EXPORT SVC_Handler [WEAK]
B SVC_Handler
B .
ENDP

DebugMon_Handler PROC
EXPORT DebugMon_Handler [WEAK]
B DebugMon_Handler
B .
ENDP

PendSV_Handler PROC
EXPORT PendSV_Handler [WEAK]
B PendSV_Handler
B .
ENDP

SysTick_Handler PROC
EXPORT SysTick_Handler [WEAK]
B SysTick_Handler
B .
ENDP

Default_Handler PROC
Expand Down
2 changes: 1 addition & 1 deletion targets/TARGET_Maxim/TARGET_MAX32620/device/TOOLCHAIN_GCC_ARM/max32620.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ STACK_SIZE = MBED_BOOT_STACK_SIZE;
MEMORY
{
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 2M
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 256K
RAM (rwx) : ORIGIN = 0x20000148, LENGTH = 256K - 0x148
}

/* Linker script to place sections and symbol values. Should be used together
Expand Down
8 changes: 4 additions & 4 deletions targets/TARGET_Maxim/TARGET_MAX32620/device/TOOLCHAIN_IAR/MAX32620.icf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ define symbol __intvec_start__ = 0x0;
define symbol __region_ROM_start__ = 0x0;
define symbol __region_ROM_end__ = 0x001FFFFF;

/* [RAM] Vector table dynamic copy: 65 vectors * 4 bytes = 260 (0x104) bytes + 4 for 8 byte align */
define symbol __NVIC_start__ = 0x00000000;
define symbol __NVIC_end__ = 0x00000108; /* to be aligned on 8 bytes */
define symbol __region_RAM_start__ = 0x20000000;
/* [RAM] Vector table dynamic copy: 81 vectors * 4 bytes = 324 (0x144) bytes + 4 for 8 byte align */
define symbol __NVIC_start__ = 0x20000000;
define symbol __NVIC_end__ = 0x20000148; /* to be aligned on 8 bytes */
define symbol __region_RAM_start__ = 0x20000148;
define symbol __region_RAM_end__ = 0x2003FFFF;

/* Memory regions */
Expand Down
4 changes: 1 addition & 3 deletions targets/TARGET_Maxim/TARGET_MAX32620/device/cmsis_nvic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
#ifndef MBED_CMSIS_NVIC_H
#define MBED_CMSIS_NVIC_H

extern void (*ramVectorTable[MXC_IRQ_COUNT])(void);

#define NVIC_NUM_VECTORS (MXC_IRQ_COUNT)
#define NVIC_RAM_VECTOR_ADDRESS (ramVectorTable) // Vectors positioned at start of RAM
#define NVIC_RAM_VECTOR_ADDRESS 0x20000000 // Vectors positioned at start of RAM

#endif /* MBED_CMSIS_NVIC_H */
24 changes: 0 additions & 24 deletions targets/TARGET_Maxim/TARGET_MAX32620/device/device_nvic.c
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions targets/TARGET_Maxim/TARGET_MAX32620C/device/TOOLCHAIN_ARM_STD/MAX32620.sct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ LR_IROM1 0x00000000 0x200000 { ; load region size_region
.ANY (+RO)
}

; [RAM] Vector table dynamic copy: 65 vectors * 4 bytes = 260 (0x104) + 4
; [RAM] Vector table dynamic copy: 84 vectors * 4 bytes = 336 (0x150)
; for 8 byte alignment
RW_IRAM1 (0x20000000+0x108) (0x40000-0x108-Stack_Size) { ; RW data
RW_IRAM1 (0x20000000+0x150) (0x40000-0x150-Stack_Size) { ; RW data
.ANY (+RW +ZI)
}
ARM_LIB_STACK (0x20000000+0x40000) EMPTY -Stack_Size { ; stack
Expand Down
2 changes: 1 addition & 1 deletion targets/TARGET_Maxim/TARGET_MAX32620C/device/TOOLCHAIN_GCC_ARM/max32620.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ STACK_SIZE = MBED_BOOT_STACK_SIZE;
MEMORY
{
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 2M
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 256K
RAM (rwx) : ORIGIN = 0x20000150, LENGTH = 256K - 0x150
}

/* Linker script to place sections and symbol values. Should be used together
Expand Down
Loading