Merge branch 'linaro-topic-menu' into linaro-tracking-2013.05

2 files changed, 25 insertions, 4 deletions

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
index f85831755..d2ec52cad 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -49,12 +49,13 @@ LibResetSystem (
   case EfiResetWarm:

     // Map a warm reset into a cold reset

   case EfiResetCold:

-  case EfiResetShutdown:

     // Send the REBOOT function to the platform microcontroller

     ArmPlatformSysConfigSet (SYS_CFG_REBOOT, 0);

-

-    // We should never be here

-    while(1);

+    break;

+  case EfiResetShutdown:

+    // Send the SHUTDOWN function to the platform microcontroller

+    ArmPlatformSysConfigSet (SYS_CFG_SHUTDOWN, 0);

+    break;

   }

 

   ASSERT(FALSE);

diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c
index 2280e8c3c..94ec9f66d 100644
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -696,12 +696,32 @@ BootShell (
   return Status;

 }

 

+EFI_STATUS
+Reboot (
+  IN LIST_ENTRY *BootOptionsList
+  )
+{
+  gRT->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
+  return EFI_UNSUPPORTED;
+}
+
+EFI_STATUS
+Shutdown (
+  IN LIST_ENTRY *BootOptionsList
+  )
+{
+  gRT->ResetSystem(EfiResetShutdown, EFI_SUCCESS, 0, NULL);
+  return EFI_UNSUPPORTED;
+}
+
 struct BOOT_MAIN_ENTRY {

   CONST CHAR16* Description;

   EFI_STATUS (*Callback) (IN LIST_ENTRY *BootOptionsList);

 } BootMainEntries[] = {

     { L"Boot Manager", BootMenuManager },

     { L"Shell", BootShell },
+    { L"Reboot", Reboot },
+    { L"Shutdown", Shutdown },
 };