Skip to content

Commit 1d52d1f

Browse files
authored
Merge pull request rust-osdev#7 from andre-richter/misc
Misc fixes
2 parents 2a36320 + b93d92d commit 1d52d1f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The idea is to build the kernel as a `no_std` longmode executable and then build
99
You need a nightly [Rust](https://www.rust-lang.org) compiler, [xargo](https://github.com/japaric/xargo), [objcopy](https://sourceware.org/binutils/docs/binutils/objcopy.html) (or a similar tool), and [QEMU](https://www.qemu.org/) (for running it).
1010

1111
```
12-
> RUST_TARGET_PATH=(pwd) xargo build --target test
13-
> objcopy -O binary -S target/test/debug/elf_loader test-bin
14-
> qemu-system-x86_64 -hda test-bin -d int -s
12+
> RUST_TARGET_PATH=$(pwd) xargo build --target x86_64-bootloader --release
13+
> objcopy -O binary -S target/x86_64-bootloader/release/bootloader bootimage.bin
14+
> qemu-system-x86_64 -hda bootimage.bin -d int -s
1515
```

x86_64-bootloader.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
"linker-flavor": "ld",
55
"linker": "ld.bfd",
66
"pre-link-args": {
7-
"ld": ["-Tlinker.ld"]
7+
"ld": [
8+
"--script=linker.ld"
9+
]
810
},
911
"target-endian": "little",
1012
"target-pointer-width": "64",

0 commit comments

Comments
 (0)