Skip to content

Commit 2b9c59e

Browse files
authored
Devel (#3)
* Fault thread when done * Move sel4twinkle-alloc to its own repo crate * Cleanup notes * Update README
1 parent a8e2f18 commit 2b9c59e

15 files changed

+28
-857
lines changed

Cargo.lock

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ version = "0.0.1"
44
authors = ["jonlamb-gh <[email protected]>"]
55

66
[dependencies]
7-
# tracked as a submodule currently
8-
#libsel4-sys = {git = "https://github.com/jonlamb-gh/libsel4-sys.git", branch = "devel"}
9-
libsel4-sys = {path = "libsel4-sys"}
7+
libsel4-sys = {git = "https://github.com/jonlamb-gh/libsel4-sys.git", branch = "devel"}
108
rlibc = "1.0"
11-
# TODO - move to a real repo
12-
sel4twinkle-alloc = {path = "sel4twinkle-alloc"}
9+
sel4twinkle-alloc = {git = "https://github.com/jonlamb-gh/sel4twinkle-alloc-rs.git", branch = "master"}
10+
11+
# tracked as a submodule currently so I can apply patches for SoloX platform support
12+
[patch."https://github.com/jonlamb-gh/libsel4-sys.git"]
13+
libsel4-sys = {path = "libsel4-sys"}
1314

1415
[dependencies.wee_alloc]
1516
version = "0.4"

README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ A bare metal Rust cortex-m project runs on the M4 core.
2222

2323
## Building
2424

25-
** REQUIRES a cargo-fel4 that doesn't overwrite the root-task.rs **
25+
**NOTE**: requires a cargo-fel4 that does not overwrite the `src/bin/root-task.rs` file
26+
27+
Here's a [branch](https://github.com/jonlamb-gh/cargo-fel4/tree/keep-root-rask-for-development) I use.
2628

2729
Note that the L2 cache memory is currently defined as OCRAM for the M4 core.
2830

@@ -117,7 +119,9 @@ copying M4 binary to TCM - 3044 bytes
117119
enabling and starting the M4 core
118120
waiting for SRC_SCR reset auto-clear (bit 3) to clear
119121
120-
thread work all done, sitting on loop
122+
thread work all done, going to fault now
123+
124+
!!! Fault from badge 0xBEEF
121125
```
122126

123127
On UART2 (M4) console:

sel4twinkle-alloc/Cargo.toml

-8
This file was deleted.

sel4twinkle-alloc/src/allocator.rs

-247
This file was deleted.

sel4twinkle-alloc/src/cspacepath.rs

-18
This file was deleted.

sel4twinkle-alloc/src/first_stage_allocator.rs

-33
This file was deleted.

sel4twinkle-alloc/src/io_map.rs

-21
This file was deleted.

0 commit comments

Comments
 (0)