no more kernel, this is a bootloader

Author: boredcoder411

Makefile

@@ -1,47 +1,20 @@
-# Automatically generate lists of sources using wildcard.
-C_SOURCES = $(wildcard kernel/*.c kernel/drivers/vga/*.c drivers/*.c kernel/drivers/io/*.c)
-HEADERS = $(wildcard kernel/*.h kernel/drivers/vga/*.h drivers/*.h kernel/drivers/io/*.h)
+all:
+	# actual bootloader
+	nasm -f elf stage2/start_loader.asm -o start_loader.o
+	
+	x86_64-elf-gcc -m32 -ffreestanding -c stage2/fs.c -o fs.o
+	x86_64-elf-gcc -m32 -ffreestanding -c stage2/mbr.c -o mbr.o
+	x86_64-elf-gcc -m32 -ffreestanding -c stage2/loader.c -o loader.o
 
-# Convert *.c filenames to *.o as a list of object files to build.
-OBJ = ${C_SOURCES:.c=.o}
+	x86_64-elf-ld -melf_i386 -o bootloader.bin -Ttext 0x1000 --oformat binary start_loader.o loader.o fs.o mbr.o
 
-# Clean, build, and run.
-all: clean os-image run
+	# stage1
+	nasm -f bin stage1/load_kernel.asm -o load_kernel.bin -D USE_GRAPHICS
 
-# Removes all built files.
 clean:
-	rm -f boot/*.bin
-	rm -f drivers/*.o
-	rm -f example/*.bin example/*.o
-	rm -f kernel/*.bin kernel/*.o
-	rm -f kernel/drivers/vga/*.o
-	rm -f os-image
-
-# Kernel code --------------------------------------------------------------------------------------
-
-# Create kernel binary by linking kernel entry code, kernel main, and other object files.
-kernel/kernel.bin: kernel/enter_kernel.o $(OBJ)
-	x86_64-elf-ld -melf_i386 -o $@ -Ttext 0x1000 --oformat binary $^
-
-# Create executable image by prepending kernel binary with boot sector.
-os-image: boot/load_kernel.bin kernel/kernel.bin
-	cat $^ > $@
-
-# Compile assembly sources into binary.
-%.bin: %.asm
-	nasm $< -f bin -o $@ -D USE_GRAPHICS
-	#nasm $< -f bin -o $@
-
-# Assemble the kernel entry to an object file.
-%.o: %.asm
-	nasm $< -f elf -o $@
-
-# Compile C sources into object files.
-%.o: %.c
-	x86_64-elf-gcc -m32 -ffreestanding -c $< -o $@
-
-# --------------------------------------------------------------------------------------------------
-
-# Run operating system on emulated x86.
-run: os-image
-	qemu-system-x86_64 -drive file=$<,format=raw -net none -no-reboot -no-shutdown -monitor stdio --enable-kvm
+	rm -f load_kernel.bin
+	rm -f start_loader.o
+	rm -f loader.o
+	rm -f bootloader.bin
+	rm -f fs.o
+	rm -f mbr.o

bochsrc.txt

@@ -1,6 +1,6 @@
 megs: 128
 romimage: file=/usr/share/bochs/BIOS-bochs-latest, address=0xfffe0000
 vgaromimage: file=/home/dev/VGABIOS/VGABIOS-lgpl-latest.bin
-floppya: 1_44=os-image, status=inserted
-boot: floppy
+ata0-master: type=disk, path="image.img", mode=flat
+boot: disk
 mouse: enabled=0