From f3fc47d50e4d840371c02bb0300b79e122fca842 Mon Sep 17 00:00:00 2001
From: Michal Idziorek <m.i@gmx.at>
Date: Wed, 12 Nov 2014 22:06:14 +0100
Subject: minor reordering

---
 Makefile | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ad0df1b..cd7ed53 100644
--- a/Makefile
+++ b/Makefile
@@ -54,21 +54,16 @@ MBR=./boot0/mbr.bin
 STAGE2=./boot/stage2.bin
 
 #multiprocessor binary entry
-
 MP_BIN=./boot/mp.bin
 
 
 #some fillup data (zeros)
-
 FILLUP=./data/fill.bin
 
 
 ############ final image (default target) ############
-
 all: FoolOS.vdi
-
 new: clean all
-	
 newrun: clean run
 
 ############ nasm assembling rules ############
@@ -102,7 +97,7 @@ FoolOS.img: $(MBR) $(STAGE2) kernel.bin $(FILLUP) FoolData.img
 	cp $(FILLUP) $@
 	dd if=$(MBR) of=$@ bs=512 seek=0 conv=notrunc
 	dd if=$(STAGE2) of=$@ bs=512 seek=1 conv=notrunc
-	dd if=kernel.bin of=$@ bs=512 seek=10 conv=notrunc #will end up at 0x100000 in ram (this is what the booloader starts loading secotr: 10)
+	dd if=kernel.bin of=$@ bs=512 seek=10 conv=notrunc 	#will end up at 0x100000 in ram (this is what the booloader starts loading secotr: 10)
 	dd if=FoolData.img of=$@ bs=512 seek=842 conv=notrunc	#data starts at 0x168000
 
 binfont.img:  binfont.bin
@@ -113,16 +108,22 @@ FoolData.img: binfont.bin $(MP_BIN) userspace/ext2.img
 	dd if=binfont.bin of=$@ bs=512 seek=1 conv=notrunc
 	dd if=userspace/ext2.img of=$@ bs=512 seek=4 conv=notrunc #will end up at 0x80800 in ram
 
+
+############ virtual machines stuff ############
+
+# vdi image for VirtualBox
 FoolOS.vdi: FoolOS.img
 	VBoxManage convertfromraw FoolOS.img FoolOS.vdi  --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c 
 
-############ vm stuff ############
-
 # run in our local bochs (we need cirrus support for our vesa mode)
-
 run: all
 	~/opt/bochs-2.6.6/bochs -q -f bochs/bochsrc -rc bochs/bochsdebug 
 
+############ create bootable usb image ############
+
+stick:  FoolOS.img
+	cat FoolOS.img > $(USB_STICK) && sync
+	xxd $(USB_STICK)  | head -n 50
 
 ############ cleanup ############
 
@@ -140,8 +141,3 @@ release: new
 userspace/ext2.img:
 	make -C userspace
 
-############ test stuff ############
-stick:  FoolOS.img
-	cat FoolOS.img > $(USB_STICK) && sync
-	xxd $(USB_STICK)  | head -n 50
-
-- 
cgit v1.2.3