Johannes Zellner 5 сар өмнө
parent
commit
dc2625fdc7
2 өөрчлөгдсөн 50 нэмэгдсэн , 6 устгасан
  1. 17 3
      Makefile
  2. 33 3
      boot.S

+ 17 - 3
Makefile

@@ -128,6 +128,17 @@ process.o: process.c process.h io.h
 kernel.elf: vesa_stage.o kernel.o timer.o switch.o process.o io.o rtc.o terminal.o hello.o reboot.o poweroff.o disk.o fat.o ls.o cat.o run.o serial.o serial_loop.o serial_recv.o bin_recv.o vga.o vga_copy.o gpu.o ati.o nvidia.o font_8x8.o fbtext.o clock.o colors.o display.o cpuinfo.o mouse.o mousecmd.o idle.o
 	$(LD) $(KERNEL_LDFLAGS) -o $@ $^
 
+MBR_LDFLAGS = -T mbr.ld -nostdlib -m elf_i386
+
+mbr.o: mbr.S
+	$(AS) $(ASFLAGS) -o $@ $<
+
+mbr.elf: mbr.o
+	$(LD) $(MBR_LDFLAGS) -o $@ $<
+
+mbr.bin: mbr.elf
+	$(OBJCOPY) -O binary $< $@
+
 boot.bin: boot.elf
 	$(OBJCOPY) -O binary --only-section=.boot $< $@.tmp
 	dd if=$@.tmp of=$@ bs=1 count=510 2>/dev/null
@@ -138,6 +149,8 @@ kernel.bin: kernel.elf
 	$(OBJCOPY) -O binary $< $@
 
 KERNEL_SECTORS_OFFSET = 62
+BOOT_SECTOR_START_OFFSET = 0x57
+
 floppy.img: boot.bin kernel.bin
 	SECTORS=$$(( ($$(stat -c%s kernel.bin) + 511) / 512 )); \
 	cp boot.bin boot.bin.patched; \
@@ -146,11 +159,12 @@ floppy.img: boot.bin kernel.bin
 	truncate -s 1474560 $@; \
 	rm -f boot.bin.patched
 
-usb.img: boot.bin kernel.bin
+usb.img: mbr.bin boot.bin kernel.bin
 	SECTORS=$$(( ($$(stat -c%s kernel.bin) + 511) / 512 )); \
 	cp boot.bin boot.bin.patched; \
 	printf "$$(printf '\\x%02x\\x%02x' $$((SECTORS & 0xFF)) $$((SECTORS >> 8)))" | dd of=boot.bin.patched bs=1 seek=$(KERNEL_SECTORS_OFFSET) conv=notrunc 2>/dev/null; \
-	cat boot.bin.patched kernel.bin > $@; \
+	printf '\x02' | dd of=boot.bin.patched bs=1 seek=$(BOOT_SECTOR_START_OFFSET) conv=notrunc 2>/dev/null; \
+	cat mbr.bin boot.bin.patched kernel.bin > $@; \
 	truncate -s 64M $@; \
 	rm -f boot.bin.patched
 
@@ -235,4 +249,4 @@ send_serial: send_serial.c
 	gcc -O2 -o $@ $<
 
 clean:
-	rm -f boot.o vesa_stage.o kernel.o timer.o switch.o process.o io.o rtc.o terminal.o hello.o reboot.o poweroff.o fat.o ls.o cat.o run.o disk.o serial.o serial_loop.o serial_recv.o bin_recv.o vga.o vga_copy.o gpu.o ati.o nvidia.o font_8x8.o fbtext.o clock.o colors.o display.o cpuinfo.o mouse.o mousecmd.o idle.o boot.elf kernel.elf boot.bin kernel.bin boot.bin.tmp boot.bin.patched image.bin floppy.img usb.img final.bin root.img prog.o prog.elf prog.bin space.o space.elf space.bin send_serial
+	rm -f boot.o vesa_stage.o kernel.o timer.o switch.o process.o io.o rtc.o terminal.o hello.o reboot.o poweroff.o fat.o ls.o cat.o run.o disk.o serial.o serial_loop.o serial_recv.o bin_recv.o vga.o vga_copy.o gpu.o ati.o nvidia.o font_8x8.o fbtext.o clock.o colors.o display.o cpuinfo.o mouse.o mousecmd.o idle.o mbr.o boot.elf kernel.elf mbr.elf boot.bin mbr.bin kernel.bin boot.bin.tmp boot.bin.patched image.bin floppy.img usb.img final.bin root.img prog.o prog.elf prog.bin space.o space.elf space.bin send_serial

+ 33 - 3
boot.S

@@ -7,7 +7,27 @@
 .globl _start
 _start:
 	.byte 0xEB, 0x3E, 0x90
-	.space 0x3E - 3, 0
+	/* ---- BPB (BIOS Parameter Block) ---- */
+	.ascii "NEBOS   "        /* OEM name */
+	.word 512                /* bytes per sector */
+	.byte 4                  /* sectors per cluster */
+	.word 1                  /* reserved sectors */
+	.byte 2                  /* number of FATs */
+	.word 512                /* root entries */
+	.word 0                  /* total sectors 16-bit (use 32-bit) */
+	.byte 0xF8               /* media descriptor (hard disk) */
+	.word 128                /* sectors per FAT */
+	.word 63                 /* sectors per track */
+	.word 128                /* number of heads */
+	.long 0                  /* hidden sectors */
+	.long 131072             /* total sectors 32-bit */
+	/* ---- Extended BPB ---- */
+	.byte 0x80               /* drive number */
+	.byte 0x00               /* reserved */
+	.byte 0x29               /* boot signature */
+	.long 0x12345678         /* volume ID */
+	.ascii "NEBOS      "     /* volume label */
+	.ascii "FAT16   "        /* filesystem type */
 
 	.org 0x3E
 kernel_sectors:
@@ -94,5 +114,15 @@ halt:
 1:	hlt
 	jmp   1b
 
-.section .bootsig
-.byte 0x55, 0xaa
+	.org 0x1BE
+/* MBR partition table: one active partition at LBA 0 (USB/HDD). */
+	.byte 0x80              /* bootable */
+	.byte 0x00, 0x01, 0x00  /* CHS start: C=0, H=0, S=1 */
+	.byte 0x06              /* type: FAT16 LBA (matches BPB) */
+	.byte 0xFF, 0xFF, 0xFF  /* CHS end: max values */
+	.long 0                 /* LBA start */
+	.long 131072            /* sector count (64MB) */
+	.space 48, 0            /* 3 empty partition entries */
+
+	.org 0x1FE
+	.word 0xAA55