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

[boot] Ug, ext2, make a boot floppy instead...

Browse Source
This commit is contained in:
Kevin Lange 2011-02-21 19:41:37 -06:00
parent ebd3efb47b
commit 7c74503da7
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -5,6 +5,5 @@ toaruos-initrd
bootloader/stage1.bin bootloader/stage1.bin
bootloader/stage2.bin bootloader/stage2.bin
initrd/kernel initrd/kernel
initrd/stage2
.gdb_history .gdb_history
testdisk bootdisk.img

15
Makefile
View File

@ -45,7 +45,7 @@ kernel/start.o: kernel/start.asm
################ ################
# Ram disk # # Ram disk #
################ ################
toaruos-initrd: initrd bootloader/stage1.bin initrd/stage2 initrd/kernel toaruos-initrd: initrd/kernel
@${ECHO} -n "\033[32m initrd Generating initial RAM disk\033[0m" @${ECHO} -n "\033[32m initrd Generating initial RAM disk\033[0m"
@-rm -f toaruos-initrd @-rm -f toaruos-initrd
@${GENEXT} -d initrd -q -b 249 toaruos-initrd @${GENEXT} -d initrd -q -b 249 toaruos-initrd
@ -58,10 +58,6 @@ toaruos-initrd: initrd bootloader/stage1.bin initrd/stage2 initrd/kernel
initrd/kernel: toaruos-kernel initrd/kernel: toaruos-kernel
@cp toaruos-kernel initrd/kernel @cp toaruos-kernel initrd/kernel
# Second-stage bootloader
initrd/stage2: bootloader/stage2.bin
@cp bootloader/stage2.bin initrd/stage2
################ ################
# Bootloader # # Bootloader #
################ ################
@ -98,11 +94,10 @@ bootloader/stage2.bin: bootloader/stage2/main.o bootloader/stage2/start.o bootlo
@${LD} -o bootloader/stage2.bin -T bootloader/stage2/link.ld bootloader/stage2/start.o bootloader/stage2/main.o @${LD} -o bootloader/stage2.bin -T bootloader/stage2/link.ld bootloader/stage2/start.o bootloader/stage2/main.o
@${ECHO} "\r\033[32;1m ld $<\033[0m" @${ECHO} "\r\033[32;1m ld $<\033[0m"
testdisk: bootloader/stage1.bin bootloader/stage2.bin bootdisk.img: bootloader/stage1.bin bootloader/stage2.bin
@${ECHO} "\033[31;1m WARN This disk is a temporary development test only!\033[0m" @${ECHO} -n "\033[34m -- Building bootdisk.img...\033[0m"
@${ECHO} -n "\033[34m -- Building tesdisk...\033[0m" @cat bootloader/stage1.bin bootloader/stage2.bin > bootdisk.img
@cat bootloader/stage1.bin bootloader/stage2.bin > testdisk @${ECHO} "\r\033[34;1m -- Bootdisk is ready! \033[0m"
@${ECHO} "\r\033[34;1m -- Testdisk compiled. \033[0m"
############### ###############
# clean # # clean #