Reorganize

Makefile

@@ -8,23 +8,91 @@ default: all
 .PHONY: clean
 clean:
 	rm -drf $(BUILD)
-	cd bootloader; make clean
+	cd tetros; cargo clean
 
 # Make everything
+# (but don't run qemu)
 .PHONY: all
 all: img
 
-# Make bios bootloader
-#	dd if=./bootloader/build/stage2.bin of=$@ conv=notrunc bs=512 seek=40
+#
+# MARK: boot
+#
 
+# Compile tetros as library
+LIB_SRC = ./tetros/Cargo.toml ./tetros/Cargo.lock $(shell find ./tetros/src -type f)
+$(BUILD)/tetros.lib: $(LIB_SRC)
+	@mkdir -p $(BUILD)
+	cd tetros && \
+		env RUSTFLAGS="-C soft-float" \
+		cargo rustc \
+			--manifest-path="./Cargo.toml" \
+			-Z build-std=core,alloc \
+			-Z build-std-features=compiler-builtins-mem \
+			--target "./targets/x86-unknown-none.json" \
+			--lib \
+			--release \
+			-- \
+			--emit link="$(CURDIR)/$@"
+
+# Link tetros
+BIOS_LD = ./tetros/linkers/x86-unknown-none.ld
+$(BUILD)/tetros.elf: $(BUILD)/tetros.lib $(BIOS_LD)
+	ld \
+		-m elf_i386 \
+		--gc-sections \
+		-z max-page-size=0x1000 \
+		-T "$(BIOS_LD)" \
+		-o "$@" \
+		"$<"
+
+	objcopy --only-keep-debug "$@" "$@.sym"
+	objcopy --strip-debug "$@"
+
+# Wrap tetros in three-stage BIOS loader
+# Parameters:
+# - BIOS_SRC: source directory of bios assembly
+# - STAGE3: path to linked stage 3 binary
+# - STAGE2_SECTOR: the index of the first sector of the stage 2 binary on the disk
+BIOS_SRC = ./bios
+STAGE2_SECTOR = 5
+STAGE3 = $(BUILD)/tetros.elf 
+$(BUILD)/bios.bin: $(wildcard $(BIOS_SRC)/*.asm) $(STAGE3)
+	@mkdir -p "$(BUILD)"
+	nasm \
+		-f bin \
+		-D STAGE3=$(STAGE3) \
+		-D STAGE2_SECTOR=$(STAGE2_SECTOR) \
+		-o "$@" \
+		-l "$@.lst" \
+		-i "$(BIOS_SRC)" \
+		"$(BIOS_SRC)/main.asm"
+
+# Extract full mbr (first 512 bytes)
+$(BUILD)/mbr.bin: $(BUILD)/bios.bin
+	@mkdir -p "$(BUILD)"
+	@echo ""
+	dd if="$<" bs=512 count=1 of="$@"
+
+# Extract stage 2 (rest of file)
+$(BUILD)/stage2.bin: $(BUILD)/bios.bin
+	@mkdir -p "$(BUILD)"
+	@echo ""
+	dd if="$<" bs=512 skip=1 of="$@"
+
+#
+# MARK: bundle
+#
+
+# Make full disk image
 .PHONY: img
 img: $(BUILD)/disk.img
-$(BUILD)/disk.img:
-	mkdir -p $(BUILD)
-	cd bootloader; make
+$(BUILD)/disk.img: $(BUILD)/mbr.bin $(BUILD)/stage2.bin
+	@mkdir -p $(BUILD)
+	@echo ""
 	dd if=/dev/zero of=$@ bs=512 count=32
-	dd if=./bootloader/build/512.bin of=$@ conv=notrunc bs=512
-	dd if=./bootloader/build/stage2.bin of=$@ conv=notrunc seek=5 bs=512
+	dd if="$(BUILD)/mbr.bin" of=$@ conv=notrunc bs=512
+	dd if="$(BUILD)/stage2.bin" of=$@ conv=notrunc seek=5 bs=512
 
 qemu: $(BUILD)/disk.img
 	qemu-system-i386 \

bootloader/.gitignore

@@ -1 +0,0 @@
-build

bootloader/Makefile

@@ -1,83 +0,0 @@
-# This compiles our bootloader as a static library,
-# and wraps it in a multistage loader.
-
-
-BUILD = ./build
-
-
-.PHONY: all
-all: $(BUILD)/mbr.bin $(BUILD)/512.bin $(BUILD)/stage2.bin
-
-.PHONY: clean
-clean:
-	rm -drf $(BUILD)
-	cd bootloader; cargo clean
-
-# Compile bootloader as library
-LIB_SRC = ./bootloader/Cargo.toml ./bootloader/Cargo.lock $(shell find ./bootloader/src -type f)
-$(BUILD)/bootloader.lib: $(LIB_SRC)
-	@mkdir -p $(BUILD)
-	cd bootloader && \
-		env RUSTFLAGS="-C soft-float" \
-		cargo rustc \
-			--manifest-path="./Cargo.toml" \
-			-Z build-std=core,alloc \
-			-Z build-std-features=compiler-builtins-mem \
-			--target "./targets/x86-unknown-none.json" \
-			--lib \
-			--release \
-			-- \
-			--emit link="$(CURDIR)/$@"
-
-# Link bootloader
-BIOS_LD = ./bootloader/linkers/x86-unknown-none.ld
-$(BUILD)/bootloader.elf: $(BUILD)/bootloader.lib $(BIOS_LD)
-	ld \
-		-m elf_i386 \
-		--gc-sections \
-		-z max-page-size=0x1000 \
-		-T "$(BIOS_LD)" \
-		-o "$@" \
-		"$<"
-
-	objcopy --only-keep-debug "$@" "$@.sym"
-	objcopy --strip-debug "$@"
-
-# Wrap bootloader in three-stage BIOS loader
-# Parameters:
-# - BIOS_SRC: source directory of bios assembly
-# - STAGE3: path to linked stage 3 binary
-# - STAGE2_SECTOR: the index of the first sector of the stage 2 binary on the disk
-BIOS_SRC = ./bios
-STAGE2_SECTOR = 5
-STAGE3 = $(BUILD)/bootloader.elf 
-$(BUILD)/bios.bin: $(wildcard $(BIOS_SRC)/*.asm) $(STAGE3)
-	@mkdir -p "$(BUILD)"
-	nasm \
-		-f bin \
-		-D STAGE3=$(STAGE3) \
-		-D STAGE2_SECTOR=$(STAGE2_SECTOR) \
-		-o "$@" \
-		-l "$@.lst" \
-		-i "$(BIOS_SRC)" \
-		"$(BIOS_SRC)/main.asm"
-
-# Extract MBR code (first 440 bytes)
-# This can be used to embed this mbr in gpt-partitioned disks
-$(BUILD)/mbr.bin: $(BUILD)/bios.bin
-	@mkdir -p "$(BUILD)"
-	@echo ""
-	dd if="$<" bs=440 count=1 of="$@"
-
-# Extract full mbr (first 512 bytes)
-# This can be used to make raw boot disks
-$(BUILD)/512.bin: $(BUILD)/bios.bin
-	@mkdir -p "$(BUILD)"
-	@echo ""
-	dd if="$<" bs=512 count=1 of="$@"
-
-# Extract stage 2 (rest of file)
-$(BUILD)/stage2.bin: $(BUILD)/bios.bin
-	@mkdir -p "$(BUILD)"
-	@echo ""
-	dd if="$<" bs=512 skip=1 of="$@"