Merge branch 'linaro-topic-misc' into linaro-tracking-2013.06linaro-uefi-2013.06-rc2

1 files changed, 8 insertions, 1 deletions

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
index f858317550..f32b533094 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -49,12 +49,19 @@ 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);

+

+    // We should never be here

+    while(1);

+    break;

   }

 

   ASSERT(FALSE);