Skip to content
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

RTOS port for NRF51 targets #1854

Merged
merged 7 commits into from
Jun 8, 2016
Merged

RTOS port for NRF51 targets #1854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
000e04d
RTOS port for nrf51.
pan- May 27, 2016
c0a6c7c
Better generation of heap section.
pan- Jun 5, 2016
39a459f
Port RTOS tests to nrf51.
pan- Jun 5, 2016
c854d01
Build RTOS tests on nrf51 based targets.
pan- Jun 5, 2016
e46b659
Merge branch 'master' of https://github.com/mbedmicro/mbed into nrf51…
pan- Jun 5, 2016
55a35f9
Use attributes from toolchain.h instead of compiler specific declarat…
pan- Jun 6, 2016
c58198e
Remove setbuf from rtos tests.
pan- Jun 7, 2016
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
6 changes: 4 additions & 2 deletions ...sis/TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,20 @@ SECTIONS
__bss_end__ = .;
} > RAM

.heap (COPY):
.heap (NOLOAD):
{
__end__ = .;
end = __end__;
__HeapBase = .;
*(.heap*)
. = ORIGIN(RAM) + LENGTH(RAM) - Stack_Size;
__HeapLimit = .;
} > RAM

/* .stack_dummy section doesn't contains any symbols. It is only
* used for linker to calculate size of stack sections, and assign
* values to stack symbols later */
.stack_dummy (COPY):
.stack_dummy (NOLOAD):
{
*(.stack*)
} > RAM
Expand Down
6 changes: 4 additions & 2 deletions ...TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S110/NRF51822.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,20 @@ SECTIONS
__bss_end__ = .;
} > RAM

.heap (COPY):
.heap (NOLOAD):
{
__end__ = .;
end = __end__;
__HeapBase = .;
*(.heap*)
. = ORIGIN(RAM) + LENGTH(RAM) - Stack_Size;
__HeapLimit = .;
} > RAM

/* .stack_dummy section doesn't contains any symbols. It is only
* used for linker to calculate size of stack sections, and assign
* values to stack symbols later */
.stack_dummy (COPY):
.stack_dummy (NOLOAD):
{
*(.stack*)
} > RAM
Expand Down
6 changes: 4 additions & 2 deletions ...TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S130/NRF51822.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,20 @@ SECTIONS
__bss_end__ = .;
} > RAM

.heap (COPY):
.heap (NOLOAD):
{
__end__ = .;
end = __end__;
__HeapBase = .;
*(.heap*)
. = ORIGIN(RAM) + LENGTH(RAM) - Stack_Size;
__HeapLimit = .;
} > RAM

/* .stack_dummy section doesn't contains any symbols. It is only
* used for linker to calculate size of stack sections, and assign
* values to stack symbols later */
.stack_dummy (COPY):
.stack_dummy (NOLOAD):
{
*(.stack*)
} > RAM
Expand Down
28 changes: 8 additions & 20 deletions hal/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/TOOLCHAIN_GCC_ARM/startup_NRF51822.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2013, Nordic Semiconductor ASA
All rights reserved.

Expand Down Expand Up @@ -28,8 +28,8 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

/*
NOTE: Template files (including this one) are application specific and therefore
/*
NOTE: Template files (including this one) are application specific and therefore
expected to be copied into the application project folder prior to its use!
*/

Expand All @@ -43,6 +43,7 @@ expected to be copied into the application project folder prior to its use!
#else
.equ Stack_Size, 2048
#endif
.globl Stack_Size
.globl __StackTop
.globl __StackLimit
__StackLimit:
Expand All @@ -53,21 +54,9 @@ __StackTop:

.section .heap
.align 3
#ifdef __HEAP_SIZE
.equ Heap_Size, __HEAP_SIZE
#else
.equ Heap_Size, 2048
#endif
.globl __HeapBase
.globl __HeapLimit
__HeapBase:
.if Heap_Size
.space Heap_Size
.endif
.size __HeapBase, . - __HeapBase
__HeapLimit:
.size __HeapLimit, . - __HeapLimit


.section .Vectors
.align 2
.globl __Vectors
Expand Down Expand Up @@ -129,7 +118,7 @@ __Vectors:
/* Reset Handler */

.equ NRF_POWER_RAMON_ADDRESS, 0x40000524
.equ NRF_POWER_RAMON_RAMxON_ONMODE_Msk, 0x3
.equ NRF_POWER_RAMON_RAMxON_ONMODE_Msk, 0x3

.text
.thumb
Expand All @@ -148,7 +137,7 @@ Reset_Handler:
STR R2, [R0]

/* Loop to copy data from read only memory to RAM. The ranges
* of copy from/to are specified by following symbols evaluated in
* of copy from/to are specified by following symbols evaluated in
* linker script.
* __etext: End of code section, i.e., begin of data sections to copy from.
* __data_start__/__data_end__: RAM address range that data should be
Expand All @@ -167,7 +156,7 @@ Reset_Handler:
str r0, [r2,r3]
bgt .LC1
.LC0:

LDR R0, =SystemInit
BLX R0
LDR R0, =_start
Expand Down Expand Up @@ -259,4 +248,3 @@ Default_Handler:


.end

Loading