Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[boot] Some Makefile integration

This commit is contained in:
Kevin Lange 2011-02-18 22:22:25 -06:00
parent abe96d9c54
commit 9e31a2c07c
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -2,12 +2,13 @@
CC = clang
CFLAGS = -Wall -Wextra -pedantic -m32 -O0 -std=c99 -finline-functions -fno-stack-protector -nostdinc -ffreestanding -Wno-unused-function -Wno-unused-parameter
LD = ld -m elf_i386
NASM = nasm -f elf
NASM = nasm
ECHO = `which echo` -e
MODULES = $(patsubst %.c,%.o,$(wildcard kernel/core/*.c))
FILESYSTEMS = $(patsubst %.c,%.o,$(wildcard kernel/core/fs/*.c))
EMU = qemu
GENEXT = genext2fs
DD = dd conv=notrunc
.PHONY: all clean install run
@ -22,6 +23,9 @@ install: toaruos-kernel toaruos-initrd
run: toaruos-kernel toaruos-initrd
${EMU} -kernel toaruos-kernel -initrd toaruos-initrd -serial stdio
################
# Kernel #
################
toaruos-kernel: kernel/start.o kernel/link.ld kernel/main.o ${MODULES} ${FILESYSTEMS}
@${ECHO} -n "\033[32m LD $<\033[0m"
@${LD} -T kernel/link.ld -o toaruos-kernel kernel/*.o kernel/core/*.o kernel/core/fs/*.o
@ -29,7 +33,7 @@ toaruos-kernel: kernel/start.o kernel/link.ld kernel/main.o ${MODULES} ${FILESYS
kernel/start.o: kernel/start.asm
@${ECHO} -n "\033[32m nasm kernel/start.asm\033[0m"
@${NASM} -o kernel/start.o kernel/start.asm
@${NASM} -f elf -o kernel/start.o kernel/start.asm
@${ECHO} "\r\033[32;1m nasm kernel/start.asm\033[0m"
%.o: %.c
@ -37,12 +41,25 @@ kernel/start.o: kernel/start.asm
@${CC} ${CFLAGS} -I./kernel/include -c -o $@ $<
@${ECHO} "\r\033[32;1m CC $<\033[0m"
toaruos-initrd: initrd
################
# Ram disk #
################
toaruos-initrd: initrd bootloader/stage1
@${ECHO} -n "\033[32m initrd Generating initial RAM disk\033[0m"
@-rm -f toaruos-initrd
@${GENEXT} -d initrd -q -b 249 toaruos-initrd
@${DD} if=bootloader/stage1 of=toaruos-initrd 2>/dev/null
@${ECHO} "\r\033[32;1m initrd Generated initial RAM disk image\033[0m"
################
# Bootloader #
################
bootloader/stage1: bootloader/stage1.s
@${ECHO} -n "\033[32m nasm bootloader/stage1.s\033[0m"
@${NASM} -f bin -o bootloader/stage1 bootloader/stage1.s
@${ECHO} "\r\033[32;1m nasm bootloader/stage1.s\033[0m"
clean:
@${ECHO} -n "\033[31m RM Cleaning...\033[0m"
@-rm -f toaruos-kernel
@ -50,4 +67,5 @@ clean:
@-rm -f kernel/*.o
@-rm -f kernel/core/*.o
@-rm -f kernel/core/fs/*.o
@-rm -f bootloader/stage1
@${ECHO} "\r\033[31;1m RM Finished cleaning.\033[0m"

30
bootloader/stage1.s
View File

@ -4,15 +4,39 @@
[ORG 0x7C00] ; Start point
start:
; jmp loader ; Jump over the MBR bits
;
;; MBR OEM Parameter Block
;bpbOEM db "ToAruOS "
;bpbBytesPerSector dw 512
;bpbSectorsPerCluster db 1
;bpbReservedSectors dw 1
;bpbNumberoOfFATs db 2
;bpbRootEntries dw 224
;bpbTotalSectors dw 2880
;bpbMedia db 0xf0
;bpbSectorsPerFAT dw 9
;bpbSectorsPerTrack dw 18
;bpbHeadsPerCylinder dw 2
;bpbHiddenSectors dd 0
;bpbTotalSectorsBig dd 0
;bsDriveNumber db 0
;bsUnused db 0
;bsExtBootSignature db 0x29
;bsSerialNumber dd 0xdeadbeef
;bsVolumeLabel db "ToAru Boot "
;bsFileSystem db "FAT12 "
;
;loader:
mov ax, 0x00 ; Initialize data segment
mov ds, ax ; ...
mov si, bmsg ; Print "Starting..."
call print ; ...
mov ax, 0x4F02 ; VESA function "Set Video Mode"
mov bx, 0x0107 ; 1024x768x256
int 0x10 ; BIOS video interrupt
;mov ax, 0x4F02 ; VESA function "Set Video Mode"
;mov bx, 0x0107 ; 1024x768x256
;int 0x10 ; BIOS video interrupt
jmp $ ; sadloop