Rename kernel.cpp to kmain.cpp, update Makefile and kernel.ld

This commit is contained in:
Xnoe 2021-11-11 21:55:04 +00:00
parent 0f5e080e15
commit 01fef9d947
Signed by: xnoe
GPG Key ID: 45AC398F44F0DAFE
3 changed files with 2 additions and 2 deletions

View File

@ -4,7 +4,7 @@ LDFLAGS =
DISK_IMG_FILES = build/kernel/kernel.bin hello.txt alpha.txt DISK_IMG_FILES = build/kernel/kernel.bin hello.txt alpha.txt
KERNEL_OBJS = build/kernel/entry.o build/kernel/screenstuff.o build/kernel/io.o build/kernel/idt.o build/kernel/keyboard.o \ KERNEL_OBJS = build/kernel/entry.o build/kernel/screenstuff.o build/kernel/io.o build/kernel/idt.o build/kernel/keyboard.o \
build/kernel/strings.o build/kernel/atapio.o build/kernel/kernel.o build/kernel/paging.o build/kernel/allocate.o \ build/kernel/strings.o build/kernel/atapio.o build/kernel/kmain.o build/kernel/paging.o build/kernel/allocate.o \
build/kernel/gdt.o build/kernel/memory.o build/kernel/process.o build/kernel/datatypes/hash.o \ build/kernel/gdt.o build/kernel/memory.o build/kernel/process.o build/kernel/datatypes/hash.o \
build/kernel/terminal.o build/kernel/global.o build/kernel/terminal.o build/kernel/global.o
STAGE2_OBS = build/c_code_entry.o build/boot_stage2/io.o build/boot_stage2/atapio.o build/boot_stage2/strings.o build/boot_stage2/screenstuff.o build/boot_stage2/stage2.o build/boot_stage2/paging.o STAGE2_OBS = build/c_code_entry.o build/boot_stage2/io.o build/boot_stage2/atapio.o build/boot_stage2/strings.o build/boot_stage2/screenstuff.o build/boot_stage2/stage2.o build/boot_stage2/paging.o

View File

@ -8,7 +8,7 @@ SECTIONS {
.text : { .text : {
build/kernel/entry.o(.text) build/kernel/entry.o(.text)
build/kernel/kernel.o(.text) build/kernel/kmain.o(.text)
build/kernel/*(.text) build/kernel/*(.text)
build/kernel/datatypes/*(.text) build/kernel/datatypes/*(.text)
} }