diff --git a/.gitignore b/.gitignore index bb620419..670f43f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.bin -*.flp \ No newline at end of file +*.flp +*.o \ No newline at end of file diff --git a/Makefile b/Makefile index 4b32af2a..36f61ed1 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,6 @@ micro_kernel.bin: $(KERNEL_SRC) $(KERNEL_UTILS_SRC) kernel.o: src/kernel.cpp g++ -Wall -Wextra -O2 -fno-exceptions -fno-rtti -ffreestanding -c src/kernel.cpp -o kernel.o -kernel2.bin: kernel.o - ld -e kernel_main -Ttext 0x10000 -o kernel.bin.o kernel.o - ld -e kernel_main -i -Ttext 0x10000 -o kernel.bin.o kernel.o - objcopy -R .note -R .comment -S -O binary kernel.bin.o kernel.bin - kernel.bin: kernel.o g++ -T linker.ld -o kernel.bin.o -ffreestanding -O2 -nostdlib kernel.o objcopy -R .note -R .comment -S -O binary kernel.bin.o kernel.bin diff --git a/kernel.bin.o b/kernel.bin.o deleted file mode 100755 index 79a4a050..00000000 Binary files a/kernel.bin.o and /dev/null differ diff --git a/kernel.o b/kernel.o deleted file mode 100644 index f668e50b..00000000 Binary files a/kernel.o and /dev/null differ diff --git a/src/commands.asm b/src/commands.asm index 9e688cbc..93740b16 100644 --- a/src/commands.asm +++ b/src/commands.asm @@ -565,6 +565,7 @@ date_command: ret load_command: + call 0x5000 ret diff --git a/src/kernel.cpp b/src/kernel.cpp index feb49f2b..49f93e5d 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -1,6 +1,6 @@ extern "C" void kernel_main(){ - unsigned char *vidmem = (unsigned char*) 0xB80000; + unsigned char *vidmem = (unsigned char*) 0x0B8000; *vidmem = 'a'; }