From 6c7e5ebc003a0bc4f98c23a8f9754b273a6e3a28 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal@nekernel.org>
Date: Wed, 2 Apr 2025 08:10:08 +0200
Subject: boot/net: rename Boot.S files, clarify EEPROM implication, and prep
 UDP read
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Renamed Boot.S → BootNetStartup.S and SysChk/Boot.S → SysChkStartup.S for clarity
- Replaced BOOTNET_INTERNET_HEADER.ImpliesEEPROM with ImpliesProgram to better reflect the generic reprogramming intent
- Introduced `bootnet_read_udp_packet()` stub for future UDP packet parsing from bootnet.json
- Minor alignment and comment fixes in various headers (CoreBoot, EPM, Json)
- Updated HalPagingMgr to use PageStore instead of NE_PAGE_STORE
- Boot time now prints cycles since start; triggered fs_init_nefs() earlier during HAL init
- Prep for extended MBCI and master structure support in COREBOOT_LINEAR_EXEC
- Numerous cleanups across DMA, NewKit, and Json parsing to prep for extended patching and block-level bootstrap

This lays groundwork for richer NetBoot infrastructure in NeKernel and aligns naming and structure conventions across subsystems.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
---
 dev/boot/modules/BootNet/Boot.S           | 22 ----------------------
 dev/boot/modules/BootNet/BootNet.cc       | 10 +++++++++-
 dev/boot/modules/BootNet/BootNet.h        |  2 +-
 dev/boot/modules/BootNet/BootNetStartup.S | 22 ++++++++++++++++++++++
 4 files changed, 32 insertions(+), 24 deletions(-)
 delete mode 100644 dev/boot/modules/BootNet/Boot.S
 create mode 100644 dev/boot/modules/BootNet/BootNetStartup.S

(limited to 'dev/boot/modules/BootNet')

diff --git a/dev/boot/modules/BootNet/Boot.S b/dev/boot/modules/BootNet/Boot.S
deleted file mode 100644
index 976c5e88..00000000
--- a/dev/boot/modules/BootNet/Boot.S
+++ /dev/null
@@ -1,22 +0,0 @@
-;; /*
-;; *	========================================================
-;; *
-;; *	BootZ
-;; * 	Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
-;; *
-;; * 	========================================================
-;; */
-
-#ifdef __NE_AMD64__
-.code64
-.intel_syntax noprefix
-#endif
-
-#define kTypeDriver 101
-#define kArchAmd64 122
-#define kHandoverMagic 0xBADCC
-
-.section .ldr
-
-.quad kHandoverMagic
-.word kTypeDriver
diff --git a/dev/boot/modules/BootNet/BootNet.cc b/dev/boot/modules/BootNet/BootNet.cc
index 2396852f..a877b9a1 100644
--- a/dev/boot/modules/BootNet/BootNet.cc
+++ b/dev/boot/modules/BootNet/BootNet.cc
@@ -13,10 +13,14 @@
 
 EfiGUID kEfiIP4ProtoGUID;
 
+STATIC Void bootnet_read_udp_packet(BOOTNET_INTERNET_HEADER&);
+
 EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
 	BOOTNET_INTERNET_HEADER inet{};
 
+	bootnet_read_udp_packet(inet);
+
 	memset(&inet, 0, sizeof(BOOTNET_INTERNET_HEADER));
 
 	/// TODO: Read packet from JSON file 'bootnet.json'
@@ -29,7 +33,7 @@ EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 		return kEfiFail;
 	}
 
-	if (!inet.ImpliesEEPROM)
+	if (!inet.ImpliesProgram)
 	{
 		Boot::BootThread thread(inet.Data);
 
@@ -50,3 +54,7 @@ EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 
 	return kEfiFail;
 }
+
+STATIC Void bootnet_read_udp_packet(BOOTNET_INTERNET_HEADER&)
+{
+}
\ No newline at end of file
diff --git a/dev/boot/modules/BootNet/BootNet.h b/dev/boot/modules/BootNet/BootNet.h
index 2bf330df..aba7924f 100644
--- a/dev/boot/modules/BootNet/BootNet.h
+++ b/dev/boot/modules/BootNet/BootNet.h
@@ -27,7 +27,7 @@ typedef struct BOOTNET_INTERNET_HEADER
 	Kernel::Char	Name[kBootNetNameLen];	 /// example: Modjo
 	Kernel::Int32	Length;					 /// the patch length.
 	Kernel::Char	Target[kBootNetNameLen]; /// the target file.
-	Kernel::Boolean ImpliesEEPROM : 1;		 /// does it imply an EEPROM reprogram?
+	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**
 } ATTRIBUTE(packed) BOOTNET_INTERNET_HEADER;
diff --git a/dev/boot/modules/BootNet/BootNetStartup.S b/dev/boot/modules/BootNet/BootNetStartup.S
new file mode 100644
index 00000000..976c5e88
--- /dev/null
+++ b/dev/boot/modules/BootNet/BootNetStartup.S
@@ -0,0 +1,22 @@
+;; /*
+;; *	========================================================
+;; *
+;; *	BootZ
+;; * 	Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+;; *
+;; * 	========================================================
+;; */
+
+#ifdef __NE_AMD64__
+.code64
+.intel_syntax noprefix
+#endif
+
+#define kTypeDriver 101
+#define kArchAmd64 122
+#define kHandoverMagic 0xBADCC
+
+.section .ldr
+
+.quad kHandoverMagic
+.word kTypeDriver
-- 
cgit v1.2.3