Merged in MHR-5 (pull request #1)

MHR-5

4 files changed, 3 insertions, 5 deletions

diff --git a/Private/FirmwareKit/CoreBoot/.gitkeep b/Private/FirmwareKit/CoreBoot/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/Private/FirmwareKit/CoreBoot/.gitkeep
diff --git a/Private/FirmwareKit/EFI/API.hxx b/Private/FirmwareKit/EFI/API.hxx
index cfb3f425..138d6b42 100644
--- a/Private/FirmwareKit/EFI/API.hxx
+++ b/Private/FirmwareKit/EFI/API.hxx
@@ -19,7 +19,7 @@ EXTERN_C void rt_hlt();
 
 namespace EFI {
 /// @brief Halt and clear interrupts.
-/// @return 
+/// @return
 inline Void Stop() noexcept {
   while (1) {
     rt_hlt();
@@ -51,7 +51,7 @@ inline UInt32 Platform() noexcept { return kPEMachineAMD64; }
  */
 inline void RaiseHardError(const EfiCharType *ErrorCode,
                            const EfiCharType *Reason) noexcept {
-  ST->ConOut->OutputString(ST->ConOut, L"*** STOP ***\r\n");
+  ST->ConOut->OutputString(ST->ConOut, L"\r\n*** STOP ***\r\n");
 
   ST->ConOut->OutputString(ST->ConOut, L"*** Error: ");
   ST->ConOut->OutputString(ST->ConOut, ErrorCode);
diff --git a/Private/FirmwareKit/EFI/EFI.hxx b/Private/FirmwareKit/EFI/EFI.hxx
index 1d56f757..7f8223cf 100644
--- a/Private/FirmwareKit/EFI/EFI.hxx
+++ b/Private/FirmwareKit/EFI/EFI.hxx
@@ -571,8 +571,6 @@ typedef struct EfiSystemTable {
   } *ConfigurationTable;
 } EfiSystemTable;
 
-#define EfiMain efi_main
-
 #define kEfiOk 0
 #define kEfiFail -1
 
diff --git a/Private/FirmwareKit/EPM.hxx b/Private/FirmwareKit/EPM.hxx
index 5cc743be..b7f77742 100644
--- a/Private/FirmwareKit/EPM.hxx
+++ b/Private/FirmwareKit/EPM.hxx
@@ -71,7 +71,7 @@ struct PACKED PartitionBlock {
 
 #define kEPMMagic32k "EPM32"
 
-/* @brief PowerPC magic for EPM */
+/* @brief POWER magic for EPM */
 
 #define kEPMMagicPPC "EPMPC"