summaryrefslogtreecommitdiffhomepage
path: root/Boot
diff options
context:
space:
mode:
Diffstat (limited to 'Boot')
-rw-r--r--Boot/BootKit/BootKit.hxx6
-rw-r--r--Boot/ReadMe.md2
-rw-r--r--Boot/Sources/BootloaderRsrc.rsrc6
-rw-r--r--Boot/Sources/HEL/AMD64/BootATA.cxx2
-rw-r--r--Boot/Sources/HEL/AMD64/BootFileReader.cxx8
-rw-r--r--Boot/Sources/HEL/AMD64/BootMain.cxx6
-rw-r--r--Boot/Sources/HEL/POWER/CoreBootStartup.S2
-rw-r--r--Boot/Sources/HEL/RISCV/BootRISCV.S4
-rw-r--r--Boot/Sources/Root/SplashScreen.fmt4
-rw-r--r--Boot/makefile10
10 files changed, 25 insertions, 25 deletions
diff --git a/Boot/BootKit/BootKit.hxx b/Boot/BootKit/BootKit.hxx
index 961137ca..311d6c7f 100644
--- a/Boot/BootKit/BootKit.hxx
+++ b/Boot/BootKit/BootKit.hxx
@@ -141,7 +141,7 @@ typedef UInt8* BlobType;
class BVersionString final
{
public:
- static const CharacterTypeUTF16* Shared()
+ static const CharacterTypeUTF16* The()
{
return BOOTLOADER_VERSION;
}
@@ -284,7 +284,7 @@ private:
EFI::ThrowError(L"Developer-Error", L"This is caused by the developer of the bootloader.");
}
- writer.Write((catalogKind->Kind == kNewFSCatalogKindFile) ? L"New Boot: Write-File: " : L"New Boot: Write-Directory: ").Write(blob->fFileName).Write(L"\r");
+ writer.Write((catalogKind->Kind == kNewFSCatalogKindFile) ? L"newosldr: Write-File: " : L"newosldr: Write-Directory: ").Write(blob->fFileName).Write(L"\r");
memcpy(catalogKind->Name, blob->fFileName, strlen(blob->fFileName));
@@ -360,7 +360,7 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const char* partName,
fDiskDev.Write(buf, sectorSz);
BTextWriter writer;
- writer.Write(L"New Boot: Write-Partition: OK.\r");
+ writer.Write(L"newosldr: Write-Partition: OK.\r");
return true;
}
diff --git a/Boot/ReadMe.md b/Boot/ReadMe.md
index d5f2b89e..ce5b30cd 100644
--- a/Boot/ReadMe.md
+++ b/Boot/ReadMe.md
@@ -1,4 +1,4 @@
-# NewBoot
+# newosldr
You need:
diff --git a/Boot/Sources/BootloaderRsrc.rsrc b/Boot/Sources/BootloaderRsrc.rsrc
index 0282192b..857e08e4 100644
--- a/Boot/Sources/BootloaderRsrc.rsrc
+++ b/Boot/Sources/BootloaderRsrc.rsrc
@@ -13,10 +13,10 @@ BEGIN
VALUE "CompanyName", "SoftwareLabs"
VALUE "FileDescription", "New OS multi-platform bootloader."
VALUE "FileVersion", BOOTLOADER_VERSION
- VALUE "InternalName", "NewBoot"
+ VALUE "InternalName", "newosldr"
VALUE "LegalCopyright", "Copyright SoftwareLabs, all rights reserved."
- VALUE "OriginalFilename", "NewOSLdr.exe"
- VALUE "ProductName", "NewBoot"
+ VALUE "OriginalFilename", "newosldr.exe"
+ VALUE "ProductName", "newosldr"
VALUE "ProductVersion", BOOTLOADER_VERSION
END
END
diff --git a/Boot/Sources/HEL/AMD64/BootATA.cxx b/Boot/Sources/HEL/AMD64/BootATA.cxx
index c82cb2ea..d2753110 100644
--- a/Boot/Sources/HEL/AMD64/BootATA.cxx
+++ b/Boot/Sources/HEL/AMD64/BootATA.cxx
@@ -81,7 +81,7 @@ ATAInit_Retry:
if (statRdy & ATA_SR_ERR)
{
writer.Write(
- L"New Boot: ATA: Select error, not an IDE based hard-drive.\r");
+ L"newosldr: ATA: Select error, not an IDE based hard-drive.\r");
return false;
}
diff --git a/Boot/Sources/HEL/AMD64/BootFileReader.cxx b/Boot/Sources/HEL/AMD64/BootFileReader.cxx
index 7ec6b7ab..e6e70509 100644
--- a/Boot/Sources/HEL/AMD64/BootFileReader.cxx
+++ b/Boot/Sources/HEL/AMD64/BootFileReader.cxx
@@ -57,13 +57,13 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path,
if (BS->HandleProtocol(ImageHandle, &guidImg, (void**)&img) != kEfiOk)
{
- mWriter.Write(L"New Boot: Fetch-Protocol: No-Such-Protocol").Write(L"\r");
+ mWriter.Write(L"newosldr: Fetch-Protocol: No-Such-Protocol").Write(L"\r");
this->mErrorCode = kNotSupported;
}
if (BS->HandleProtocol(img->DeviceHandle, &guidEfp, (void**)&efp) != kEfiOk)
{
- mWriter.Write(L"New Boot: Fetch-Protocol: No-Such-Protocol").Write(L"\r");
+ mWriter.Write(L"newosldr: Fetch-Protocol: No-Such-Protocol").Write(L"\r");
this->mErrorCode = kNotSupported;
return;
}
@@ -72,7 +72,7 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path,
if (efp->OpenVolume(efp, &rootFs) != kEfiOk)
{
- mWriter.Write(L"New Boot: Fetch-Protocol: No-Such-Volume").Write(L"\r");
+ mWriter.Write(L"newosldr: Fetch-Protocol: No-Such-Volume").Write(L"\r");
this->mErrorCode = kNotSupported;
return;
}
@@ -82,7 +82,7 @@ BFileReader::BFileReader(const CharacterTypeUTF16* path,
if (rootFs->Open(rootFs, &kernelFile, mPath, kEFIFileRead, kEFIReadOnly) !=
kEfiOk)
{
- mWriter.Write(L"New Boot: Fetch-Protocol: No-Such-Path: ")
+ mWriter.Write(L"newosldr: Fetch-Protocol: No-Such-Path: ")
.Write(mPath)
.Write(L"\r");
this->mErrorCode = kNotSupported;
diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx
index f58709be..cb8bccba 100644
--- a/Boot/Sources/HEL/AMD64/BootMain.cxx
+++ b/Boot/Sources/HEL/AMD64/BootMain.cxx
@@ -68,8 +68,8 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
/// Splash screen stuff
- writer.Write(L"SoftwareLabs (R) New Boot: ")
- .Write(BVersionString::Shared());
+ writer.Write(L"SoftwareLabs (R) newosldr: ")
+ .Write(BVersionString::The());
writer.Write(L"\rNew Boot: Firmware Vendor: ")
.Write(SystemTable->FirmwareVendor)
@@ -99,7 +99,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle,
vendorTable[4] == 'P' && vendorTable[5] == 'T' &&
vendorTable[6] == 'R' && vendorTable[7] == ' ')
{
- writer.Write(L"New Boot: Found ACPI RSD PTR!\r");
+ writer.Write(L"newosldr: Found ACPI RSD PTR!\r");
handoverHdrPtr->f_HardwareTables.f_RsdPtr = (VoidPtr)vendorTable;
break;
diff --git a/Boot/Sources/HEL/POWER/CoreBootStartup.S b/Boot/Sources/HEL/POWER/CoreBootStartup.S
index f8ff99d7..ed39c3b5 100644
--- a/Boot/Sources/HEL/POWER/CoreBootStartup.S
+++ b/Boot/Sources/HEL/POWER/CoreBootStartup.S
@@ -13,7 +13,7 @@ boot_hdr_mag:
.ascii "CB"
boot_hdr_name:
// it has to match ten bytes.
- .asciz "NewBoot\0\0\0"
+ .asciz "newosldr\0\0"
boot_hdr_ver:
.word 0x104
boot_hdr_proc:
diff --git a/Boot/Sources/HEL/RISCV/BootRISCV.S b/Boot/Sources/HEL/RISCV/BootRISCV.S
index 7a7e7db0..b682d597 100644
--- a/Boot/Sources/HEL/RISCV/BootRISCV.S
+++ b/Boot/Sources/HEL/RISCV/BootRISCV.S
@@ -13,10 +13,10 @@ k_hdr_mag:
.ascii "LX"
k_hdr_name:
// it has to match ten bytes.
- .asciz "New OS\0\0\0\0"
+ .asciz "newosldr\0\0"
k_hdr_ver:
.word 0x104
k_hdr_proc:
- .long __bootloader_start
+ .long bootloader_start
/* end */ \ No newline at end of file
diff --git a/Boot/Sources/Root/SplashScreen.fmt b/Boot/Sources/Root/SplashScreen.fmt
index 863d7b62..42005568 100644
--- a/Boot/Sources/Root/SplashScreen.fmt
+++ b/Boot/Sources/Root/SplashScreen.fmt
@@ -1,7 +1,7 @@
==================================================================
Welcome to NeWS.
Brought to you by: Amlal EL Mahrouss.
-* NewBoot, NewKernel: Amlal EL Mahrouss.
-This copy can boot directly to NewKernel (Unified System).
+* newosldr, newoskrnl: Amlal EL Mahrouss.
+This copy can boot directly to newoskrnl (Unified System).
Copyright SoftwareLabs, all rights reserved.
==================================================================
diff --git a/Boot/makefile b/Boot/makefile
index 63883321..e979c309 100644
--- a/Boot/makefile
+++ b/Boot/makefile
@@ -26,8 +26,8 @@ BIOS=OVMF.fd
IMG=epm.img
IMG_2=epm-slave.img
-EMU_FLAGS=-net none -smp 4,sockets=1,cores=4,threads=1 -m 4G -M q35 \
- -bios Sources/$(BIOS) -device piix3-ide,id=ide \
+EMU_FLAGS=-net none -smp 2 -m 4G -M q35 \
+ -bios $(BIOS) -device piix3-ide,id=ide \
-drive id=disk,file=$(IMG),format=raw,if=none \
-device ide-hd,drive=disk,bus=ide.0 -drive \
file=fat:rw:Sources/Root,index=2,format=raw -d int -hdd $(IMG_2)
@@ -50,8 +50,8 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__KERNEL__ -D__NEWBOOT__
-DEFI_FUNCTION_WRAPPER -I./ -I../Kernel -I./ -c -nostdlib -fno-rtti -fno-exceptions \
-std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -D__BOOTLOADER__ -I./
-BOOT_LOADER=NewOSLdr.exe
-KERNEL=NewOSKrnl.exe
+BOOT_LOADER=newosldr.exe
+KERNEL=newoskrnl.exe
.PHONY: invalid-recipe
invalid-recipe:
@@ -92,7 +92,7 @@ download-edk:
$(HTTP_GET) https://retrage.github.io/edk2-nightly/bin/DEBUGX64_OVMF.fd -O OVMF.fd
BINS=*.bin
-EXECUTABLES=NewOSLdr.exe NewOSKrnl.exe OVMF.fd
+EXECUTABLES=newosldr.exe newoskrnl.exe OVMF.fd
TARGETS=$(REM_FLAG) $(OBJ) $(BIN) $(IMG) $(IMG_2) $(EXECUTABLES)
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-15 16:11:34 +0000