From 829570713f09de0067d4f22f9e84780c7f9e01ed Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Thu, 12 Mar 2020 13:33:37 +0800 Subject: [PATCH] README: update info on running renode Signed-off-by: Sean Cross --- Cargo.toml | 2 +- README.md | 7 ++++++- emulation/boot.resc | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b4ddc9208..4de8bbffd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ "xous-rs", "examples/shell", ] -default-members = ["kernel", "loader", "xous-rs", "examples/shell"] +default-members = ["xous-rs", "examples/shell"] [profile.release] codegen-units = 1 # 1 better optimizations diff --git a/README.md b/README.md index b4461e106..6b18facb3 100644 --- a/README.md +++ b/README.md @@ -22,16 +22,21 @@ $ cargo build --target riscv32imac-unknown-none-elf $ cd kernel $ cargo build -p kernel --target riscv32imac-unknown-none-elf $ cd .. +$ cd loader +$ cargo build -p loader --target riscv32imac-unknown-none-elf +$ cd .. ``` This will compile all runtime packages for `riscv32imac-unknown-none-elf`. +Note that the kernel and loader must currently be built separately, due +to the fact that they have custom linker scripts. These need to be packaged into a loadable binary. You can generate such a binary by running the following: ```sh $ cargo run -p tools --bin create-image -- \ - --csv emulation/csr.csv + --csv emulation/csr.csv \ --kernel target/riscv32imac-unknown-none-elf/debug/kernel \ --init target/riscv32imac-unknown-none-elf/debug/shell \ target/args.bin diff --git a/emulation/boot.resc b/emulation/boot.resc index eb0aef675..8eca04e1a 100644 --- a/emulation/boot.resc +++ b/emulation/boot.resc @@ -1,5 +1,9 @@ # Boot Renode Script (boot.resc) +# Add this script's path to the global path, so +# we can include files relative to ourselves. +path add $ORIGIN + using sysbus mach create