From 98110adc9f47666696e18a6c7c97a3edc89c5d90 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Mon, 6 Jan 2025 20:11:53 +0100
Subject: ADD: Fix kernel build and bootloader build on aarch64, add syschk for
 aarch64. WIP: aarch64 on CoreBoot (EFI is unpractical)

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 dev/Boot/Mod/SysChk/Boot.S     |  2 ++
 dev/Boot/Mod/SysChk/Module.cc  |  4 ++++
 dev/Boot/Mod/SysChk/amd64.json | 25 +++++++++++++++++++++++++
 dev/Boot/Mod/SysChk/arm64.json | 26 ++++++++++++++++++++++++++
 dev/Boot/Mod/SysChk/build.json | 25 -------------------------
 5 files changed, 57 insertions(+), 25 deletions(-)
 create mode 100644 dev/Boot/Mod/SysChk/amd64.json
 create mode 100644 dev/Boot/Mod/SysChk/arm64.json
 delete mode 100644 dev/Boot/Mod/SysChk/build.json

(limited to 'dev/Boot/Mod')

diff --git a/dev/Boot/Mod/SysChk/Boot.S b/dev/Boot/Mod/SysChk/Boot.S
index 88904a96..ab0ddc52 100644
--- a/dev/Boot/Mod/SysChk/Boot.S
+++ b/dev/Boot/Mod/SysChk/Boot.S
@@ -7,8 +7,10 @@
 ;; * 	========================================================
 ;; */
 
+#ifdef __ZKA_AMD64__
 .code64
 .intel_syntax noprefix
+#endif
 
 #define kTypeDriver 101
 #define kArchAmd64 122
diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc
index c5edb161..bd89982d 100644
--- a/dev/Boot/Mod/SysChk/Module.cc
+++ b/dev/Boot/Mod/SysChk/Module.cc
@@ -23,10 +23,14 @@
 
 EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
+#ifdef __ZKA_AMD64__
 	Boot::BDiskFormatFactory<BootDeviceATA> partition_factory;
 
 	if (partition_factory.IsPartitionValid())
 		return kEfiOk;
 
 	return kEfiFail;
+#else
+	return kEfiOk;
+#endif
 }
diff --git a/dev/Boot/Mod/SysChk/amd64.json b/dev/Boot/Mod/SysChk/amd64.json
new file mode 100644
index 00000000..2c079889
--- /dev/null
+++ b/dev/Boot/Mod/SysChk/amd64.json
@@ -0,0 +1,25 @@
+{
+  "compiler_path": "x86_64-w64-mingw32-g++",
+  "compiler_std": "c++20",
+  "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"],
+  "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"],
+  "output_name": "syschk.sys",
+  "compiler_flags": [
+    "-ffreestanding",
+    "-nostdlib",
+    "-std=c++20",
+    "-fPIC",
+    "-fno-rtti",
+    "-fno-exceptions",
+    "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain"
+  ],
+  "cpp_macros": [
+    "__MINOSKRNL__",
+    "__ZBAOSLDR__",
+    "__BOOTLDR_STANDALONE__",
+    "__ZKA_AMD64__",
+    "kChkVersionHighest=0x0100",
+    "kChkVersionLowest=0x0100",
+    "kChkVersion=0x0100"
+  ]
+}
diff --git a/dev/Boot/Mod/SysChk/arm64.json b/dev/Boot/Mod/SysChk/arm64.json
new file mode 100644
index 00000000..46cfb081
--- /dev/null
+++ b/dev/Boot/Mod/SysChk/arm64.json
@@ -0,0 +1,26 @@
+{
+  "compiler_path": "clang++",
+  "compiler_std": "c++20",
+  "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"],
+  "sources_path": ["*.cc", "*.S", "../../src/HEL/ARM64/*.cc", "../../src/HEL/ARM64/*.S", "../../src/*.cc"],
+  "output_name": "syschk.sys",
+  "compiler_flags": [
+    "-ffreestanding",
+    "-nostdlib",
+    "-std=c++20",
+    "-fno-rtti",
+    "-fno-exceptions",
+    "-fuse-ld=lld",
+    "-Wl,-subsystem:efi_application,-entry:ModuleMain",
+    "-target aarch64-unknown-windows"
+  ],
+  "cpp_macros": [
+    "__MINOSKRNL__",
+    "__ZBAOSLDR__",
+    "__BOOTLDR_STANDALONE__",
+    "__ZKA_ARM64__",
+    "kChkVersionHighest=0x0100",
+    "kChkVersionLowest=0x0100",
+    "kChkVersion=0x0100"
+  ]
+}
diff --git a/dev/Boot/Mod/SysChk/build.json b/dev/Boot/Mod/SysChk/build.json
deleted file mode 100644
index 2c079889..00000000
--- a/dev/Boot/Mod/SysChk/build.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "compiler_path": "x86_64-w64-mingw32-g++",
-  "compiler_std": "c++20",
-  "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"],
-  "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"],
-  "output_name": "syschk.sys",
-  "compiler_flags": [
-    "-ffreestanding",
-    "-nostdlib",
-    "-std=c++20",
-    "-fPIC",
-    "-fno-rtti",
-    "-fno-exceptions",
-    "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain"
-  ],
-  "cpp_macros": [
-    "__MINOSKRNL__",
-    "__ZBAOSLDR__",
-    "__BOOTLDR_STANDALONE__",
-    "__ZKA_AMD64__",
-    "kChkVersionHighest=0x0100",
-    "kChkVersionLowest=0x0100",
-    "kChkVersion=0x0100"
-  ]
-}
-- 
cgit v1.2.3