Fix bootloader 2

andyvand · Jan 28, 2024 · d47d876 · d47d876
1 parent bc625bb
commit d47d876
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/bin/boot.efi b/bin/boot.efi
diff --git a/bin/macosxbootloader-legacy.pkg/Contents/Archive.bom b/bin/macosxbootloader-legacy.pkg/Contents/Archive.bom
diff --git a/bin/macosxbootloader-legacy.pkg/Contents/Archive.pax.gz b/bin/macosxbootloader-legacy.pkg/Contents/Archive.pax.gz
diff --git a/bin/macosxbootloader.pkg b/bin/macosxbootloader.pkg
diff --git a/sdk/include/EfiTypes.h b/sdk/include/EfiTypes.h
@@ -22,7 +22,11 @@ Module Name:
 #ifndef _EFI_TYPES_H_
 #define _EFI_TYPES_H_
 
-#include "EfiBind.h"
+#if defined(__x86_64__) || defined(_M_AMD64)
+#include "x64/EfiBind.h"
+#elif defined(__i386__) || defined(_M_IX86)
+#include "x86/EfiBind.h"
+#endif
 
 //
 // EFI Data Types based on ANSI C integer types in EfiBind.h

diff --git a/src/boot/Hibernate.cpp b/src/boot/Hibernate.cpp
@@ -946,7 +946,7 @@ BOOLEAN HbStartResumeFromHibernate(UINT8* coreStorageVolumeKeyIdent)
             if(needReset)
                 EfiRuntimeServices->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, nullptr);
 
-            return resumeFromCoreStorage';
+            return resumeFromCoreStorage;
 #endif
         }