summaryrefslogtreecommitdiffhomepage
path: root/dev/boot
diff options
context:
space:
mode:
Diffstat (limited to 'dev/boot')
-rw-r--r--dev/boot/amd64-desktop.make4
-rw-r--r--dev/boot/modules/SysChk/amd64-ahci-epm.json1
-rw-r--r--dev/boot/src/HEL/AMD64/BootAPI.S10
3 files changed, 13 insertions, 2 deletions
diff --git a/dev/boot/amd64-desktop.make b/dev/boot/amd64-desktop.make
index b5e49cb0..7687e3c6 100644
--- a/dev/boot/amd64-desktop.make
+++ b/dev/boot/amd64-desktop.make
@@ -49,7 +49,7 @@ DEBUG_MACRO = -D__DEBUG__
endif
ifeq ($(shell uname), Darwin)
-EMU_FLAGS=-M q35 -smp 4 -m 8G \
+EMU_FLAGS=-M q35 -smp 4 -m 8G \
-bios $(BIOS) -cdrom $(BOOT) -boot d
endif
@@ -117,7 +117,7 @@ compile-amd64:
.PHONY: run-efi-amd64-ahci
run-efi-amd64-ahci:
- $(EMU) $(EMU_FLAGS) -d int -hda $(IMG) -s -S -trace ahci_* -boot menu=on
+ $(EMU) $(EMU_FLAGS) -serial stdio -hda $(IMG) -s -S -boot menu=on
.PHONY: run-efi-amd64-ata-pio
run-efi-amd64-ata-pio:
diff --git a/dev/boot/modules/SysChk/amd64-ahci-epm.json b/dev/boot/modules/SysChk/amd64-ahci-epm.json
index 91c95941..8ce9bfd8 100644
--- a/dev/boot/modules/SysChk/amd64-ahci-epm.json
+++ b/dev/boot/modules/SysChk/amd64-ahci-epm.json
@@ -14,6 +14,7 @@
"../../../kernel/HALKit/AMD64/PCI/*.cc",
"../../../kernel/HALKit/AMD64/Storage/*.cc",
"../../../kernel/src/Storage/*.cc",
+ "../../../kernel/src/Network/*.cc",
"../../../kernel/HALKit/AMD64/*.cc",
"../../../kernel/HALKit/AMD64/*.s",
"../../../kernel/src/*.cc"
diff --git a/dev/boot/src/HEL/AMD64/BootAPI.S b/dev/boot/src/HEL/AMD64/BootAPI.S
index 43775fc2..2c0005ac 100644
--- a/dev/boot/src/HEL/AMD64/BootAPI.S
+++ b/dev/boot/src/HEL/AMD64/BootAPI.S
@@ -5,6 +5,16 @@
.intel_syntax noprefix
+.global hal_load_idt
+
+hal_load_idt:
+ ret
+
+.global sched_jump_to_task
+
+sched_jump_to_task:
+ ret
+
/**
@brief this function setups a stack and then jumps to
a function */