From 5fcbdb0b19b3c7a94856071586c282240da7d560 Mon Sep 17 00:00:00 2001
From: Lauchmelder <robert.trololo@gmail.com>
Date: Thu, 20 Jan 2022 12:58:47 +0100
Subject: [PATCH] kernel boots again
---
Makefile | 9 +++++++--
src/boot.o | Bin 0 -> 1208 bytes
src/kernel.c | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 src/boot.o
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 0000000000000000000000000000000000000000..a7804c13797c6480602d47424cd6e2abbf287008
GIT binary patch
literal 1208
zcmbW0u}T9$5QhKD1x?gKQ7{k?g8>^k5F%IzSp~(yLc4VFLIMVif!r3+MwC2&iZ7r~
zU?KP<f-fT2oin*zGi)w}8My4sxAV`<X6J4XPmVI42WuWaFp4Y%`k9fhhOR;$IlN%^
zvy@d&`@lQll{*i$D)7i_#zWyAs8k2|ImqJdHI8=%K#lUAzvFmySmqx;erjic57C^c
z=hIG_`N)pp<jmtdAzAD>3d@zl7bsp#sXsg9PBMkd6ZqN$j&dL6ChGM@6xAag_O$ie
zH!XC+_EqwZO0u9x2b(uOFZLXCH<%M#8J|ZXC-|}8dBG7x*Bu=;Xw|)By|A8c^)-TK
zs6zzQCW2n;G7Ojojc!-VDpUJKQu3Y6I2Du=+mLgml_+55PKc68!guwXw8#I`wEAt*
za?MHopVFQ*c_+-b=;0Yu^ho<Mjh-9G^*PV#3x;!A+E?>n_Sa1vo?F(sdY%RM>@0mV
Yx(yD58T?0<$V=1jnx^cWT7j$o1yCJ3$^ZZW
literal 0
HcmV?d00001
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")