diff options
| author | Robert Morris <[email protected]> | 2019-09-17 06:08:10 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2019-09-17 06:08:10 -0400 |
| commit | 0d01de2a32b0c7ae1eaee5d79faf075cf38df997 (patch) | |
| tree | ed516ba8c9cc959a69424f68e9d3bd7ed21fed08 | |
| parent | 2df42355f7bf63b7c4344094955330048b5090f6 (diff) | |
| parent | b150908354dd166ed9f00287064216d09a3ba807 (diff) | |
| download | xv6-labs-0d01de2a32b0c7ae1eaee5d79faf075cf38df997.tar.gz xv6-labs-0d01de2a32b0c7ae1eaee5d79faf075cf38df997.tar.bz2 xv6-labs-0d01de2a32b0c7ae1eaee5d79faf075cf38df997.zip | |
Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -152,7 +152,9 @@ QEMUGDB = $(shell if $(QEMU) -help | grep -q '^-gdb'; \ ifndef CPUS CPUS := 3 endif -QEMUOPTS = -machine virt -kernel $K/kernel -m 3G -smp $(CPUS) -nographic + +QEMUEXTRA = -drive file=fs1.img,if=none,format=raw,id=x1 -device virtio-blk-device,drive=x1,bus=virtio-mmio-bus.1 +QEMUOPTS = -machine virt -bios none -kernel $K/kernel -m 3G -smp $(CPUS) -nographic QEMUOPTS += -drive file=fs.img,if=none,format=raw,id=x0 -device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0 qemu: $K/kernel fs.img |