diff --git a/Makefile b/Makefile index 63ac6f50..8edbf60e 100644 --- a/Makefile +++ b/Makefile @@ -33,9 +33,9 @@ toaruos-kernel: kernel/start.o kernel/link.ld kernel/main.o ${MODULES} ${FILESYS @${ECHO} "\r\033[32;1m LD $<\033[0m" @${ECHO} "\033[34;1m -- Kernel is ready!\033[0m" -kernel/start.o: kernel/start.asm +kernel/start.o: kernel/start.s @${ECHO} -n "\033[32m yasm $<\033[0m" - @${YASM} -f elf -o kernel/start.o kernel/start.asm + @${YASM} -f elf -o kernel/start.o kernel/start.s @${ECHO} "\r\033[32;1m yasm $<\033[0m" %.o: %.c diff --git a/kernel/main.c b/kernel/main.c index b007cf3d..0810b6ca 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -60,7 +60,7 @@ int main(struct multiboot *mboot_ptr, uint32_t mboot_mag) char * ramdisk = NULL; if (mboot_mag == MULTIBOOT_EAX_MAGIC) { boot_mode = multiboot; - /* Realing memory to the end of the multiboot modules */ + /* Realign memory to the end of the multiboot modules */ kmalloc_startat(0x200000); if (mboot_ptr->flags & (1 << 3)) { if (mboot_ptr->mods_count > 0) { diff --git a/kernel/start.asm b/kernel/start.s similarity index 100% rename from kernel/start.asm rename to kernel/start.s