diff --git a/Makefile b/Makefile index 1f78e5f..8fe1023 100644 --- a/Makefile +++ b/Makefile @@ -14,15 +14,20 @@ OFILES = $(_OFILES:src/%=out/%) all: clean kernel8.img +out/boot.o: src/boot.S + @echo "Building $@" + @mkdir -p $(@D) + @$(CC) -c $< -o $@ $(GCCLFAGS) + out/%.o: src/%.c $(HFILES) @echo "Building $@" @mkdir -p $(@D) @$(CC) -Iinclude -c $< -o $@ $(GCCLFAGS) -kernel8.img: $(OFILES) +kernel8.img: out/boot.o $(OFILES) @echo "Linking kernel" @mkdir -p bin - @$(LD) -nostdlib $(OFILES) -T link.ld -o out/kernel8.elf + @$(LD) -nostdlib out/boot.o $(OFILES) -T link.ld -o out/kernel8.elf @$(OBJCOPY) -O binary out/kernel8.elf bin/kernel8.img @echo "Done!" diff --git a/src/boot.o b/src/boot.o new file mode 100644 index 0000000..a7804c1 Binary files /dev/null and b/src/boot.o differ diff --git a/src/kernel.c b/src/kernel.c index 1b075f4..de1d5ab 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -27,7 +27,7 @@ void main() int a = stoi(uart_gets(buffer)); uart_puts("\nPlease enter second operand\n"); - uart_puts("📎> "); + uart_puts("📎 "); uart_gets(buffer); if(buffer == "clippy")