aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2015-02-24 11:06:48 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2015-02-24 11:06:48 +0100
commit91c5969cdddf2241418082998e76bdbb836ed03e (patch)
treea4597e44f36f6fc3406e0dd2671d265bce3a7d53 /Makefile
parent9ba449a6e5f9db20923fb9802eefe0f090ba5fff (diff)
downloadkogata-91c5969cdddf2241418082998e76bdbb836ed03e.tar.gz
kogata-91c5969cdddf2241418082998e76bdbb836ed03e.zip
PCI enumeration ; rename dev:/ to io:/
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 8 insertions, 6 deletions
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