From b6464d3fcd11ad43d1d0421fa8484eda2ac1708f Mon Sep 17 00:00:00 2001 From: Amlal Date: Wed, 29 Jan 2025 09:15:17 +0100 Subject: WiP: Tweaks and will finish SATA support and ATA (DMA) support. Signed-off-by: Amlal --- dev/Boot/Mod/NetBoot/build.json | 2 +- dev/Boot/Mod/SysChk/amd64.json | 2 +- dev/Boot/Mod/SysChk/arm64.json | 2 +- dev/Boot/amd64-desktop.make | 4 ++-- dev/Boot/arm64-desktop.make | 2 +- dev/Boot/arm64-mobile.make | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'dev/Boot') diff --git a/dev/Boot/Mod/NetBoot/build.json b/dev/Boot/Mod/NetBoot/build.json index 9df27b3c..a19f3cbf 100644 --- a/dev/Boot/Mod/NetBoot/build.json +++ b/dev/Boot/Mod/NetBoot/build.json @@ -14,7 +14,7 @@ "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" ], "cpp_macros": [ - "__MINOSKRNL__", + "__NEOSKRNL__", "__ZBAOSLDR__", "__ZKA_AMD64__", "kNetBootVersionHighest=0x0100", diff --git a/dev/Boot/Mod/SysChk/amd64.json b/dev/Boot/Mod/SysChk/amd64.json index 2c079889..e1e1b818 100644 --- a/dev/Boot/Mod/SysChk/amd64.json +++ b/dev/Boot/Mod/SysChk/amd64.json @@ -14,7 +14,7 @@ "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" ], "cpp_macros": [ - "__MINOSKRNL__", + "__NEOSKRNL__", "__ZBAOSLDR__", "__BOOTLDR_STANDALONE__", "__ZKA_AMD64__", diff --git a/dev/Boot/Mod/SysChk/arm64.json b/dev/Boot/Mod/SysChk/arm64.json index 46cfb081..0e107e28 100644 --- a/dev/Boot/Mod/SysChk/arm64.json +++ b/dev/Boot/Mod/SysChk/arm64.json @@ -15,7 +15,7 @@ "-target aarch64-unknown-windows" ], "cpp_macros": [ - "__MINOSKRNL__", + "__NEOSKRNL__", "__ZBAOSLDR__", "__BOOTLDR_STANDALONE__", "__ZKA_ARM64__", diff --git a/dev/Boot/amd64-desktop.make b/dev/Boot/amd64-desktop.make index c13a718f..34ae629e 100644 --- a/dev/Boot/amd64-desktop.make +++ b/dev/Boot/amd64-desktop.make @@ -42,7 +42,7 @@ REM=rm REM_FLAG=-f FLAG_ASM=-f win64 -FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__MINOSKRNL__ -D__ZBAOSLDR__ \ +FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEOSKRNL__ -D__ZBAOSLDR__ \ -DEFI_FUNCTION_WRAPPER -I./ -I../Kernel -I../ -c -nostdlib -fno-rtti -fno-exceptions \ -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ -DZKA_AUTO_FORMAT @@ -90,7 +90,7 @@ run-efi-amd64-ahci: .PHONY: run-efi-amd64-ata run-efi-amd64-ata: - $(EMU) $(EMU_FLAGS) -enable-kvm -device piix4-ide,id=ide -drive id=disk,file=$(IMG),format=raw,if=none -device ide-hd,drive=disk,bus=ide.0 -s -S + $(EMU) $(EMU_FLAGS) -M q35 -enable-kvm -device piix4-ide,id=ide -drive id=disk,file=$(IMG),format=raw,if=none -device ide-hd,drive=disk,bus=ide.0 -s -S # img_2 is the rescue disk. img is the bootable disk, as provided by the Zeta specs. .PHONY: epm-img diff --git a/dev/Boot/arm64-desktop.make b/dev/Boot/arm64-desktop.make index 91affa01..16341b21 100644 --- a/dev/Boot/arm64-desktop.make +++ b/dev/Boot/arm64-desktop.make @@ -45,7 +45,7 @@ REM_FLAG=-f FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__ZKA_ARM64__ -fno-rtti -fno-exceptions -I./ \ -target aarch64-unknown-windows \ - -std=c++20 -DBOOTZ_EPM_SUPPORT -DZBA_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__MINOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel + -std=c++20 -DBOOTZ_EPM_SUPPORT -DZBA_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel BOOT_LOADER=zbaosldr.exe KERNEL=neoskrnl.exe diff --git a/dev/Boot/arm64-mobile.make b/dev/Boot/arm64-mobile.make index ce940788..9ca37b89 100644 --- a/dev/Boot/arm64-mobile.make +++ b/dev/Boot/arm64-mobile.make @@ -46,7 +46,7 @@ REM_FLAG=-f FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__ZKA_ARM64__ -fno-rtti -fno-exceptions -I./ \ -target aarch64-unknown-windows \ - -std=c++20 -DBOOTZ_EPM_SUPPORT -DkExpectedWidth=320 -DkExpectedHeight=480 -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__MINOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel + -std=c++20 -DBOOTZ_EPM_SUPPORT -DkExpectedWidth=320 -DkExpectedHeight=480 -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel BOOT_LOADER=zbaosldr.exe KERNEL=neoskrnl.exe -- cgit v1.2.3