From 5bc8549a8d7f5c9644f878fe3ca55761663a2fd0 Mon Sep 17 00:00:00 2001
From: Alex AUVOLAT <alexis211@gmail.com>
Date: Thu, 17 May 2012 10:25:35 +0200
Subject: Now booting on CD-ROM.

---
 Makefile | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d63478d..bb759b8 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ QemuCmd = qemu-system-i386
 BasePath = $(shell pwd)
 SrcPath = $(BasePath)/src
 
-Floppy = TCE.fl.img
+Cdrom = TCE.iso
 
 all:
 	@for p in $(Projects); do \
@@ -36,20 +36,24 @@ commit: mrproper
 	git commit -a; exit 0
 	git push origin
 
-floppy:
-	mkdir mnt; exit 0
-	sudo mount $(Floppy) mnt -o loop
-	sudo ./copy_fdd.sh
-	sleep 0.3
-	sudo umount mnt
-
-
-bochs: all floppy
+$(Cdrom): menu_cdrom.lst src/kernel/kernel.elf src/user/test/test.elf
+	mkdir -p cdrom/boot/grub
+	if [ ! -e cdrom/boot/grub/stage2_eltorito ]; then \
+		echo "Please copy grub's stage2_eltorito to cdrom/boot/grub."; \
+		exit -1; \
+	fi
+	cp menu_cdrom.lst cdrom/boot/grub/menu.lst
+	cp src/kernel/kernel.elf cdrom
+	cp src/user/test/test.elf cdrom
+	genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 \
+		-boot-info-table -input-charset ascii -A TCE -o $(Cdrom) cdrom
+
+bochs: all $(Cdrom)
 	bochs -f bochs.cfg
 
-qemu: all floppy
-	$(QemuCmd) -fda $(Floppy) -m 32
+qemu: all $(Cdrom)
+	$(QemuCmd) -cdrom $(Cdrom) -m 32
 
-qemu-gdb: all floppy
-	$(QemuCmd) -fda $(Floppy) -m 32 -s -S & gdb src/kernel/kernel.elf -x gdb-cmd
+qemu-gdb: all $(Cdrom)
+	$(QemuCmd) -cdrom $(Cdrom) -m 32 -s -S & gdb src/kernel/kernel.elf -x gdb-cmd
 
-- 
cgit v1.2.3