Merge pull request #41 from nekernel-org/dev

NeKernel v0.0.3e1

2 files changed, 8 insertions, 3 deletions

diff --git a/dev/boot/modules/BootNet/BootNet.cc b/dev/boot/modules/BootNet/BootNet.cc
index ba9beef4..8236dd0d 100644
--- a/dev/boot/modules/BootNet/BootNet.cc
+++ b/dev/boot/modules/BootNet/BootNet.cc
@@ -44,11 +44,16 @@ EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover) {
     return kEfiFail;
   }
 
+  if (inet_out->Version != kBootNetVersion) {
+    writer.Write("BootNet: The version clashes, not good.\r");
+    return kEfiFail;
+  }
+
   if (!inet_out->ImpliesProgram) {
     Boot::BootThread thread(inet_out->Data);
 
     if (thread.IsValid()) {
-      writer.Write("BootNet: Running kernel...\r");
+      writer.Write("BootNet: Running NeKernel...\r");
       return thread.Start(handover, YES);
     }
 
@@ -57,7 +62,7 @@ EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover) {
     constexpr auto kROMSize = 0x200;
 
     if (inet_out->Length > kROMSize) {
-      writer.Write("BootNet: Not within 512K.\r");
+      writer.Write("BootNet: Not within 512K, won't flash EEPROM.\r");
       return kEfiFail;
     }
 
diff --git a/dev/boot/modules/BootNet/amd64.json b/dev/boot/modules/BootNet/amd64.json
index 912eeb0b..3d58cbc1 100644
--- a/dev/boot/modules/BootNet/amd64.json
+++ b/dev/boot/modules/BootNet/amd64.json
@@ -18,6 +18,6 @@
     "__NE_AMD64__",
     "kBootNetVersionHighest=0x0100",
     "kBootNetVersionLowest=0x0100",
-    "kBootNetVersion=0x0100"
+    "kBootNetEFIVersion=0x0100"
   ]
 }