Add error handling for TPM in S3 resume failure.

[mirror_edk2.git] / DuetPkg / BootSector / Mbr.S

diff --git a/DuetPkg/BootSector/Mbr.S b/DuetPkg/BootSector/Mbr.S
index a2431e19319bf0a831bfad3aa8db0bf977a9906c..65c97ea973c9f32a9173adf6390d4d8517df5c4f 100644 (file)
--- a/DuetPkg/BootSector/Mbr.S
+++ b/DuetPkg/BootSector/Mbr.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------\r
 #*\r
-#*   Copyright 2006 - 2007, Intel Corporation                                                         \r
-#*   All rights reserved. This program and the accompanying materials\r
+#*   Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+#*   This program and the accompanying materials\r
 #*   are licensed and made available under the terms and conditions of the BSD License\r
 #*   which accompanies this distribution.  The full text of the license may be found at\r
 #*   http://opensource.org/licenses/bsd-license.php\r
@@ -15,6 +15,8 @@
 #*\r
 #------------------------------------------------------------------------------\r
 \r
+    .code16 \r
+\r
 .equ                      BLOCK_SIZE, 0x0200\r
 .equ                      BLOCK_MASK, 0x01ff\r
 .equ                      BLOCK_SHIFT, 9\r
@@ -52,7 +54,7 @@ _start:
         xorw  %ax, %ax                            # AX = 0x0000\r
         movw  $0x7c00, %bx                        # BX = 0x7C00\r
         movw  $0x600, %bp                         # BP = 0x0600\r
-        movw  RelocatedStart, %si                 # SI = Offset(RelocatedStart)\r
+        movw  $RelocatedStart, %si                # SI = Offset(RelocatedStart)\r
         movw  $0x200, %cx                         # CX = 0x0200\r
         subw  %si, %cx                            # CS = 0x0200 - Offset(RelocatedStart)\r
         leaw  (%bp,%si,), %di                     # DI = 0x0600 + Offset(RelocatedStart)\r