summaryrefslogtreecommitdiffhomepage
path: root/dev/Boot/amd64-desktop.make
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-03-11 08:10:55 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-03-11 08:10:55 +0100
commit0a2760d8a5ce09ae77cfc097ece4100579164f9d (patch)
tree38be73d31c13aa0ac3a7883dfd22cc2b8208dbb9 /dev/Boot/amd64-desktop.make
parentc6d9cc48540b380583fc2bb8fcfe59a9113d0e19 (diff)
Many AHCI improvements and IPC tweaks.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/Boot/amd64-desktop.make')
-rw-r--r--dev/Boot/amd64-desktop.make17
1 files changed, 10 insertions, 7 deletions
diff --git a/dev/Boot/amd64-desktop.make b/dev/Boot/amd64-desktop.make
index ae2a8aca..2c8c5321 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=-net none -smp 4 -m 8G \
+EMU_FLAGS=-M q35 -net none -smp 4 -m 8G \
-bios $(BIOS) -cdrom $(BOOT) -boot d -drive \
file=fat:rw:src/Root/,index=3,format=raw
endif
@@ -94,11 +94,14 @@ all: compile-amd64
$(COPY) ./Mod/SysChk/$(SYSCHK) src/Root/$(SYSCHK)
$(COPY) ../LibSCI/$(SCIKIT) src/Root/$(SCIKIT)
$(COPY) src/$(BOOTLOADER) src/Root/$(BOOTLOADER)
- xorriso -as mkisofs -R -r -J \
- -no-emul-boot -boot-load-size 4 -boot-info-table -hfsplus \
- -apm-block-size 2048 --efi-boot EFI/BOOT/BOOTX64.EFI \
- -efi-boot-part --efi-boot-image --protective-msdos-label \
- src/Root -o $(BOOT)
+ xorriso -as mkisofs \
+ -iso-level 3 \
+ -r -V NeOS \
+ -J -joliet-long \
+ -append_partition 2 0xef src/Root/EFI/BOOT/BOOTX64.EFI \
+ -partition_cyl_align all \
+ -o $(BOOT) \
+ src/Root/
ifneq ($(DEBUG_SUPPORT), )
@@ -115,7 +118,7 @@ compile-amd64:
.PHONY: run-efi-amd64-ahci
run-efi-amd64-ahci:
- $(EMU) $(EMU_FLAGS) -hda $(IMG) -s -S -trace ahci_* -boot menu=on
+ $(EMU) $(EMU_FLAGS) -drive id=disk,file=$(IMG),if=none -device ich9-ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -s -S -trace ahci_* -boot menu=on
.PHONY: run-efi-amd64-ata-pio
run-efi-amd64-ata-pio: