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

[boot] Integrate stage 2 into build process

Browse Source
This commit is contained in:
Kevin Lange 2011-02-20 20:15:39 -06:00
parent e64ce6ba38
commit a8a6fce250
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ toaruos-initrd
bootloader/stage1
bootloader/stage2
bootloader/stage2.s
initrd/boot

46
Makefile
View File

@ -3,6 +3,7 @@ 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
YASM = yasm
ECHO = `which echo` -e
MODULES = $(patsubst %.c,%.o,$(wildcard kernel/core/*.c))
FILESYSTEMS = $(patsubst %.c,%.o,$(wildcard kernel/core/fs/*.c))
@ -32,9 +33,9 @@ toaruos-kernel: kernel/start.o kernel/link.ld kernel/main.o ${MODULES} ${FILESYS
@${ECHO} "\r\033[32;1m LD $<\033[0m"
kernel/start.o: kernel/start.asm
@${ECHO} -n "\033[32m nasm kernel/start.asm\033[0m"
@${ECHO} -n "\033[32m nasm $<\033[0m"
@${NASM} -f elf -o kernel/start.o kernel/start.asm
@${ECHO} "\r\033[32;1m nasm kernel/start.asm\033[0m"
@${ECHO} "\r\033[32;1m nasm $<\033[0m"
%.o: %.c
@${ECHO} -n "\033[32m CC $<\033[0m"
@ -44,28 +45,53 @@ kernel/start.o: kernel/start.asm
################
# Ram disk #
################
toaruos-initrd: initrd bootloader/stage1
@${ECHO} -n "\033[32m initrd Generating initial RAM disk\033[0m"
toaruos-initrd: initrd bootloader/stage1 initrd/boot/stage2 initrd/boot/kernel
@${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"
@${ECHO} "\r\033[32;1m initrd Generated initial RAM disk image\033[0m"
### Ram Disk installers...
# Kernel
initrd/boot/kernel: toaruos-kernel
@mkdir -p initrd/boot
@cp toaruos-kernel initrd/boot/kernel
# Second-stage bootloader
initrd/boot/stage2: bootloader/stage2
@mkdir -p initrd/boot
@cp bootloader/stage2 initrd/boot/stage2
################
# 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"
@${ECHO} -n "\033[32m nasm $<\033[0m"
@${NASM} -f bin -o $@ $<
@${ECHO} "\r\033[32;1m nasm $<\033[0m"
bootloader/stage2: bootloader/stage2.s
@${ECHO} -n "\033[32m yasm $<\033[0m"
@${YASM} -p gas -f bin -w: -o $@ $<
@${ECHO} "\r\033[32;1m yasm $<\033[0m"
bootloader/stage2.s: bootloader/stage2.c
@${ECHO} -n "\033[32m CC $<\033[0m"
@${CC} ${CFLAGS} -S -o $@ $<
@${ECHO} "\r\033[32;1m CC $<\033[0m"
clean:
@${ECHO} -n "\033[31m RM Cleaning...\033[0m"
@${ECHO} -n "\033[31m RM Cleaning... \033[0m"
@-rm -f toaruos-kernel
@-rm -f toaruos-initrd
@-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"
@-rm -f bootloader/stage2
@-rm -f bootloader/stage2.s
@-rm -f initrd/boot/stage2
@-rm -f initrd/boot/kernel
@${ECHO} "\r\033[31;1m RM Finished cleaning.\033[0m\033[K"

2
bootloader/stage2.c
View File

@ -11,5 +11,5 @@ __asm__(".code16\n");
* Main entry point
*/
int main() {
// derp?
return 0;
}