From 7c74503da71bab365e076404dbc57639e1c3b3e4 Mon Sep 17 00:00:00 2001
From: Kevin Lange <kevin.lange@dakko.us>
Date: Mon, 21 Feb 2011 19:41:37 -0600
Subject: [PATCH] [boot] Ug, ext2, make a boot floppy instead...

---
 .gitignore |  3 +--
 Makefile   | 15 +++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ca4ae2c..71a7aafb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,5 @@ toaruos-initrd
 bootloader/stage1.bin
 bootloader/stage2.bin
 initrd/kernel
-initrd/stage2
 .gdb_history
-testdisk
+bootdisk.img
diff --git a/Makefile b/Makefile
index ed1db707..2e905b25 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ kernel/start.o: kernel/start.asm
 ################
 #   Ram disk   #
 ################
-toaruos-initrd: initrd bootloader/stage1.bin initrd/stage2 initrd/kernel
+toaruos-initrd: initrd/kernel
 	@${ECHO} -n "\033[32m initrd Generating initial RAM disk\033[0m"
 	@-rm -f toaruos-initrd
 	@${GENEXT} -d initrd -q -b 249 toaruos-initrd
@@ -58,10 +58,6 @@ toaruos-initrd: initrd bootloader/stage1.bin initrd/stage2 initrd/kernel
 initrd/kernel: toaruos-kernel
 	@cp toaruos-kernel initrd/kernel
 
-# Second-stage bootloader
-initrd/stage2: bootloader/stage2.bin
-	@cp bootloader/stage2.bin initrd/stage2
-
 ################
 #  Bootloader  #
 ################
@@ -98,11 +94,10 @@ bootloader/stage2.bin: bootloader/stage2/main.o bootloader/stage2/start.o bootlo
 	@${LD} -o bootloader/stage2.bin -T bootloader/stage2/link.ld bootloader/stage2/start.o bootloader/stage2/main.o
 	@${ECHO} "\r\033[32;1m   ld   $<\033[0m"
 
-testdisk: bootloader/stage1.bin bootloader/stage2.bin
-	@${ECHO} "\033[31;1m  WARN  This disk is a temporary development test only!\033[0m"
-	@${ECHO} -n "\033[34m   --   Building tesdisk...\033[0m"
-	@cat bootloader/stage1.bin bootloader/stage2.bin > testdisk
-	@${ECHO} "\r\033[34;1m   --   Testdisk compiled.  \033[0m"
+bootdisk.img: bootloader/stage1.bin bootloader/stage2.bin
+	@${ECHO} -n "\033[34m   --   Building bootdisk.img...\033[0m"
+	@cat bootloader/stage1.bin bootloader/stage2.bin > bootdisk.img
+	@${ECHO} "\r\033[34;1m   --   Bootdisk is ready!      \033[0m"
 
 ###############
 #    clean    #