فهرست منبع

Add ability to boot from either floppy or usb

Johannes Zellner 8 ماه پیش
والد
کامیت
e7269022a7
2فایلهای تغییر یافته به همراه51 افزوده شده و 15 حذف شده
  1. 28 6
      Makefile
  2. 23 9
      boot.S

+ 28 - 6
Makefile

@@ -13,9 +13,9 @@ ASFLAGS  = --32
 BOOT_LDFLAGS   = -T linker.ld -nostdlib -m elf_i386
 BOOT_LDFLAGS   = -T linker.ld -nostdlib -m elf_i386
 KERNEL_LDFLAGS = -T kernel.ld -nostdlib -m elf_i386
 KERNEL_LDFLAGS = -T kernel.ld -nostdlib -m elf_i386
 
 
-.PHONY: all clean run
+.PHONY: all clean run run-floppy run-usb floppy usb
 
 
-all: image.bin final.bin root.img
+all: floppy.img usb.img final.bin root.img
 
 
 boot.o: boot.S
 boot.o: boot.S
 	$(AS) $(ASFLAGS) -o $@ $<
 	$(AS) $(ASFLAGS) -o $@ $<
@@ -99,7 +99,7 @@ kernel.bin: kernel.elf
 	$(OBJCOPY) -O binary $< $@
 	$(OBJCOPY) -O binary $< $@
 
 
 KERNEL_SECTORS_OFFSET = 62
 KERNEL_SECTORS_OFFSET = 62
-image.bin: boot.bin kernel.bin
+floppy.img: boot.bin kernel.bin
 	SECTORS=$$(( ($$(stat -c%s kernel.bin) + 511) / 512 )); \
 	SECTORS=$$(( ($$(stat -c%s kernel.bin) + 511) / 512 )); \
 	cp boot.bin boot.bin.patched; \
 	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; \
 	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; \
@@ -107,6 +107,17 @@ image.bin: boot.bin kernel.bin
 	truncate -s 1474560 $@; \
 	truncate -s 1474560 $@; \
 	rm -f boot.bin.patched
 	rm -f boot.bin.patched
 
 
+usb.img: 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 > $@; \
+	truncate -s 64M $@; \
+	rm -f boot.bin.patched
+
+image.bin: floppy.img
+	cp floppy.img image.bin
+
 final.bin: boot.bin kernel.bin
 final.bin: boot.bin kernel.bin
 	SECTORS=$$(( ($$(stat -c%s kernel.bin) + 511) / 512 )); \
 	SECTORS=$$(( ($$(stat -c%s kernel.bin) + 511) / 512 )); \
 	cp boot.bin boot.bin.patched; \
 	cp boot.bin boot.bin.patched; \
@@ -141,8 +152,19 @@ root.img: prog.bin space.bin
 	mcopy -i $@ space.bin ::SPACE.BIN
 	mcopy -i $@ space.bin ::SPACE.BIN
 
 
 run: image.bin root.img
 run: image.bin root.img
-	qemu-system-i386 -M pc -drive file=image.bin,format=raw,if=floppy -drive file=root.img,format=raw,if=floppy 2>/dev/null || \
-	qemu-system-x86_64 -M pc -drive file=image.bin,format=raw,if=floppy -drive file=root.img,format=raw,if=floppy
+	$(MAKE) run-floppy
+
+floppy: floppy.img
+
+usb: usb.img
+
+run-floppy: floppy.img root.img
+	qemu-system-i386 -M pc -drive file=floppy.img,format=raw,if=floppy -drive file=root.img,format=raw,if=floppy 2>/dev/null || \
+	qemu-system-x86_64 -M pc -drive file=floppy.img,format=raw,if=floppy -drive file=root.img,format=raw,if=floppy
+
+run-usb: usb.img root.img
+	qemu-system-i386 -M pc -boot c -drive file=usb.img,format=raw,if=ide -drive file=root.img,format=raw,if=floppy 2>/dev/null || \
+	qemu-system-x86_64 -M pc -boot c -drive file=usb.img,format=raw,if=ide -drive file=root.img,format=raw,if=floppy
 
 
 clean:
 clean:
-	rm -f boot.o kernel.o timer.o switch.o process.o io.o rtc.o terminal.o hello.o reboot.o fat.o ls.o cat.o run.o disk.o vga.o ati.o font_8x8.o fbtext.o clock.o colors.o display.o boot.elf kernel.elf boot.bin kernel.bin boot.bin.tmp boot.bin.patched image.bin final.bin root.img prog.o prog.elf prog.bin space.o space.elf space.bin
+	rm -f boot.o kernel.o timer.o switch.o process.o io.o rtc.o terminal.o hello.o reboot.o fat.o ls.o cat.o run.o disk.o vga.o ati.o font_8x8.o fbtext.o clock.o colors.o display.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

+ 23 - 9
boot.S

@@ -106,7 +106,25 @@ load_loop:
 	jz    load_done
 	jz    load_done
 	pushw %cx
 	pushw %cx
 	pushw %si
 	pushw %si
-	/* CHS from LBA in SI */
+	movb  boot_drive, %dl
+	cmpb  $0x80, %dl
+	jb    read_chs
+	/* LBA read via INT 13h AH=42h. DAP at 0:0x500. */
+	xorw  %ax, %ax
+	movw  %ax, 0x50a
+	movw  %ax, 0x50c
+	movw  %ax, 0x50e
+	movb  $0x10, 0x500
+	movb  %al, 0x501
+	incw  %ax
+	movw  %ax, 0x502
+	movw  %bx, 0x504
+	movw  %es, 0x506
+	movw  %si, 0x508
+	movw  $0x500, %si
+	movb  $0x42, %ah
+	jmp   do_int13
+read_chs:
 	movw  %si, %ax
 	movw  %si, %ax
 	xorw  %dx, %dx
 	xorw  %dx, %dx
 	movw  $18, %di
 	movw  $18, %di
@@ -121,6 +139,7 @@ load_loop:
 	movb  boot_drive, %dl
 	movb  boot_drive, %dl
 	movb  $0x02, %ah
 	movb  $0x02, %ah
 	movb  $1, %al
 	movb  $1, %al
+do_int13:
 	int   $0x13
 	int   $0x13
 	popw  %si
 	popw  %si
 	popw  %cx
 	popw  %cx
@@ -135,9 +154,8 @@ load_loop:
 	jnz   load_loop
 	jnz   load_loop
 
 
 load_done:
 load_done:
-	movw  $0x7DFC, %bx
 	movb  boot_drive, %al
 	movb  boot_drive, %al
-	movb  %al, (%bx)
+	movb  %al, 0x600
 
 
 	/* Enable A20 gate (address bit 20).  Try three methods. */
 	/* Enable A20 gate (address bit 20).  Try three methods. */
 	movw  $0x2401, %ax	/* Method 1: BIOS */
 	movw  $0x2401, %ax	/* Method 1: BIOS */
@@ -165,11 +183,9 @@ load_done:
 	.long pm_start
 	.long pm_start
 	.word 0x08
 	.word 0x08
 
 
-	.align 4
 boot_drive:
 boot_drive:
 	.byte 0
 	.byte 0
-
-	.align 8
+	.align 2
 gdt:
 gdt:
 	.quad 0
 	.quad 0
 	.word 0xffff, 0x0000
 	.word 0xffff, 0x0000
@@ -200,10 +216,8 @@ pm_start:
 	movw  %ax, %fs
 	movw  %ax, %fs
 	movw  %ax, %gs
 	movw  %ax, %gs
 	movw  %ax, %ss
 	movw  %ax, %ss
-	/* Stack above DMA buffer 0x20000-0x20200 so DMA does not overwrite stack */
 	movl  $0x20800, %esp
 	movl  $0x20800, %esp
-	movl  $0x7e00, %eax
-	jmp   *%eax
+	ljmp  $0x08, $0x7e00
 
 
 .section .bootsig
 .section .bootsig
 .byte 0x55, 0xaa
 .byte 0x55, 0xaa