From 3f54e8f57ab174f07c0bd5ff6d3fb77c5470380b Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Mon, 27 Jan 2020 15:32:04 -0700
Subject: [PATCH] Skip volumes that do not have an EFI volume

---
 IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index a797682751..8150f9a477 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -3277,6 +3277,13 @@ BdsLibEnumerateAllBootOption (
       DevicePath  = DevicePathFromHandle (BlockIoHandles[Index]);
       DevicePathType = BdsGetBootTypeFromDevicePath (DevicePath);
 
+      //
+      // Skip devices that do not have an EFI volume
+      //
+      if (BdsLibGetBootableHandle (DevicePath) == NULL) {
+        continue;
+      }
+
       // Do NVMe devices first, all others second
       if (DPTIndex == 0) {
         if (DevicePathType != BDS_EFI_MESSAGE_NVME_BOOT) {