From 91c5969cdddf2241418082998e76bdbb836ed03e Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 24 Feb 2015 11:06:48 +0100 Subject: PCI enumeration ; rename dev:/ to io:/ --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9bccf44..5a087fb 100644 --- a/Makefile +++ b/Makefile @@ -23,14 +23,16 @@ mrproper: run_tests: rebuild src/tests/run_tests.sh -run_qemu: all - qemu-system-i386 -kernel src/kernel/kernel.bin -serial stdio -m 16 -initrd src/apps/init/init.bin +cdrom.iso: all + ./make_cdrom.sh + +run_qemu: cdrom.iso + qemu-system-i386 -cdrom cdrom.iso -serial stdio -m 16 -run_qemu_debug: all - qemu-system-i386 -kernel src/kernel/kernel.bin -serial stdio -s -S & \ +run_qemu_debug: cdrom.iso + qemu-system-i386 -cdrom cdrom.iso -serial stdio -s -S & \ (sleep 0.1; gdb src/kernel/kernel.bin -x gdb_cmd) -run_bochs_debug: all - ./make_cdrom.sh +run_bochs_debug: cdrom.iso bochs -f bochs_debug.cfg -q -- cgit v1.2.3