Merged in MHR-23 (pull request #14)

Draft: MHR-23

5 files changed, 11 insertions, 11 deletions

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