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.

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

fix nrf52 layout #98

Merged
merged 5 commits into from
Nov 22, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@
# libtock-rs
Rust userland library for Tock (WIP)

Tested with tock a3b36d5872315ff05ef5ad34ed9453b0789218ce.
Tested with tock [Release 1.4](https://github.com/tock/tock/commit/2cef02405e699c06cefd0aae6a89f0e8cc4395ab).

The library works in principle on most boards, but there is currently the [showstopper
bug #28](https://github.com/tock/libtock-rs/issues/28) that prevents
the generation of relocatable code. This means that all applications
must be installed at the flash address they are compiled with, which
usually means that they must be compiled especially for your board
and that there can only be one application written in rust at a time
and it must be installed as the first application on the board, unless
you want to play games with linker scripts.

## Getting Started

Expand Down
2 changes: 1 addition & 1 deletion nrf52_layout.ld
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

MEMORY {
/* The application region is 64 bytes (0x40) */
FLASH (rx) : ORIGIN = 0x00020040, LENGTH = 0x0005FFC0
FLASH (rx) : ORIGIN = 0x00030040, LENGTH = 0x0005FFC0
SRAM (rwx) : ORIGIN = 0x20002000, LENGTH = 62K
}

Expand Down
2 changes: 1 addition & 1 deletion run_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ elf_file_name="target/tab/$1/cortex-m4.elf"
tab_file_name="target/tab/$1.tab"

# Default value for nRF52-DK
tockloader_flags="--jlink --arch cortex-m4 --board nrf52dk --jtag-device nrf52 --app-address 0x20000"
tockloader_flags="--jlink --arch cortex-m4 --board nrf52dk --jtag-device nrf52"

hail_defined=${hail:-}
if [ -n "$hail_defined" ]
Expand Down
2 changes: 1 addition & 1 deletion run_hardware_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

set -eux

yes 0|tockloader uninstall --jlink --arch cortex-m4 --board nrf52dk --jtag-device nrf52 --app-address 0x20000 || true
yes 0|tockloader uninstall --jlink --arch cortex-m4 --board nrf52dk --jtag-device nrf52 || true

./run_example.sh hardware_test --dont-clear-apps