5 files changed, 21 insertions, 11 deletions
diff --git a/src/boot/modules/SysChk/SysChk.cpp b/src/boot/modules/SysChk/SysChk.cpp
index e8c5af06..c7217504 100644
--- a/src/boot/modules/SysChk/SysChk.cpp
+++ b/src/boot/modules/SysChk/SysChk.cpp
@@ -30,7 +30,7 @@ EXTERN_C Int32 SysChkModuleMain(Kernel::HEL::BootInfoHeader* handover) {
   Boot::BDiskFormatFactory<Boot::BootDeviceSATA> partition_factory;
 #endif
 
-  if (partition_factory.IsPartitionValid()) return kEfiOk;
+  if (!partition_factory.IsPartitionValid()) return kEfiFail;
 
   return partition_factory.Format(kMachineModel);
 }
diff --git a/src/boot/modules/SysChk/amd64-ahci-epm.json b/src/boot/modules/SysChk/amd64-ahci-epm.json
index 444003cf..43b0bff7 100644
--- a/src/boot/modules/SysChk/amd64-ahci-epm.json
+++ b/src/boot/modules/SysChk/amd64-ahci-epm.json
@@ -34,6 +34,7 @@
     "__SYSCHK__",
     "BOOTZ_EPM_SUPPORT",
     "__nekernel_max_cores=8",
+    "__nekernel_dma_best_align=8",
     "__nekernel_dma_pool_start=0x1000000",
     "__nekernel_dma_pool_size=0x1000000",
     "__nekernel_halkit_include_processor=\"<HALKit/AMD64/Processor.h>\"",
diff --git a/src/boot/modules/SysChk/amd64-ahci-gpt.json b/src/boot/modules/SysChk/amd64-ahci-gpt.json
index 9b0f4546..d36f66bf 100644
--- a/src/boot/modules/SysChk/amd64-ahci-gpt.json
+++ b/src/boot/modules/SysChk/amd64-ahci-gpt.json
@@ -31,6 +31,7 @@
     "__NE_AMD64__",
     "__AHCI__",
     "__nekernel_max_cores=8",
+    "__nekernel_dma_best_align=8",
     "__nekernel_dma_pool_start=0x1000000",
     "__nekernel_dma_pool_size=0x1000000",
     "__nekernel_halkit_include_processor=\"<HALKit/AMD64/Processor.h>\"",
diff --git a/src/boot/modules/SysChk/amd64-pio-epm.json b/src/boot/modules/SysChk/amd64-pio-epm.json
index 0c4a1c59..7e4b1d4e 100644
--- a/src/boot/modules/SysChk/amd64-pio-epm.json
+++ b/src/boot/modules/SysChk/amd64-pio-epm.json
@@ -9,14 +9,21 @@
     "./"
   ],
   "sources_path": [
-    "*.cpp",
-    "*.S",
-    "../../src/HEL/AMD64/BootATA.cpp",
-    "../../src/HEL/AMD64/BootPlatform.cpp",
-    "../../src/HEL/AMD64/BootAPI.S",
-    "../../src/BootTextWriter.cpp",
-    "../../src/BootSupport.cpp",
-    "../../src/New+Delete.cpp"
+      "*.cpp",
+      "*.S",
+      "../../src/HEL/AMD64/BootATA.cpp",
+      "../../src/HEL/AMD64/BootPlatform.cpp",
+      "../../src/HEL/AMD64/BootAPI.S",
+      "../../src/BootTextWriter.cpp",
+      "../../src/BootSupport.cpp",
+      "../../src/New+Delete.cpp",
+      "../../../kernel/HALKit/AMD64/PCI/*.cpp",
+      "../../../kernel/HALKit/AMD64/Storage/*.cpp",
+      "../../../kernel/src/Storage/*.cpp",
+      "../../../kernel/src/Network/*.cpp",
+      "../../../kernel/HALKit/AMD64/*.cpp",
+      "../../../kernel/HALKit/AMD64/*.s",
+      "../../../kernel/src/*.cpp"
   ],
   "output_name": "chk.efi",
   "compiler_flags": [
@@ -28,15 +35,15 @@
   ],
   "cpp_macros": [
     "__NEOSKRNL__",
-    "__BOOTZ__",
-    "__BOOTZ_STANDALONE__",
     "__NE_AMD64__",
     "__nekernel_max_cores=8",
+    "__nekernel_dma_best_align=8",
     "__nekernel_dma_pool_start=0x1000000",
     "__nekernel_dma_pool_size=0x1000000",
     "__nekernel_halkit_include_processor=\"<HALKit/AMD64/Processor.h>\"",
     "__ATA_PIO__",
     "BOOTZ_EPM_SUPPORT",
+    "__NE_MODULAR_KERNEL_COMPONENTS__",
     "__NE_VEPM__",
     "kChkVersionHighest=0x0100",
     "kChkVersionLowest=0x0100",
diff --git a/src/boot/modules/SysChk/amd64-pio-gpt.json b/src/boot/modules/SysChk/amd64-pio-gpt.json
index ca564067..d954daed 100644
--- a/src/boot/modules/SysChk/amd64-pio-gpt.json
+++ b/src/boot/modules/SysChk/amd64-pio-gpt.json
@@ -34,6 +34,7 @@
     "__ATA_PIO__",
     "__NE_VEPM__",
     "__nekernel_max_cores=8",
+    "__nekernel_dma_best_align=8",
     "__nekernel_dma_pool_start=0x1000000",
     "__nekernel_dma_pool_size=0x1000000",
     "__nekernel_halkit_include_processor=\"<HALKit/AMD64/Processor.h>\"",