diff options
| author | Marvin Borner | 2019-10-31 17:47:40 +0100 |
|---|---|---|
| committer | GitHub | 2019-10-31 17:47:40 +0100 |
| commit | c7e755cb843593db1eedb26c5c24932bbe743745 (patch) | |
| tree | ad14da17e6d0d883e68cc6eacc99ae522036dda8 /Makefile | |
| parent | fd4f0a11126a20e75d72f8f2e6d418598fd5f37d (diff) | |
| parent | 40a214f3c69a3d7da8c2f9bed5038dfa0ab72d4b (diff) | |
Merged pull request usermode
Added usermode
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -18,7 +18,7 @@ build: clean nasm -f elf ./src/kernel/boot.asm -o ./build/boot.o || exit; \ # Make all C files - find ./src/kernel/ -name \*.c >./build/tmp; \ + find ./src/kernel/ ./src/userspace/ -name \*.c >./build/tmp; \ while read -r line; do \ stripped=$$(echo "$${line}" | sed -r 's/\//_/g'); \ stripped=$${stripped#??????}; \ @@ -40,7 +40,10 @@ build: clean # Create ISO mkdir -p ./iso/boot/grub; \ cp ./build/melvix.bin ./iso/boot/; \ - cp ./src/kernel/grub.cfg ./iso/boot/grub/; \ + cp ./src/bootloader/grub.cfg ./iso/boot/grub/; \ + gcc -w ./src/bootloader/make_initrd.c -o ./build/make_initrd || exit; \ + ./build/make_initrd ./src/bootloader/test.txt test.txt || exit; \ + mv initrd.img ./iso/boot/melvix.initrd || exit; \ grub-mkrescue -o ./build/melvix.iso ./iso/; cross: @@ -75,7 +78,7 @@ debug: @rm -f qemu.log @echo "Starting simulation" @echo "[SERIAL OUTPUT]" - @qemu-system-x86_64 -no-reboot -soundhw pcspk -M accel=kvm:tcg -vga std -serial stdio -d cpu_reset -D qemu.log -m 512M -cdrom ./build/melvix.iso + @qemu-system-x86_64 -no-reboot -soundhw pcspk -M accel=kvm:tcg -vga std -serial stdio -rtc base=localtime -d cpu_reset -D qemu.log -m 512M -cdrom ./build/melvix.iso @echo "[END OF CONNECTION]" .PHONY: build clean cross test debug
\ No newline at end of file |