bootloader, netboot: integrate EFI_SIMPLE_NETWORK_PROTOCOL for HTTP-based kernel fetching

- Added BootNet module to support network boot using EFI_SIMPLE_NETWORK_PROTOCOL
- Replaced ModuleMain with BootloaderMain as unified entry point
- Implemented EFI protocol discovery, startup, and logging for netboot
- Updated linker scripts, GDB configs, and build targets accordingly
- Laid groundwork for full HTTP/TCP/IP bootloader logic
- Improved kernel handoff logic and memory allocation fallback handling

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

10 files changed, 112 insertions, 51 deletions

diff --git a/dev/boot/BootKit/Device.h b/dev/boot/BootKit/Device.h
index 77c6cd32..88574bd6 100644
--- a/dev/boot/BootKit/Device.h
+++ b/dev/boot/BootKit/Device.h
@@ -28,7 +28,7 @@ public:
 
 	virtual Trait& Leak() = 0;
 
-	virtual Device& Read(Char* Buf, SizeT SecCount)	= 0;
+	virtual Device& Read(Char* Buf, SizeT SecCount)	 = 0;
 	virtual Device& Write(Char* Buf, SizeT SecCount) = 0;
 };
 
diff --git a/dev/boot/amd64-ci.make b/dev/boot/amd64-ci.make
index ae451e26..9ee61eed 100644
--- a/dev/boot/amd64-ci.make
+++ b/dev/boot/amd64-ci.make
@@ -56,7 +56,7 @@ EMU_FLAGS= -smp 4 -m 8G \
     -bios $(BIOS) -M q35 -cdrom $(BOOT) -boot d -accel kvm
 endif
 
-LD_FLAGS=-e ModuleMain --subsystem=10
+LD_FLAGS=-e BootloaderMain --subsystem=10
 
 STANDALONE_MACRO=-D__BOOTZ_STANDALONE__
 OBJ=obj/*.o
diff --git a/dev/boot/amd64-desktop.make b/dev/boot/amd64-desktop.make
index 3adbfb33..3ed2ba3f 100644
--- a/dev/boot/amd64-desktop.make
+++ b/dev/boot/amd64-desktop.make
@@ -58,7 +58,7 @@ EMU_FLAGS= -smp 4 -m 8G \
     -bios $(BIOS) -M q35 -cdrom $(BOOT) -boot d -accel kvm
 endif
 
-LD_FLAGS=-e ModuleMain --subsystem=10
+LD_FLAGS=-e BootloaderMain --subsystem=10
 
 STANDALONE_MACRO=-D__BOOTZ_STANDALONE__
 OBJ=obj/*.o
diff --git a/dev/boot/arm64-desktop.make b/dev/boot/arm64-desktop.make
index a553e908..06ec84d0 100644
--- a/dev/boot/arm64-desktop.make
+++ b/dev/boot/arm64-desktop.make
@@ -34,7 +34,7 @@ EMU_FLAGS= -smp 4 -m 8G -cpu max -M virt \
 			file=fat:rw:src/root/,index=2,format=raw \
 		    -no-shutdown -no-reboot -cpu cortex-a72 -device virtio-gpu-pci
 
-LD_FLAGS=-subsystem:efi_application -entry:ModuleMain /nodefaultlib
+LD_FLAGS=-subsystem:efi_application -entry:BootloaderMain /nodefaultlib
 
 STANDALONE_MACRO=-D__BOOTZ_STANDALONE__
 OBJ=*.o
diff --git a/dev/boot/gdbinit b/dev/boot/gdbinit
index e5b29f38..b55fa645 100644
--- a/dev/boot/gdbinit
+++ b/dev/boot/gdbinit
@@ -1,3 +1,3 @@
 set disassemble-next-line on
-b ModuleMain
+b BootloaderMain
 target remote localhost:1234
diff --git a/dev/boot/modules/BootNet/BootNet.cc b/dev/boot/modules/BootNet/BootNet.cc
index 8ee08929..28d96cb2 100644
--- a/dev/boot/modules/BootNet/BootNet.cc
+++ b/dev/boot/modules/BootNet/BootNet.cc
@@ -7,29 +7,40 @@
  * 	========================================================
  */
 
+#include <FirmwareKit/EFI/API.h>
 #include <modules/BootNet/BootNet.h>
 #include <BootKit/BootKit.h>
 #include <BootKit/BootThread.h>
 
-STATIC EfiGUID kEfiIP4ProtoGUID = {};
+STATIC EfiGUID kEfiSimpleProtoGUID = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
+STATIC EFI_SIMPLE_NETWORK_PROTOCOL* kEfiProtocol = nullptr;
 
-STATIC Void bootnet_read_udp_packet(BOOTNET_INTERNET_HEADER&);
+STATIC Void bootnet_read_ip_packet(BOOTNET_INTERNET_HEADER&);
 
 EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
+	fw_init_efi((EfiSystemTable*)handover->f_FirmwareCustomTables[0]);
+
+
+	Boot::BootTextWriter writer;
+
+	if (BS->LocateProtocol(&kEfiSimpleProtoGUID, nullptr, (VoidPtr*)&kEfiProtocol) != kEfiOk)
+	{
+		writer.Write("[BOOT] BootNet: Not supported by firmware.\r");
+		return kEfiFail;
+	}
+
 	BOOTNET_INTERNET_HEADER inet{};
 
-	memset(&inet, 0, sizeof(BOOTNET_INTERNET_HEADER));
-	
-	bootnet_read_udp_packet(inet);
+	SetMem(&inet, 0, sizeof(BOOTNET_INTERNET_HEADER));
 
-	/// TODO: Read address from JSON file 'bootnet.json'
+	writer.Write("[BOOT] BootNet: Downloading kernel...\r");
+
+	bootnet_read_ip_packet(inet);
 
 	if (inet.Length < 1)
 	{
-		Boot::BootTextWriter writer;
-		writer.Write("BootNet: No executable attached to the packet, aborting.\r");
-
+		writer.Write("[BOOT] BootNet: No executable attached to the packet, aborting.\r");
 		return kEfiFail;
 	}
 
@@ -38,23 +49,39 @@ EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover)
 		Boot::BootThread thread(inet.Data);
 
 		if (thread.IsValid())
+		{
+			writer.Write("[BOOT] BootNet: Running kernel...\r");
 			return thread.Start(handover, YES);
+		}
 
 		return kEfiFail;
 	}
 	else
 	{
-		Boot::BootTextWriter writer;
-		writer.Write("BootNetLauncher: EEPROM flash is not available as of right now.\r");
+		constexpr auto kROMSize = 0x200;
+
+		if (inet.Length != kROMSize)
+		{
+			writer.Write("[BOOT] BootNet: Not within 512K.\r");
+			return kEfiFail;
+		}
+
+		writer.Write("[BOOT] BootNet: Programming the flash is not available as of right now.\r");
 
 		/// TODO: Program new firmware to EEPROM (if crc and size matches)
 
-		return kEfiFail; // TODO: Add support for EEPROM firmware update.
+		const UIntPtr kEEPROMAddress = 0;
+		const UInt16  kEEPROMSize	 = inet.Length;
 	}
 
 	return kEfiFail;
 }
 
-STATIC Void bootnet_read_udp_packet(BOOTNET_INTERNET_HEADER&)
+STATIC Void bootnet_read_ip_packet(BOOTNET_INTERNET_HEADER& inet)
 {
+	kEfiProtocol->Start(kEfiProtocol);
+
+	NE_UNUSED(inet);
+
+	kEfiProtocol->Stop(kEfiProtocol);
 }
\ No newline at end of file
diff --git a/dev/boot/modules/BootNet/BootNet.h b/dev/boot/modules/BootNet/BootNet.h
index aba7924f..b38ed0e9 100644
--- a/dev/boot/modules/BootNet/BootNet.h
+++ b/dev/boot/modules/BootNet/BootNet.h
@@ -29,5 +29,5 @@ typedef struct BOOTNET_INTERNET_HEADER
 	Kernel::Char	Target[kBootNetNameLen]; /// the target file.
 	Kernel::Boolean ImpliesProgram : 1;		 /// does it imply an EEPROM reprogram?
 	Kernel::Boolean Preflight : 1;			 /// is it a preflight packet.
-	Kernel::Char	Data[];					 /// non preflight packet has a patch blob for a **PatchTarget**
+	Kernel::Char	Data[1];				 /// non preflight packet has a patch blob for a **PatchTarget**
 } ATTRIBUTE(packed) BOOTNET_INTERNET_HEADER;
diff --git a/dev/boot/modules/SysChk/arm64.json b/dev/boot/modules/SysChk/arm64.json
index 1f91326e..ad5fde6e 100644
--- a/dev/boot/modules/SysChk/arm64.json
+++ b/dev/boot/modules/SysChk/arm64.json
@@ -11,7 +11,7 @@
     "-fno-rtti",
     "-fno-exceptions",
     "-fuse-ld=lld",
-    "-Wl,-subsystem:efi_application,-entry:ModuleMain",
+    "-Wl,-subsystem:efi_application,-entry:BootloaderMain",
     "-target aarch64-unknown-windows"
   ],
   "cpp_macros": [
diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc
index 4220c6cb..a818fcd6 100644
--- a/dev/boot/src/HEL/AMD64/BootEFI.cc
+++ b/dev/boot/src/HEL/AMD64/BootEFI.cc
@@ -73,19 +73,19 @@ STATIC Bool boot_init_fb() noexcept
 EfiGUID kEfiGlobalNamespaceVarGUID = {
 	0x8BE4DF61, 0x93CA, 0x11D2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C}};
 
-/// @brief ModuleMain EFI entrypoint.
+/// @brief BootloaderMain EFI entrypoint.
 /// @param image_handle Handle of this image.
 /// @param sys_table The system table of it.
 /// @return nothing, never returns.
-EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
-									  EfiSystemTable* sys_table)
+EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr	  image_handle,
+										  EfiSystemTable* sys_table)
 {
-	InitEFI(sys_table); ///! Init the EFI library.
+	fw_init_efi(sys_table); ///! Init the EFI library.
 
 	HEL::BootInfoHeader* handover_hdr =
 		new HEL::BootInfoHeader();
 
-	UInt32				 map_key		 = 0;
+	UInt32 map_key = 0;
 
 #ifdef ZBA_USE_FB
 	if (!boot_init_fb())
@@ -163,12 +163,10 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 
 	Boot::BootTextWriter writer;
 
-	//-------------------------------------------------------------//
-	// Update handover file specific table and phyiscal start field.
-	//-------------------------------------------------------------//
+	handover_hdr->f_BitMapStart = nullptr;			 /* Start of bitmap. */
+	handover_hdr->f_BitMapSize	= kHandoverBitMapSz; /* Size of bitmap in bytes. */
 
-	handover_hdr->f_BitMapSize = gib_cast(4); /* Size of bitmap in bytes. */
-	Int32 trials			   = 5 * 10000000;
+	Int32 trials = 5 * 10000000;
 
 	while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
 	{
@@ -180,7 +178,7 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 
 			trials = 3 * 10000000;
 
-			handover_hdr->f_BitMapSize = gib_cast(2); /* Size of bitmap in bytes. */
+			handover_hdr->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */
 
 			while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
 			{
@@ -221,8 +219,6 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 			FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
 
 			fb_clear();
-
-			Boot::Stop();
 		}
 	}
 
@@ -288,6 +284,7 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 		kernel_thread->SetName("BootZ: Kernel");
 
 		handover_hdr->f_KernelImage = reader_kernel.Blob();
+		handover_hdr->f_KernelSz	= reader_kernel.Size();
 	}
 	else
 	{
@@ -297,6 +294,8 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 		Boot::Stop();
 	}
 
+	// Fallback to bootnet, if not PXE.
+
 	Boot::BootFileReader reader_netboot(L"net.efi", image_handle);
 	reader_netboot.ReadAll(0);
 
diff --git a/dev/boot/src/HEL/ARM64/BootEFI.cc b/dev/boot/src/HEL/ARM64/BootEFI.cc
index b6f28351..72ac310b 100644
--- a/dev/boot/src/HEL/ARM64/BootEFI.cc
+++ b/dev/boot/src/HEL/ARM64/BootEFI.cc
@@ -18,11 +18,6 @@
 #include <BootKit/BootThread.h>
 #include <modules/CoreGfx/CoreGfx.h>
 
-// Makes the compiler shut up.
-#ifndef kMachineModel
-#define kMachineModel "NeKernel"
-#endif // !kMachineModel
-
 #ifndef kExpectedWidth
 #define kExpectedWidth (1920)
 #endif
@@ -74,14 +69,14 @@ STATIC Bool boot_init_fb() noexcept
 
 EXTERN EfiBootServices* BS;
 
-/// @brief ModuleMain EFI entrypoint.
+/// @brief BootloaderMain EFI entrypoint.
 /// @param image_handle Handle of this image.
 /// @param sys_table The system table of it.
 /// @return nothing, never returns.
-EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
-									  EfiSystemTable* sys_table)
+EFI_EXTERN_C EFI_API Int32 BootloaderMain(EfiHandlePtr	  image_handle,
+										  EfiSystemTable* sys_table)
 {
-	InitEFI(sys_table); ///! Init the EFI library.
+	fw_init_efi(sys_table); ///! Init the EFI library.
 
 	HEL::BootInfoHeader* handover_hdr =
 		new HEL::BootInfoHeader();
@@ -133,9 +128,9 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 	EfiMpServicesProtocol* mp	   = nullptr;
 
 	BS->LocateProtocol(&guid_mp, nullptr, reinterpret_cast<VoidPtr*>(&mp));
-
 	handover_hdr->f_HardwareTables.f_MpPtr = reinterpret_cast<VoidPtr>(mp);
 
+	// Assign to global 'kHandoverHeader'.
 	kHandoverHeader = handover_hdr;
 
 	fb_init();
@@ -160,18 +155,59 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 	}
 
 	//-------------------------------------------------------------//
-	// Update handover file specific table and phyiscal start field.
+	// Allocate heap.
 	//-------------------------------------------------------------//
 
+	Boot::BootTextWriter writer;
+
 	handover_hdr->f_BitMapStart = nullptr;			 /* Start of bitmap. */
-	handover_hdr->f_BitMapSize	= kHandoverBitMapSz; /* Size of bitmap. */
+	handover_hdr->f_BitMapSize	= kHandoverBitMapSz; /* Size of bitmap in bytes. */
+	Int32 trials				= 5 * 10000000;
 
 	while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
 	{
-		if (handover_hdr->f_BitMapStart)
+		--trials;
+
+		if (!trials)
+		{
+			writer.Write("BootZ: Unable to allocate sufficent memory, trying again with 2GB...\r");
+
+			trials = 3 * 10000000;
+
+			handover_hdr->f_BitMapSize = kHandoverBitMapSz / 2; /* Size of bitmap in bytes. */
+
+			while (BS->AllocatePool(EfiLoaderData, handover_hdr->f_BitMapSize, &handover_hdr->f_BitMapStart) != kEfiOk)
+			{
+				--trials;
+
+				if (!trials)
+				{
+					writer.Write("BootZ: Unable to allocate sufficent memory, aborting...\r");
+					Boot::Stop();
+				}
+			}
+		}
+	}
+
+	Boot::BootFileReader reader_syschk(L"chk.efi", image_handle);
+	reader_syschk.ReadAll(0);
+
+	Boot::BootThread* syschk_thread = nullptr;
+
+	if (reader_syschk.Blob())
+	{
+		syschk_thread = new Boot::BootThread(reader_syschk.Blob());
+		syschk_thread->SetName("BootZ: System Check");
+
+		if (syschk_thread->Start(handover_hdr, NO) != kEfiOk)
 		{
-			BS->FreePool(handover_hdr->f_BitMapStart);
-			handover_hdr->f_BitMapStart = nullptr;
+			fb_init();
+
+			FB::fb_clear_video();
+
+			FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
+
+			fb_clear();
 		}
 	}
 
@@ -194,8 +230,6 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 
 	handover_hdr->f_FirmwareVendorLen = Boot::BStrLen(sys_table->FirmwareVendor);
 
-	// Assign to global 'kHandoverHeader'.
-
 	Boot::BootFileReader reader_kernel(L"vmkrnl.efi", image_handle);
 
 	reader_kernel.ReadAll(0);
@@ -207,9 +241,10 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	  image_handle,
 	if (reader_kernel.Blob())
 	{
 		auto kernel_thread = Boot::BootThread(reader_kernel.Blob());
-		kernel_thread.SetName("BootZ: MicroKernel.");
+		kernel_thread.SetName("BootZ: Kernel.");
 
 		handover_hdr->f_KernelImage = reader_kernel.Blob();
+		handover_hdr->f_KernelSz	= reader_kernel.Size();
 
 		Boot::ExitBootServices(map_key, image_handle);