summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2017-05-21 10:00:06 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2017-05-21 10:00:06 +0200
commita998c2b6ab7fbfc2b0a15a3de92632178c3564dd (patch)
treea86066741c7474f98809224bce2df42e53a0e4cd /src/Makefile
parentd0385783af3f7e3567f19330dede6a96fd80ddab (diff)
downloadabaos-a998c2b6ab7fbfc2b0a15a3de92632178c3564dd.tar.gz
abaos-a998c2b6ab7fbfc2b0a15a3de92632178c3564dd.tar.bz2
added implementation of interrupts (IDT construction and loading), currently not
working yet. added A20 gate check reorganized some code, so it's easier to debug interrupt handlers in assembly
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile
index e46db57..9ffa885 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,18 +8,18 @@ MAGIC := $(shell printf '%x' `date +%s`)
all: image.bin kernel.sym
+# truncate to correct number of sectors, we have
+# 512 (boot, stage 1) + N * 512 (N currenty is 3, stage 2) = 2048 for boot.bin
+# + M * 512 (M is currently 7) = 3144 for kernel.bin
+# + 1 * 512 = 512 for magic.bin
+# (M + N + 1 is the number of sectors to be read in stage 2, as stage 1
+# loads only the first sector, so adapt NOF_LOAD_SECTORS to 18)
image.bin: boot.bin kernel.bin magic.bin
cat boot.bin kernel.bin > image.tmp
- # truncate to correct number of sectors, we have
- # 512 (boot, stage 1) + N * 512 (N currenty is 3, stage 2) = 2048 for boot.bin
- # + M * 512 (M is currently 7) = 3144 for kernel.bin
- # + 1 * 512 = 512 for magic.bin
- # (M + N + 1 is the number of sectors to be read in stage 2, as stage 1
- # loads only the first sector, so adapt NOF_LOAD_SECTORS to 16)
- truncate -s 8192 image.tmp
+ truncate -s 9216 image.tmp
cat image.tmp magic.bin > image.bin
-boot.bin: boot.asm boot_gdt.asm stage1_functions.asm stage2_functions.asm switch_mode.asm
+boot.bin: boot.asm boot_gdt.asm stage1_functions.asm stage2_functions.asm stage2_switch_mode.asm stage2_a20.asm
$(NASM) boot.asm -DMAGIC='"$(MAGIC)"' -f bin -o boot.bin
kernel.bin: kernel.elf