From 5870e529d9f788588836a9dc9fe8b4f026bfe984 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 23 Mar 2025 19:52:25 +0100 Subject: kernel(fix): Last fixes in order to build NeKernel, and fix CI. Signed-off-by: Amlal El Mahrouss --- dev/boot/Mod/.keep | 0 dev/boot/Mod/NetBoot/.hgkeep | 0 dev/boot/Mod/NetBoot/Boot.S | 28 ----------------------- dev/boot/Mod/NetBoot/NetBoot.cc | 44 ------------------------------------- dev/boot/Mod/NetBoot/NetBoot.h | 33 ---------------------------- dev/boot/Mod/NetBoot/build.json | 24 -------------------- dev/boot/Mod/SysChk/.hgkeep | 0 dev/boot/Mod/SysChk/Boot.S | 22 ------------------- dev/boot/Mod/SysChk/Module.cc | 36 ------------------------------ dev/boot/Mod/SysChk/amd64.json | 24 -------------------- dev/boot/Mod/SysChk/arm64.json | 26 ---------------------- dev/boot/modules/.keep | 0 dev/boot/modules/NetBoot/.hgkeep | 0 dev/boot/modules/NetBoot/Boot.S | 28 +++++++++++++++++++++++ dev/boot/modules/NetBoot/NetBoot.cc | 44 +++++++++++++++++++++++++++++++++++++ dev/boot/modules/NetBoot/NetBoot.h | 33 ++++++++++++++++++++++++++++ dev/boot/modules/NetBoot/build.json | 24 ++++++++++++++++++++ dev/boot/modules/SysChk/.hgkeep | 0 dev/boot/modules/SysChk/Boot.S | 22 +++++++++++++++++++ dev/boot/modules/SysChk/Module.cc | 36 ++++++++++++++++++++++++++++++ dev/boot/modules/SysChk/amd64.json | 24 ++++++++++++++++++++ dev/boot/modules/SysChk/arm64.json | 26 ++++++++++++++++++++++ 22 files changed, 237 insertions(+), 237 deletions(-) delete mode 100644 dev/boot/Mod/.keep delete mode 100644 dev/boot/Mod/NetBoot/.hgkeep delete mode 100644 dev/boot/Mod/NetBoot/Boot.S delete mode 100644 dev/boot/Mod/NetBoot/NetBoot.cc delete mode 100644 dev/boot/Mod/NetBoot/NetBoot.h delete mode 100644 dev/boot/Mod/NetBoot/build.json delete mode 100644 dev/boot/Mod/SysChk/.hgkeep delete mode 100644 dev/boot/Mod/SysChk/Boot.S delete mode 100644 dev/boot/Mod/SysChk/Module.cc delete mode 100644 dev/boot/Mod/SysChk/amd64.json delete mode 100644 dev/boot/Mod/SysChk/arm64.json create mode 100644 dev/boot/modules/.keep create mode 100644 dev/boot/modules/NetBoot/.hgkeep create mode 100644 dev/boot/modules/NetBoot/Boot.S create mode 100644 dev/boot/modules/NetBoot/NetBoot.cc create mode 100644 dev/boot/modules/NetBoot/NetBoot.h create mode 100644 dev/boot/modules/NetBoot/build.json create mode 100644 dev/boot/modules/SysChk/.hgkeep create mode 100644 dev/boot/modules/SysChk/Boot.S create mode 100644 dev/boot/modules/SysChk/Module.cc create mode 100644 dev/boot/modules/SysChk/amd64.json create mode 100644 dev/boot/modules/SysChk/arm64.json (limited to 'dev') diff --git a/dev/boot/Mod/.keep b/dev/boot/Mod/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/boot/Mod/NetBoot/.hgkeep b/dev/boot/Mod/NetBoot/.hgkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/boot/Mod/NetBoot/Boot.S b/dev/boot/Mod/NetBoot/Boot.S deleted file mode 100644 index 2095b91d..00000000 --- a/dev/boot/Mod/NetBoot/Boot.S +++ /dev/null @@ -1,28 +0,0 @@ -;; /* -;; * ======================================================== -;; * -;; * BootZ -;; * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. -;; * -;; * ======================================================== -;; */ - -.code64 -.intel_syntax noprefix - -#define kTypeDriver 101 -#define kArchAmd64 122 -#define kHandoverMagic 0xBADCC - -.section .ldr - -.quad kHandoverMagic -.word kTypeDriver - -.text - -.extern main -.global __main - -__main: - ret diff --git a/dev/boot/Mod/NetBoot/NetBoot.cc b/dev/boot/Mod/NetBoot/NetBoot.cc deleted file mode 100644 index 16a9ae1e..00000000 --- a/dev/boot/Mod/NetBoot/NetBoot.cc +++ /dev/null @@ -1,44 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. - * - * ======================================================== - */ - -#include -#include -#include - -EXTERN_C Int32 ModuleMain(NeOS::HEL::BootInfoHeader* handover) -{ - NETBOOT_INTERNET_HEADER inet{}; - - /// TODO: Read Packet from localhost - - if (inet.PatchLength < 0) - { - Boot::BootTextWriter writer; - writer.Write("NetBootLauncher: No Patch attached to packet.\r"); - - return kEfiFail; - } - - if (!inet.EEPROM) - { - Boot::BootThread thread(inet.Data); - - if (thread.IsValid()) - return thread.Start(handover, YES); - } - else - { - Boot::BootTextWriter writer; - writer.Write("NetBootLauncher: EEPROM flash not available for now.\r"); - - return kEfiFail; // TODO: Add support for EEPROM firmware update. - } - - return kEfiFail; -} diff --git a/dev/boot/Mod/NetBoot/NetBoot.h b/dev/boot/Mod/NetBoot/NetBoot.h deleted file mode 100644 index aeeaf18b..00000000 --- a/dev/boot/Mod/NetBoot/NetBoot.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. - * - * ======================================================== - */ - -#pragma once - -#include - -#define kNetBootINetMagic "NETB" -#define kNetBootINetMagicLength (4) - -#define kNetBootNameLen (256U) - -/// @brief the internet header is used to download updates OTA. -typedef struct NETBOOT_INTERNET_HEADER -{ - NeOS::Char NB1; /// magic char 1 'N' - NeOS::Char NB2; /// magic char 2 'E' - NeOS::Char NB3; /// magic char 3 'T' - NeOS::Char NB4; /// magic char 4 'B' - - NeOS::Char PatchName[kNetBootNameLen]; /// example: Modjo - NeOS::Int32 PatchLength; /// the patch length. - NeOS::Char PatchTarget[kNetBootNameLen]; /// the target file. - NeOS::Boolean EEPROM : 1; /// does it imply an EEPROM reprogram? - NeOS::Boolean Preflight : 1; /// is it a preflight packet. - NeOS::Char Data[]; /// non preflight packet has a patch blob for a **PatchTarget** -} ATTRIBUTE(packed) NETBOOT_INTERNET_HEADER; diff --git a/dev/boot/Mod/NetBoot/build.json b/dev/boot/Mod/NetBoot/build.json deleted file mode 100644 index 2c92567d..00000000 --- a/dev/boot/Mod/NetBoot/build.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++", - "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], - "sources_path": [".cc", "*.S"], - "output_name": "netboot.sys", - "compiler_flags": [ - "-ffreestanding", - "-nostdlib", - "-std=c++20", - "-fPIC", - "-fno-rtti", - "-fno-exceptions", - "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" - ], - "cpp_macros": [ - "__NEOSKRNL__", - "__BOOTZ__", - "__NE_AMD64__", - "kNetBootVersionHighest=0x0100", - "kNetBootVersionLowest=0x0100", - "kNetBootVersion=0x0100" - ] -} diff --git a/dev/boot/Mod/SysChk/.hgkeep b/dev/boot/Mod/SysChk/.hgkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/boot/Mod/SysChk/Boot.S b/dev/boot/Mod/SysChk/Boot.S deleted file mode 100644 index 8ebfb352..00000000 --- a/dev/boot/Mod/SysChk/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/Mod/SysChk/Module.cc b/dev/boot/Mod/SysChk/Module.cc deleted file mode 100644 index c22e183b..00000000 --- a/dev/boot/Mod/SysChk/Module.cc +++ /dev/null @@ -1,36 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. - * - * ======================================================== - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -EXTERN_C Int32 ModuleMain(NeOS::HEL::BootInfoHeader* handover) -{ -#ifdef __NE_AMD64__ - Boot::BDiskFormatFactory partition_factory; - - if (partition_factory.IsPartitionValid()) - return kEfiOk; - - return kEfiFail; -#else - return kEfiOk; -#endif -} diff --git a/dev/boot/Mod/SysChk/amd64.json b/dev/boot/Mod/SysChk/amd64.json deleted file mode 100644 index 97b6c418..00000000 --- a/dev/boot/Mod/SysChk/amd64.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++", - "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], - "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"], - "output_name": "syschk.sys", - "compiler_flags": [ - "-nostdlib", - "-std=c++20", - "-fPIC", - "-fno-rtti", - "-fno-exceptions", - "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" - ], - "cpp_macros": [ - "__NEOSKRNL__", - "__BOOTZ__", - "__BOOTLDR_STANDALONE__", - "__NE_AMD64__", - "kChkVersionHighest=0x0100", - "kChkVersionLowest=0x0100", - "kChkVersion=0x0100" - ] -} diff --git a/dev/boot/Mod/SysChk/arm64.json b/dev/boot/Mod/SysChk/arm64.json deleted file mode 100644 index 6d9161ea..00000000 --- a/dev/boot/Mod/SysChk/arm64.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "compiler_path": "clang++", - "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], - "sources_path": ["*.cc", "*.S", "../../src/HEL/ARM64/*.cc", "../../src/HEL/ARM64/*.S", "../../src/*.cc"], - "output_name": "syschk.sys", - "compiler_flags": [ - "-ffreestanding", - "-nostdlib", - "-std=c++20", - "-fno-rtti", - "-fno-exceptions", - "-fuse-ld=lld", - "-Wl,-subsystem:efi_application,-entry:ModuleMain", - "-target aarch64-unknown-windows" - ], - "cpp_macros": [ - "__NEOSKRNL__", - "__BOOTZ__", - "__BOOTLDR_STANDALONE__", - "__NE_ARM64__", - "kChkVersionHighest=0x0100", - "kChkVersionLowest=0x0100", - "kChkVersion=0x0100" - ] -} diff --git a/dev/boot/modules/.keep b/dev/boot/modules/.keep new file mode 100644 index 00000000..e69de29b diff --git a/dev/boot/modules/NetBoot/.hgkeep b/dev/boot/modules/NetBoot/.hgkeep new file mode 100644 index 00000000..e69de29b diff --git a/dev/boot/modules/NetBoot/Boot.S b/dev/boot/modules/NetBoot/Boot.S new file mode 100644 index 00000000..2095b91d --- /dev/null +++ b/dev/boot/modules/NetBoot/Boot.S @@ -0,0 +1,28 @@ +;; /* +;; * ======================================================== +;; * +;; * BootZ +;; * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. +;; * +;; * ======================================================== +;; */ + +.code64 +.intel_syntax noprefix + +#define kTypeDriver 101 +#define kArchAmd64 122 +#define kHandoverMagic 0xBADCC + +.section .ldr + +.quad kHandoverMagic +.word kTypeDriver + +.text + +.extern main +.global __main + +__main: + ret diff --git a/dev/boot/modules/NetBoot/NetBoot.cc b/dev/boot/modules/NetBoot/NetBoot.cc new file mode 100644 index 00000000..16a9ae1e --- /dev/null +++ b/dev/boot/modules/NetBoot/NetBoot.cc @@ -0,0 +1,44 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. + * + * ======================================================== + */ + +#include +#include +#include + +EXTERN_C Int32 ModuleMain(NeOS::HEL::BootInfoHeader* handover) +{ + NETBOOT_INTERNET_HEADER inet{}; + + /// TODO: Read Packet from localhost + + if (inet.PatchLength < 0) + { + Boot::BootTextWriter writer; + writer.Write("NetBootLauncher: No Patch attached to packet.\r"); + + return kEfiFail; + } + + if (!inet.EEPROM) + { + Boot::BootThread thread(inet.Data); + + if (thread.IsValid()) + return thread.Start(handover, YES); + } + else + { + Boot::BootTextWriter writer; + writer.Write("NetBootLauncher: EEPROM flash not available for now.\r"); + + return kEfiFail; // TODO: Add support for EEPROM firmware update. + } + + return kEfiFail; +} diff --git a/dev/boot/modules/NetBoot/NetBoot.h b/dev/boot/modules/NetBoot/NetBoot.h new file mode 100644 index 00000000..aeeaf18b --- /dev/null +++ b/dev/boot/modules/NetBoot/NetBoot.h @@ -0,0 +1,33 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. + * + * ======================================================== + */ + +#pragma once + +#include + +#define kNetBootINetMagic "NETB" +#define kNetBootINetMagicLength (4) + +#define kNetBootNameLen (256U) + +/// @brief the internet header is used to download updates OTA. +typedef struct NETBOOT_INTERNET_HEADER +{ + NeOS::Char NB1; /// magic char 1 'N' + NeOS::Char NB2; /// magic char 2 'E' + NeOS::Char NB3; /// magic char 3 'T' + NeOS::Char NB4; /// magic char 4 'B' + + NeOS::Char PatchName[kNetBootNameLen]; /// example: Modjo + NeOS::Int32 PatchLength; /// the patch length. + NeOS::Char PatchTarget[kNetBootNameLen]; /// the target file. + NeOS::Boolean EEPROM : 1; /// does it imply an EEPROM reprogram? + NeOS::Boolean Preflight : 1; /// is it a preflight packet. + NeOS::Char Data[]; /// non preflight packet has a patch blob for a **PatchTarget** +} ATTRIBUTE(packed) NETBOOT_INTERNET_HEADER; diff --git a/dev/boot/modules/NetBoot/build.json b/dev/boot/modules/NetBoot/build.json new file mode 100644 index 00000000..2c92567d --- /dev/null +++ b/dev/boot/modules/NetBoot/build.json @@ -0,0 +1,24 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], + "sources_path": [".cc", "*.S"], + "output_name": "netboot.sys", + "compiler_flags": [ + "-ffreestanding", + "-nostdlib", + "-std=c++20", + "-fPIC", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" + ], + "cpp_macros": [ + "__NEOSKRNL__", + "__BOOTZ__", + "__NE_AMD64__", + "kNetBootVersionHighest=0x0100", + "kNetBootVersionLowest=0x0100", + "kNetBootVersion=0x0100" + ] +} diff --git a/dev/boot/modules/SysChk/.hgkeep b/dev/boot/modules/SysChk/.hgkeep new file mode 100644 index 00000000..e69de29b diff --git a/dev/boot/modules/SysChk/Boot.S b/dev/boot/modules/SysChk/Boot.S new file mode 100644 index 00000000..8ebfb352 --- /dev/null +++ b/dev/boot/modules/SysChk/Boot.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 diff --git a/dev/boot/modules/SysChk/Module.cc b/dev/boot/modules/SysChk/Module.cc new file mode 100644 index 00000000..c22e183b --- /dev/null +++ b/dev/boot/modules/SysChk/Module.cc @@ -0,0 +1,36 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. + * + * ======================================================== + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +EXTERN_C Int32 ModuleMain(NeOS::HEL::BootInfoHeader* handover) +{ +#ifdef __NE_AMD64__ + Boot::BDiskFormatFactory partition_factory; + + if (partition_factory.IsPartitionValid()) + return kEfiOk; + + return kEfiFail; +#else + return kEfiOk; +#endif +} diff --git a/dev/boot/modules/SysChk/amd64.json b/dev/boot/modules/SysChk/amd64.json new file mode 100644 index 00000000..97b6c418 --- /dev/null +++ b/dev/boot/modules/SysChk/amd64.json @@ -0,0 +1,24 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], + "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"], + "output_name": "syschk.sys", + "compiler_flags": [ + "-nostdlib", + "-std=c++20", + "-fPIC", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" + ], + "cpp_macros": [ + "__NEOSKRNL__", + "__BOOTZ__", + "__BOOTLDR_STANDALONE__", + "__NE_AMD64__", + "kChkVersionHighest=0x0100", + "kChkVersionLowest=0x0100", + "kChkVersion=0x0100" + ] +} diff --git a/dev/boot/modules/SysChk/arm64.json b/dev/boot/modules/SysChk/arm64.json new file mode 100644 index 00000000..6d9161ea --- /dev/null +++ b/dev/boot/modules/SysChk/arm64.json @@ -0,0 +1,26 @@ +{ + "compiler_path": "clang++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], + "sources_path": ["*.cc", "*.S", "../../src/HEL/ARM64/*.cc", "../../src/HEL/ARM64/*.S", "../../src/*.cc"], + "output_name": "syschk.sys", + "compiler_flags": [ + "-ffreestanding", + "-nostdlib", + "-std=c++20", + "-fno-rtti", + "-fno-exceptions", + "-fuse-ld=lld", + "-Wl,-subsystem:efi_application,-entry:ModuleMain", + "-target aarch64-unknown-windows" + ], + "cpp_macros": [ + "__NEOSKRNL__", + "__BOOTZ__", + "__BOOTLDR_STANDALONE__", + "__NE_ARM64__", + "kChkVersionHighest=0x0100", + "kChkVersionLowest=0x0100", + "kChkVersion=0x0100" + ] +} -- cgit v1.2.3