Skip to content

Commit 65691aa

Browse files
committed
Pull in official Neotron OS 0.2.0 release.
1 parent a606960 commit 65691aa

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ We use the "neotron-os-pico.ld" linker script to link it at `0x1002_0000`.
6161

6262
```console
6363
user@host ~/neotron-os $ cargo build --bin=flash1002 --release --target=thumbv6m-none-eabi
64-
user@host ~/neotron-os $ arm-none-eabi-objcopy -O binary ./target/thumbv6m-none-eabi/release/flash1002 ../neotron-pico-bios/src/flash1002.bin
64+
user@host ~/neotron-os $ arm-none-eabi-objcopy -O binary ./target/thumbv6m-none-eabi/release/flash1002 ../neotron-pico-bios/src/thumbv6m-none-eabi-flash1002-libneotron_os.bin
6565
```
6666

6767
6. Build and load the Neotron BIOS, and view the debug output stream, with `cargo run --release`:

src/flash1002.bin

-32 KB
Binary file not shown.

src/main.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,14 @@ static HARDWARE: Mutex<core::cell::RefCell<Option<Hardware>>> =
168168

169169
/// This is our Operating System. It must be compiled separately.
170170
///
171-
/// The RP2040 requires an OS linked at `0x1002_0000`, which is the OS binary
172-
/// `flash1002`. Use `objdump` as per the README file to make a `flash1002.bin`.
171+
/// The RP2040 requires an OS linked at `0x1002_0000` and compiled for the
172+
/// `thumbv6m-none-eabi` target. You should therefore use the binary
173+
/// `thumbv6m-none-eabi-flash1002-libneotron_os.bin` from
174+
/// <https://github.com/Neotron-Compute/Neotron-OS/releases>
173175
#[link_section = ".flash_os"]
174176
#[used]
175-
pub static OS_IMAGE: [u8; include_bytes!("flash1002.bin").len()] = *include_bytes!("flash1002.bin");
177+
pub static OS_IMAGE: [u8; include_bytes!("thumbv6m-none-eabi-flash1002-libneotron_os.bin").len()] =
178+
*include_bytes!("thumbv6m-none-eabi-flash1002-libneotron_os.bin");
176179

177180
/// The table of API calls we provide the OS
178181
static API_CALLS: common::Api = common::Api {
33.6 KB
Binary file not shown.

src/flash1002.txt renamed to src/thumbv6m-none-eabi-flash1002-libneotron_os.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
This is Neotron OS version v0.1.0
2-
See https://github.com/neotron-compute/neotron-os
1+
This is Neotron OS version v0.2.0
2+
3+
Taken from https://github.com/Neotron-Compute/Neotron-OS/releases/tag/v0.2.0
34

45
This program is free software: you can redistribute it and/or modify
56
it under the terms of the GNU General Public License as published by
@@ -12,4 +13,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1213
GNU General Public License for more details.
1314

1415
You should have received a copy of the GNU General Public License
15-
along with this program. If not, see <https://www.gnu.org/licenses/>.
16+
along with this program. If not, see <https://www.gnu.org/licenses/>.

0 commit comments

Comments
 (0)