summaryrefslogtreecommitdiffhomepage
path: root/dev/Boot
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-03-12 05:45:50 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-03-12 05:45:50 +0100
commit5f1939a987a776f25abd971ebd2366f1a1c481f2 (patch)
tree918b83de095e59fe7d96a1eb187415d00abe9b9c /dev/Boot
parent91769a67225c0be49ccafeea85a7f699735ad0b3 (diff)
AHCI.cc: Better AHCI driver.
Build: Use FAT32 emulated on a USB-stick. Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/Boot')
-rw-r--r--dev/Boot/amd64-desktop.make18
1 files changed, 7 insertions, 11 deletions
diff --git a/dev/Boot/amd64-desktop.make b/dev/Boot/amd64-desktop.make
index 362c74cf..a62a779b 100644
--- a/dev/Boot/amd64-desktop.make
+++ b/dev/Boot/amd64-desktop.make
@@ -28,7 +28,7 @@ BIOS=OVMF.fd
IMG=epm-master-1.img
IMG_2=epm-master-2.img
-BOOT=neos.iso
+BOOT=./src/fat32.img
DISK_DRV =
@@ -92,15 +92,11 @@ 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 \
- -iso-level 3 \
- -full-iso9660-filenames \
- -volid "NEOS_ISO" \
- -o $(BOOT) \
- -e EFI/BOOT/BOOTX64.EFI \
- -no-emul-boot -boot-load-size 4 -boot-info-table \
- -no-emul-boot -isohybrid-gpt-basdat \
- src/Root/
+
+.PHONY: disk
+disk:
+ dd if=/dev/zero of=$(BOOT) bs=1M count=100
+ mformat -i $(BOOT) -F -v "NEOS_ESP"
ifneq ($(DEBUG_SUPPORT), )
@@ -117,7 +113,7 @@ compile-amd64:
.PHONY: run-efi-amd64-ahci
run-efi-amd64-ahci:
- $(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
+ $(EMU) $(EMU_FLAGS) -hda $(IMG) -s -S -trace ahci_* -boot menu=on
.PHONY: run-efi-amd64-ata-pio
run-efi-amd64-ata-pio: