1 files changed, 18 insertions, 18 deletions
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 30c48f48e..efe881bf2 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -655,24 +655,6 @@ BdsLibBootViaBootOption (
   }
 
   //
-  // Signal the EVT_SIGNAL_READY_TO_BOOT event
-  //
-  EfiSignalEventReadyToBoot();
-
-  //
-  // Expand USB Class or USB WWID device path node to be full device path of a USB
-  // device in platform then load the boot file on this full device path and get the
-  // image handle.
-  //
-  ImageHandle = BdsExpandUsbShortFormDevicePath (DevicePath);
-
-  //
-  // Adjust the different type memory page number just before booting
-  // and save the updated info into the variable for next boot to use
-  //
-  BdsSetMemoryTypeInformationVariable ();
-
-  //
   // Set Boot Current
   //
   if (IsBootOptionValidNVVarialbe (Option)) {
@@ -691,6 +673,24 @@ BdsLibBootViaBootOption (
   }
 
   //
+  // Signal the EVT_SIGNAL_READY_TO_BOOT event
+  //
+  EfiSignalEventReadyToBoot();
+
+  //
+  // Expand USB Class or USB WWID device path node to be full device path of a USB
+  // device in platform then load the boot file on this full device path and get the
+  // image handle.
+  //
+  ImageHandle = BdsExpandUsbShortFormDevicePath (DevicePath);
+
+  //
+  // Adjust the different type memory page number just before booting
+  // and save the updated info into the variable for next boot to use
+  //
+  BdsSetMemoryTypeInformationVariable ();
+
+  //
   // By expanding the USB Class or WWID device path, the ImageHandle has returnned.
   // Here get the ImageHandle for the non USB class or WWID device path.
   //