Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update Makefile for CI autotest

Browse source
This commit is contained in:
Yu Chen 2022-06-23 00:11:44 +08:00
parent eddb2d345d
commit e2a7c72b98
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
os/Makefile
View file

@ -107,12 +107,17 @@ endif
run-inner: build run-inner: build
ifeq ($(BOARD),qemu) ifeq ($(BOARD),qemu)
@qemu-system-riscv64 \ @qemu-system-riscv64 \
-M 128m \
-machine virt \ -machine virt \
-nographic \
-bios $(BOOTLOADER) \ -bios $(BOOTLOADER) \
-display none \
-device loader,file=$(KERNEL_BIN),addr=$(KERNEL_ENTRY_PA) \ -device loader,file=$(KERNEL_BIN),addr=$(KERNEL_ENTRY_PA) \
-drive file=$(FS_IMG),if=none,format=raw,id=x0 \ -drive file=$(FS_IMG),if=none,format=raw,id=x0 \
-device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0 \ -device virtio-blk-device,drive=x0 \
-device virtio-gpu-device \
-device virtio-keyboard-device \
-device virtio-mouse-device \
-serial stdio
else else
(which $(K210-BURNER)) || (cd .. && git clone https://github.com/sipeed/kflash.py.git && mv kflash.py tools) (which $(K210-BURNER)) || (cd .. && git clone https://github.com/sipeed/kflash.py.git && mv kflash.py tools)
@cp $(BOOTLOADER) $(BOOTLOADER).copy @cp $(BOOTLOADER) $(BOOTLOADER).copy

10
os/run-nodisp.sh Executable file
View file

@ -0,0 +1,10 @@
qemu-system-riscv64 -M 128m -machine virt \
-bios ../bootloader/rustsbi-qemu.bin \
-display none \
-device loader,file=target/riscv64gc-unknown-none-elf/release/os.bin,addr=0x80200000 \
-drive file=../user/target/riscv64gc-unknown-none-elf/release/fs.img,if=none,format=raw,id=x0 \
-device virtio-blk-device,drive=x0 \
-device virtio-gpu-device \
-device virtio-keyboard-device \
-device virtio-mouse-device \
-serial stdio