From d0c7a3e05a1bb5c9cffd1a0946e403d3a8e37e63 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 31 Jan 2025 19:05:36 +0100 Subject: Match the changes in OpenNE, (without reusing it) Signed-off-by: Amlal El Mahrouss --- dev/Boot/Mod/NetBoot/NetBoot.cc | 2 +- dev/Boot/Mod/NetBoot/build.json | 2 +- dev/Boot/Mod/SysChk/Boot.S | 2 +- dev/Boot/Mod/SysChk/Module.cc | 2 +- dev/Boot/Mod/SysChk/amd64.json | 2 +- dev/Boot/Mod/SysChk/arm64.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'dev/Boot/Mod') diff --git a/dev/Boot/Mod/NetBoot/NetBoot.cc b/dev/Boot/Mod/NetBoot/NetBoot.cc index 18251e69..cd2db5d2 100644 --- a/dev/Boot/Mod/NetBoot/NetBoot.cc +++ b/dev/Boot/Mod/NetBoot/NetBoot.cc @@ -12,7 +12,7 @@ EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover) { -#ifdef __ZKA_AMD64__ +#ifdef __NE_AMD64__ return kEfiFail; #else return kEfiOk; diff --git a/dev/Boot/Mod/NetBoot/build.json b/dev/Boot/Mod/NetBoot/build.json index a19f3cbf..e02f7f13 100644 --- a/dev/Boot/Mod/NetBoot/build.json +++ b/dev/Boot/Mod/NetBoot/build.json @@ -16,7 +16,7 @@ "cpp_macros": [ "__NEOSKRNL__", "__ZBAOSLDR__", - "__ZKA_AMD64__", + "__NE_AMD64__", "kNetBootVersionHighest=0x0100", "kNetBootVersionLowest=0x0100", "kNetBootVersion=0x0100" diff --git a/dev/Boot/Mod/SysChk/Boot.S b/dev/Boot/Mod/SysChk/Boot.S index b5795450..f825c5a9 100644 --- a/dev/Boot/Mod/SysChk/Boot.S +++ b/dev/Boot/Mod/SysChk/Boot.S @@ -7,7 +7,7 @@ ;; * ======================================================== ;; */ -#ifdef __ZKA_AMD64__ +#ifdef __NE_AMD64__ .code64 .intel_syntax noprefix #endif diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc index 0297b177..d655325e 100644 --- a/dev/Boot/Mod/SysChk/Module.cc +++ b/dev/Boot/Mod/SysChk/Module.cc @@ -23,7 +23,7 @@ EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover) { -#ifdef __ZKA_AMD64__ +#ifdef __NE_AMD64__ Boot::BDiskFormatFactory partition_factory; if (partition_factory.IsPartitionValid()) diff --git a/dev/Boot/Mod/SysChk/amd64.json b/dev/Boot/Mod/SysChk/amd64.json index e1e1b818..0fdaec50 100644 --- a/dev/Boot/Mod/SysChk/amd64.json +++ b/dev/Boot/Mod/SysChk/amd64.json @@ -17,7 +17,7 @@ "__NEOSKRNL__", "__ZBAOSLDR__", "__BOOTLDR_STANDALONE__", - "__ZKA_AMD64__", + "__NE_AMD64__", "kChkVersionHighest=0x0100", "kChkVersionLowest=0x0100", "kChkVersion=0x0100" diff --git a/dev/Boot/Mod/SysChk/arm64.json b/dev/Boot/Mod/SysChk/arm64.json index 0e107e28..59cb6189 100644 --- a/dev/Boot/Mod/SysChk/arm64.json +++ b/dev/Boot/Mod/SysChk/arm64.json @@ -18,7 +18,7 @@ "__NEOSKRNL__", "__ZBAOSLDR__", "__BOOTLDR_STANDALONE__", - "__ZKA_ARM64__", + "__NE_ARM64__", "kChkVersionHighest=0x0100", "kChkVersionLowest=0x0100", "kChkVersion=0x0100" -- cgit v1.2.3