1 files changed, 19 insertions, 9 deletions
diff --git a/HisiPkg/D01BoardPkg/Bds/BootMenu.c b/HisiPkg/D01BoardPkg/Bds/BootMenu.c
index 2bd84a024..4bc9cda82 100644
--- a/HisiPkg/D01BoardPkg/Bds/BootMenu.c
+++ b/HisiPkg/D01BoardPkg/Bds/BootMenu.c
@@ -784,22 +784,15 @@ EFI_STATUS LoadLinuxAtSecEnd()
     return Status;
 }
 
-EFI_STATUS
-BootGo (
-  IN LIST_ENTRY *BootOptionsList
-  )
+EFI_STATUS RunBootwrapper()
 {
   EFI_STATUS Status;
 
-  Status = ShutdownUefiBootServices ();
-  if(EFI_ERROR(Status)) {
-  DEBUG((EFI_D_ERROR,"ERROR: Can not shutdown UEFI boot services. Status=0x%X\n", Status));
-  }
-  
   *(UINTN*)(UINTN)(0xe302b000 + 0x18) = 0;
   *(UINTN*)(UINTN)(0xe302b000 + 0x1c) = 0;
 
   *(volatile UINT32 *)(0xe0000000 + 0x100) = TEXT_DDR_BASE;
+
   ArmCleanDataCache();
   *(UINT8*)(0xf4007000) = 'G';
   Status = LoadLinuxAtSecEnd();
@@ -811,6 +804,23 @@ BootGo (
   return Status;
 }
 
+EFI_STATUS
+BootGo (
+  IN LIST_ENTRY *BootOptionsList
+  )
+{
+  EFI_STATUS Status;
+
+  Status = ShutdownUefiBootServices ();
+  if(EFI_ERROR(Status)) {
+  DEBUG((EFI_D_ERROR,"ERROR: Can not shutdown UEFI boot services. Status=0x%X\n", Status));
+  }
+
+  Status = RunBootwrapper();
+
+  return Status;
+}
+
 struct BOOT_MAIN_ENTRY {
   CONST CHAR16* Description;
   EFI_STATUS (*Callback) (IN LIST_ENTRY *BootOptionsList);