diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | arch/x86_64/boot/README.md | 5 | ||||
| -rw-r--r-- | arch/x86_64/boot/boot.asm (renamed from src/arch/x86_64/boot.asm) | 0 | ||||
| -rw-r--r-- | arch/x86_64/boot/grub.cfg (renamed from src/arch/x86_64/grub.cfg) | 0 | ||||
| -rw-r--r-- | arch/x86_64/boot/linker.ld (renamed from src/arch/x86_64/linker.ld) | 0 | ||||
| -rw-r--r-- | arch/x86_64/boot/long_mode_init.asm (renamed from src/arch/x86_64/long_mode_init.asm) | 0 | ||||
| -rw-r--r-- | arch/x86_64/boot/multiboot_header.asm (renamed from src/arch/x86_64/multiboot_header.asm) | 0 |
7 files changed, 10 insertions, 5 deletions
@@ -2,10 +2,10 @@ arch ?= x86_64 kernel := build/kernel-$(arch).bin iso := build/os-$(arch).iso -linker_script := src/arch/$(arch)/linker.ld -grub_cfg := src/arch/$(arch)/grub.cfg -assembly_source_files := $(wildcard src/arch/$(arch)/*.asm) -assembly_object_files := $(patsubst src/arch/$(arch)/%.asm, \ +linker_script := arch/$(arch)/boot/linker.ld +grub_cfg := arch/$(arch)/boot/grub.cfg +assembly_source_files := $(wildcard arch/$(arch)/boot/*.asm) +assembly_object_files := $(patsubst arch/$(arch)/boot/%.asm, \ build/arch/$(arch)/%.o, $(assembly_source_files)) .PHONY: all clean run iso @@ -31,6 +31,6 @@ $(kernel): $(assembly_object_files) $(linker_script) @ld -n -T $(linker_script) -o $(kernel) $(assembly_object_files) # compile assembly files -build/arch/$(arch)/%.o: src/arch/$(arch)/%.asm +build/arch/$(arch)/%.o: arch/$(arch)/boot/%.asm @mkdir -p $(shell dirname $@) @nasm -felf64 $< -o $@ diff --git a/arch/x86_64/boot/README.md b/arch/x86_64/boot/README.md new file mode 100644 index 0000000..c7cc505 --- /dev/null +++ b/arch/x86_64/boot/README.md @@ -0,0 +1,5 @@ + +Most of the code in this folder is based on Philipp Oppermann's blog os. +https://github.com/phil-opp/blog_os + +Copyright (c) 2019 Philipp Oppermann diff --git a/src/arch/x86_64/boot.asm b/arch/x86_64/boot/boot.asm index 2e334a8..2e334a8 100644 --- a/src/arch/x86_64/boot.asm +++ b/arch/x86_64/boot/boot.asm diff --git a/src/arch/x86_64/grub.cfg b/arch/x86_64/boot/grub.cfg index 7c34c9c..7c34c9c 100644 --- a/src/arch/x86_64/grub.cfg +++ b/arch/x86_64/boot/grub.cfg diff --git a/src/arch/x86_64/linker.ld b/arch/x86_64/boot/linker.ld index 5d788f1..5d788f1 100644 --- a/src/arch/x86_64/linker.ld +++ b/arch/x86_64/boot/linker.ld diff --git a/src/arch/x86_64/long_mode_init.asm b/arch/x86_64/boot/long_mode_init.asm index eab3788..eab3788 100644 --- a/src/arch/x86_64/long_mode_init.asm +++ b/arch/x86_64/boot/long_mode_init.asm diff --git a/src/arch/x86_64/multiboot_header.asm b/arch/x86_64/boot/multiboot_header.asm index 9a9289c..9a9289c 100644 --- a/src/arch/x86_64/multiboot_header.asm +++ b/arch/x86_64/boot/multiboot_header.asm |