#include "mok.h"
#include "gpt.h"
#include "apple.h"
+#include "mystrings.h"
#include "security_policy.h"
#include "driver_support.h"
#include "../include/Handle.h"
#define FALLBACK_BASENAME L"bootia32.efi"
#define EFI_STUB_ARCH 0x014c
EFI_GUID gFreedesktopRootGuid = { 0x44479540, 0xf297, 0x41b2, { 0x9a, 0xf7, 0xd1, 0x31, 0xd5, 0xf0, 0x45, 0x8a }};
+#elif defined (EFIAARCH64)
+#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellaa64.efi,\\shell.efi,\\shellaa64.efi"
+#define GPTSYNC_NAMES L"\\EFI\\tools\\gptsync.efi,\\EFI\\tools\\gptsync_aa64.efi"
+#define GDISK_NAMES L"\\EFI\\tools\\gdisk.efi,\\EFI\\tools\\gdisk_aa64.efi"
+#define NETBOOT_NAMES L"\\EFI\\tools\\ipxe.efi"
+#define MEMTEST_NAMES L"memtest86.efi,memtest86_aa64.efi,memtest86aa64.efi,bootaa64.efi"
+#define DRIVER_DIRS L"drivers,drivers_aa64"
+#define FALLBACK_FULLNAME L"EFI\\BOOT\\bootaa64.efi"
+#define FALLBACK_BASENAME L"bootaa64.efi"
+#define EFI_STUB_ARCH 0xaa64
+EFI_GUID gFreedesktopRootGuid = { 0xb921b045, 0x1df0, 0x41c3, { 0xaf, 0x44, 0x4c, 0x6f, 0x28, 0x0d, 0x3f, 0xae }};
#else
#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shell.efi"
#define GPTSYNC_NAMES L"\\EFI\\tools\\gptsync.efi"
#define DRIVER_DIRS L"drivers"
#define FALLBACK_FULLNAME L"EFI\\BOOT\\boot.efi" /* Not really correct */
#define FALLBACK_BASENAME L"boot.efi" /* Not really correct */
-// Below is GUID for ARM64
-EFI_GUID gFreedesktopRootGuid = { 0xb921b045, 0x1df0, 0x41c3, { 0xaf, 0x44, 0x4c, 0x6f, 0x28, 0x0d, 0x3f, 0xae }};
+// Below is GUID for ARM32
+EFI_GUID gFreedesktopRootGuid = { 0x69dad710, 0x2ce4, 0x4e3c, { 0xb1, 0x6c, 0x21, 0xa1, 0xd4, 0x9a, 0xbe, 0xd3 }};
#endif
#define FAT_ARCH 0x0ef1fab9 /* ID for Apple "fat" binary */
// Patterns that identify Linux kernels. Added to the loader match pattern when the
// scan_all_linux_kernels option is set in the configuration file. Causes kernels WITHOUT
// a ".efi" extension to be found when scanning for boot loaders.
-#define LINUX_MATCH_PATTERNS L"vmlinuz*,bzImage*"
+#define LINUX_MATCH_PATTERNS L"vmlinuz*,bzImage*,kernel*"
// Maximum length of a text string in certain menus
#define MAX_LINE_LENGTH 65
static VOID AboutrEFInd(VOID)
{
- CHAR16 *FirmwareVendor;
- INTN CsrStatus;
+ CHAR16 *FirmwareVendor;
+ UINT32 CsrStatus;
if (AboutMenu.EntryCount == 0) {
AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
- AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.9.2.6");
+ AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.10.0.6");
AddMenuInfoLine(&AboutMenu, L"");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012-2015 Roderick W. Smith");
#elif defined(EFIX64)
AddMenuInfoLine(&AboutMenu, PoolPrint(L" Platform: x86_64 (64 bit); Secure Boot %s",
secure_mode() ? L"active" : L"inactive"));
+#elif defined(EFIAARCH64)
+ AddMenuInfoLine(&AboutMenu, PoolPrint(L" Platform: ARM (64 bit); Secure Boot %s",
+ secure_mode() ? L"active" : L"inactive"));
#else
AddMenuInfoLine(&AboutMenu, L" Platform: unknown");
#endif
- CsrStatus = GetCsrStatus();
- RecordgCsrStatus(CsrStatus);
- if ((CsrStatus == -2) || (CsrStatus >= 0))
+ if (GetCsrStatus(&CsrStatus) == EFI_SUCCESS) {
+ RecordgCsrStatus(CsrStatus, FALSE);
AddMenuInfoLine(&AboutMenu, gCsrStatus);
+ }
FirmwareVendor = StrDuplicate(ST->FirmwareVendor);
LimitStringLength(FirmwareVendor, MAX_LINE_LENGTH); // More than ~65 causes empty info page on 800x600 display
AddMenuInfoLine(&AboutMenu, PoolPrint(L" Firmware: %s %d.%02d", FirmwareVendor, ST->FirmwareRevision >> 16,
// Returns TRUE if this file is a valid EFI loader file, and is proper ARCH
static BOOLEAN IsValidLoader(EFI_FILE *RootDir, CHAR16 *FileName) {
BOOLEAN IsValid = TRUE;
-#if defined (EFIX64) | defined (EFI32)
+#if defined (EFIX64) | defined (EFI32) | defined (EFIAARCH64)
EFI_STATUS Status;
EFI_FILE_HANDLE FileHandle;
CHAR8 Header[512];
// for information on Intel VMX features
static VOID DoEnableAndLockVMX(VOID)
{
+#if defined (EFIX64) | defined (EFI32)
UINT32 msr = 0x3a;
UINT32 low_bits = 0, high_bits = 0;
low_bits = 0x05;
msr = 0x3a;
__asm__ volatile ("wrmsr" : : "c" (msr), "a" (low_bits), "d" (high_bits));
- }
+ }
+#endif
} // VOID DoEnableAndLockVMX()
static VOID StartLoader(LOADER_ENTRY *Entry, CHAR16 *SelectionName)
} // if/else network boot
// detect specific loaders
- if (StriSubCmp(L"bzImage", NameClues) || StriSubCmp(L"vmlinuz", NameClues)) {
+ if (StriSubCmp(L"bzImage", NameClues) || StriSubCmp(L"vmlinuz", NameClues) || StriSubCmp(L"kernel", NameClues)) {
if (Volume->DiskKind != DISK_KIND_NET) {
GuessLinuxDistribution(&OSIconName, Volume, LoaderPath);
Entry->LoadOptions = GetMainLinuxOptions(LoaderPath, Volume);
NewLoader = LoaderList;
while (NewLoader != NULL) {
- IsLinux = (StriSubCmp(L"bzImage", NewLoader->FileName) || StriSubCmp(L"vmlinuz", NewLoader->FileName));
+ IsLinux = (StriSubCmp(L"bzImage", NewLoader->FileName) ||
+ StriSubCmp(L"vmlinuz", NewLoader->FileName) ||
+ StriSubCmp(L"kernel", NewLoader->FileName));
if ((FirstKernel != NULL) && IsLinux && GlobalConfig.FoldLinuxKernels) {
AddKernelToSubmenu(FirstKernel, NewLoader->FileName, Volume);
} else {
UINTN i, j, VolumeIndex;
UINT64 osind;
CHAR8 *b = 0;
+ UINT32 CsrValue;
MokLocations = StrDuplicate(MOK_LOCATIONS);
if (MokLocations != NULL)
break;
case TAG_CSR_ROTATE:
- if ((GetCsrStatus() >= 0) && (GlobalConfig.CsrValues)) {
+ if ((GetCsrStatus(&CsrValue) == EFI_SUCCESS) && (GlobalConfig.CsrValues)) {
TempMenuEntry = CopyMenuEntry(&MenuEntryRotateCsr);
TempMenuEntry->Image = BuiltinIcon(BUILTIN_ICON_FUNC_CSR_ROTATE);
AddMenuEntry(&MainMenu, TempMenuEntry);
FreeList((VOID ***) &(MainMenu.Entries), &MainMenu.EntryCount);
MainMenu.Entries = NULL;
MainMenu.EntryCount = 0;
- ReadConfig(GlobalConfig.ConfigFilename);
ConnectAllDriversToAllControllers();
ScanVolumes();
+ ReadConfig(GlobalConfig.ConfigFilename);
ScanForBootloaders();
ScanForTools();
SetupScreen();
if (GlobalConfig.LegacyType == LEGACY_TYPE_MAC)
CopyMem(GlobalConfig.ScanFor, "ihebocm ", NUM_SCAN_OPTIONS);
SetConfigFilename(ImageHandle);
+ MokProtocol = SecureBootSetup();
+ LoadDrivers();
+ ScanVolumes(); // Do before ReadConfig() because it needs SelfVolume->VolName
ReadConfig(GlobalConfig.ConfigFilename);
if (GlobalConfig.SpoofOSXVersion && GlobalConfig.SpoofOSXVersion[0] != L'\0')
refit_call4_wrapper(BS->SetWatchdogTimer, 0x0000, 0x0000, 0x0000, NULL);
// further bootstrap (now with config available)
- MokProtocol = SecureBootSetup();
- LoadDrivers();
- ScanVolumes();
ScanForBootloaders();
ScanForTools();
SetupScreen();