summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Lin <GLin@suse.com>2019-07-30 01:16:08 -0700
committerMichael D Kinney <michael.d.kinney@intel.com>2019-08-09 12:07:37 -0700
commit43368ba61316d122955036a323d8e1aba4cedf1b (patch)
tree3bd02bace6ab82c54380bc18f6ac0a8efd22e686
parent812b291c5589b396229a36f7f5115f7e28430f12 (diff)
Vlv2TbltDevicePkg: Adjust the device priority
In BootOptionPriority(), the higher number implies the lower boot priority. This commit lowers the priority of network booting and raises the priority of the local devices. Besides, SD and EMMC are also added to BootOptionPriority() since Minnowboard comes with a SD card slot. v2: Also match MSG_URI_DP to sort HTTP Boot options Cc: Zailiang Sun <zailiang.sun@intel.com> Cc: Yi Qian <yi.qian@intel.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Gary Lin <glin@suse.com> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
-rw-r--r--Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/PlatformBootOption.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/PlatformBootOption.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/PlatformBootOption.c
index 84aa097d..195b3f30 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/PlatformBootOption.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/PlatformBootOption.c
@@ -499,11 +499,10 @@ BootOptionType (
Returns the priority number.
OptionType EFI
------------------------------------
- PXE 2
- DVD 4
- USB 6
- NVME 7
- HDD 8
+ HDD 2
+ USB 4
+ SATA/NVME/SD 6
+ PXE/HTTP 8
EFI Shell 9
Others 100
@@ -518,21 +517,23 @@ BootOptionPriority (
// EFI boot options
//
switch (BootOptionType (BootOption->FilePath)) {
- case MSG_MAC_ADDR_DP:
- case MSG_VLAN_DP:
- case MSG_IPv4_DP:
- case MSG_IPv6_DP:
- return 2;
+ case MSG_USB_DP:
+ return 4;
case MSG_SATA_DP:
case MSG_ATAPI_DP:
case MSG_UFS_DP:
case MSG_NVME_NAMESPACE_DP:
- return 4;
-
- case MSG_USB_DP:
+ case MSG_SD_DP:
+ case MSG_EMMC_DP:
return 6;
+ case MSG_MAC_ADDR_DP:
+ case MSG_VLAN_DP:
+ case MSG_IPv4_DP:
+ case MSG_IPv6_DP:
+ case MSG_URI_DP:
+ return 8;
}
if (StrCmp (BootOption->Description, INTERNAL_UEFI_SHELL_NAME) == 0) {
if (PcdGetBool (PcdBootToShellOnly)) {
@@ -541,7 +542,7 @@ BootOptionPriority (
return 9;
}
if (StrCmp (BootOption->Description, UEFI_HARD_DRIVE_NAME) == 0) {
- return 8;
+ return 2;
}
return 100;
}