From 30f6aa05db0e99970fab65c8c8f10cea9830e3cc Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 31 Jul 2025 08:52:46 +0100 Subject: feat: Replace CoreBoot module with NeBoot module. Signed-off-by: Amlal El Mahrouss --- dev/kernel/FirmwareKit/CoreBoot/BootNet.h | 32 ---------------------------- dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h | 34 ------------------------------ dev/kernel/FirmwareKit/CoreBoot/NS.h | 10 --------- dev/kernel/FirmwareKit/NeBoot/BootNet.h | 32 ++++++++++++++++++++++++++++ dev/kernel/FirmwareKit/NeBoot/NS.h | 10 +++++++++ dev/kernel/FirmwareKit/NeBoot/NeBoot.h | 34 ++++++++++++++++++++++++++++++ dev/kernel/MoveAll.ARM64.sh | 7 ------ dev/kernel/MoveAll.X64.sh | 7 ------ dev/kernel/amd64-ci.make | 2 +- dev/kernel/amd64-desktop.make | 2 +- dev/kernel/arm64-desktop.make | 2 +- dev/kernel/move-all-aarch64.sh | 7 ++++++ dev/kernel/move-all-x64.sh | 7 ++++++ 13 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 dev/kernel/FirmwareKit/CoreBoot/BootNet.h delete mode 100644 dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h delete mode 100644 dev/kernel/FirmwareKit/CoreBoot/NS.h create mode 100644 dev/kernel/FirmwareKit/NeBoot/BootNet.h create mode 100644 dev/kernel/FirmwareKit/NeBoot/NS.h create mode 100644 dev/kernel/FirmwareKit/NeBoot/NeBoot.h delete mode 100755 dev/kernel/MoveAll.ARM64.sh delete mode 100755 dev/kernel/MoveAll.X64.sh create mode 100755 dev/kernel/move-all-aarch64.sh create mode 100755 dev/kernel/move-all-x64.sh (limited to 'dev/kernel') diff --git a/dev/kernel/FirmwareKit/CoreBoot/BootNet.h b/dev/kernel/FirmwareKit/CoreBoot/BootNet.h deleted file mode 100644 index 3ed11363..00000000 --- a/dev/kernel/FirmwareKit/CoreBoot/BootNet.h +++ /dev/null @@ -1,32 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. - -------------------------------------------- */ - -#pragma once - -#include - -#define kBootNetINetMagic "ONET" -#define kBootNetINetMagicLength (4) -#define kBootNetVersion (0x001) -#define kBootNetNameLen (256U) - -/// @brief Netboot Internet Header -/// Consists of 4 magic characters, and a set of fields describing the current patch that's being -/// sent (if m_preflight = 0) -/// @note Can be used to patch ROMs too (if ImpliesProgram = 1) -typedef struct BOOTNET_INTERNET_HEADER { - Kernel::Char NB1; /// magic char 1 'O' - Kernel::Char NB2; /// magic char 2 'N' - Kernel::Char NB3; /// magic char 3 'E' - Kernel::Char NB4; /// magic char 4 'T' - Kernel::UInt16 Version; - Kernel::Char Name[kBootNetNameLen]; /// example: Modjo - Kernel::Int32 Length; /// the patch length. - Kernel::Char Target[kBootNetNameLen]; /// the target file. - Kernel::Boolean ImpliesProgram : 1; /// does it imply reprogramming? - Kernel::Boolean Preflight : 1; /// is it a preflight packet. - Kernel::Char Data[1]; /// non preflight packet has a patch blob for a **PatchTarget** -} BOOTNET_INTERNET_HEADER; diff --git a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h b/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h deleted file mode 100644 index 9e756a70..00000000 --- a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h +++ /dev/null @@ -1,34 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. - -------------------------------------------- */ - -#pragma once - -#include - -namespace Firmware::Detail::CoreBoot { -using namespace Kernel; - -struct COREBOOT_LINEAR_EXEC; - -/// @brief Linear Executable Header -/// @author Amlal El Mahrouss -struct ATTRIBUTE(aligned(4)) COREBOOT_LINEAR_EXEC { - const Char fMagic[2]; // magic number - const Char fName[10]; // operating system name - const UInt32 fRevision; // firmware revision - const UInt32 fStartAddress; // start address (master/slave(s) thread) - -#ifdef NE_IS_EXTENDED_COREBOOT - UIntPtr fMasterStructure; // master structure for MP/PM and device tree and such. (ARM) - UIntPtr fMasterStructureVersion; // master structure version. -#endif - -#ifdef NE_IS_MBCI_COREBOOT - UIntPtr fMBCIStructure; // MBCI structure for MBCI (ARM) - UIntPtr fMBCIStructureVersion; // MBCI structure version. -#endif -}; -} // namespace Firmware::Detail::CoreBoot diff --git a/dev/kernel/FirmwareKit/CoreBoot/NS.h b/dev/kernel/FirmwareKit/CoreBoot/NS.h deleted file mode 100644 index 06197fcd..00000000 --- a/dev/kernel/FirmwareKit/CoreBoot/NS.h +++ /dev/null @@ -1,10 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. - -------------------------------------------- */ - -#pragma once - -#include -#include \ No newline at end of file diff --git a/dev/kernel/FirmwareKit/NeBoot/BootNet.h b/dev/kernel/FirmwareKit/NeBoot/BootNet.h new file mode 100644 index 00000000..3ed11363 --- /dev/null +++ b/dev/kernel/FirmwareKit/NeBoot/BootNet.h @@ -0,0 +1,32 @@ +/* ------------------------------------------- + + Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#include + +#define kBootNetINetMagic "ONET" +#define kBootNetINetMagicLength (4) +#define kBootNetVersion (0x001) +#define kBootNetNameLen (256U) + +/// @brief Netboot Internet Header +/// Consists of 4 magic characters, and a set of fields describing the current patch that's being +/// sent (if m_preflight = 0) +/// @note Can be used to patch ROMs too (if ImpliesProgram = 1) +typedef struct BOOTNET_INTERNET_HEADER { + Kernel::Char NB1; /// magic char 1 'O' + Kernel::Char NB2; /// magic char 2 'N' + Kernel::Char NB3; /// magic char 3 'E' + Kernel::Char NB4; /// magic char 4 'T' + Kernel::UInt16 Version; + Kernel::Char Name[kBootNetNameLen]; /// example: Modjo + Kernel::Int32 Length; /// the patch length. + Kernel::Char Target[kBootNetNameLen]; /// the target file. + Kernel::Boolean ImpliesProgram : 1; /// does it imply reprogramming? + Kernel::Boolean Preflight : 1; /// is it a preflight packet. + Kernel::Char Data[1]; /// non preflight packet has a patch blob for a **PatchTarget** +} BOOTNET_INTERNET_HEADER; diff --git a/dev/kernel/FirmwareKit/NeBoot/NS.h b/dev/kernel/FirmwareKit/NeBoot/NS.h new file mode 100644 index 00000000..a4d6a251 --- /dev/null +++ b/dev/kernel/FirmwareKit/NeBoot/NS.h @@ -0,0 +1,10 @@ +/* ------------------------------------------- + + Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#include +#include \ No newline at end of file diff --git a/dev/kernel/FirmwareKit/NeBoot/NeBoot.h b/dev/kernel/FirmwareKit/NeBoot/NeBoot.h new file mode 100644 index 00000000..621b3b64 --- /dev/null +++ b/dev/kernel/FirmwareKit/NeBoot/NeBoot.h @@ -0,0 +1,34 @@ +/* ------------------------------------------- + + Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#include + +namespace Firmware::Detail::NeBoot { +using namespace Kernel; + +struct NEBOOT_LINEAR_EXEC; + +/// @brief Linear Executable Header +/// @author Amlal El Mahrouss +struct ATTRIBUTE(aligned(4)) NEBOOT_LINEAR_EXEC { + const Char fMagic[2]; // magic number + const Char fName[10]; // operating system name + const UInt32 fRevision; // firmware revision + const UInt32 fStartAddress; // start address (master/slave(s) thread) + +#ifdef NE_IS_EXTENDED_COREBOOT + UIntPtr fMasterStructure; // master structure for MP/PM and device tree and such. (ARM) + UIntPtr fMasterStructureVersion; // master structure version. +#endif + +#ifdef NE_IS_MBCI_COREBOOT + UIntPtr fMBCIStructure; // MBCI structure for MBCI (ARM) + UIntPtr fMBCIStructureVersion; // MBCI structure version. +#endif +}; +} // namespace Firmware::Detail::NeBoot diff --git a/dev/kernel/MoveAll.ARM64.sh b/dev/kernel/MoveAll.ARM64.sh deleted file mode 100755 index 35e0909e..00000000 --- a/dev/kernel/MoveAll.ARM64.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh - -for file in *.o; do - mv -- "$file" "${file%.o}.obj" -done - -mv *.obj obj/ diff --git a/dev/kernel/MoveAll.X64.sh b/dev/kernel/MoveAll.X64.sh deleted file mode 100755 index 1c135d06..00000000 --- a/dev/kernel/MoveAll.X64.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh - -for file in *.o; do - mv -- "$file" "${file%.o}.obj" -done - -mv *.obj HALKit/AMD64/*.obj obj/ diff --git a/dev/kernel/amd64-ci.make b/dev/kernel/amd64-ci.make index 81b72b93..f21efca4 100644 --- a/dev/kernel/amd64-ci.make +++ b/dev/kernel/amd64-ci.make @@ -42,7 +42,7 @@ error: @echo "=== ERROR ===" @echo "=> Use a specific target." -MOVEALL=./MoveAll.X64.sh +MOVEALL=./move-all-x64.sh WINDRES=x86_64-w64-mingw32-windres .PHONY: nekernel-amd64-epm diff --git a/dev/kernel/amd64-desktop.make b/dev/kernel/amd64-desktop.make index 2874d31c..36b0f18e 100644 --- a/dev/kernel/amd64-desktop.make +++ b/dev/kernel/amd64-desktop.make @@ -44,7 +44,7 @@ error: @echo "=== ERROR ===" @echo "=> Use a specific target." -MOVEALL=./MoveAll.X64.sh +MOVEALL=./move-all-x64.sh WINDRES=x86_64-w64-mingw32-windres .PHONY: nekernel-amd64-epm diff --git a/dev/kernel/arm64-desktop.make b/dev/kernel/arm64-desktop.make index 423391af..e83e1db8 100644 --- a/dev/kernel/arm64-desktop.make +++ b/dev/kernel/arm64-desktop.make @@ -30,7 +30,7 @@ error: @echo "=== ERROR ===" @echo "=> Use a specific target." -MOVEALL=./MoveAll.ARM64.sh +MOVEALL=./move-all-aarch64.sh .PHONY: nekernel-arm64-epm nekernel-arm64-epm: clean diff --git a/dev/kernel/move-all-aarch64.sh b/dev/kernel/move-all-aarch64.sh new file mode 100755 index 00000000..35e0909e --- /dev/null +++ b/dev/kernel/move-all-aarch64.sh @@ -0,0 +1,7 @@ +#! /bin/sh + +for file in *.o; do + mv -- "$file" "${file%.o}.obj" +done + +mv *.obj obj/ diff --git a/dev/kernel/move-all-x64.sh b/dev/kernel/move-all-x64.sh new file mode 100755 index 00000000..1c135d06 --- /dev/null +++ b/dev/kernel/move-all-x64.sh @@ -0,0 +1,7 @@ +#! /bin/sh + +for file in *.o; do + mv -- "$file" "${file%.o}.obj" +done + +mv *.obj HALKit/AMD64/*.obj obj/ -- cgit v1.2.3