OVMF ResetVector: Modify interface with SEC module

[mirror_edk2.git] / OvmfPkg / ResetVector / ResetVectorCode.asm

diff --git a/OvmfPkg/ResetVector/ResetVectorCode.asm b/OvmfPkg/ResetVector/ResetVectorCode.asm
index 4339505635569887ba3ac808aaab9fa88b3c11c3..8b139423045b25a2abf4540de68a0d958f84aad9 100644 (file)
--- a/OvmfPkg/ResetVector/ResetVectorCode.asm
+++ b/OvmfPkg/ResetVector/ResetVectorCode.asm
@@ -1,6 +1,8 @@
 ;------------------------------------------------------------------------------\r
+; @file\r
+; This file includes all other code files to assemble the reset vector code\r
 ;\r
-; Copyright (c) 2008, Intel Corporation\r
+; Copyright (c) 2008 - 2009, Intel Corporation\r
 ; All rights reserved. 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
@@ -9,14 +11,6 @@
 ; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 ; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 ;\r
-; Module Name:\r
-;\r
-;   ResetVectorCode.asm\r
-;\r
-; Abstract:\r
-;\r
-;   Create code for VTF raw section.\r
-;\r
 ;------------------------------------------------------------------------------\r
 \r
 %ifdef ARCH_IA32\r
@@ -29,15 +23,30 @@
 %endif\r
 \r
 %include "CommonMacros.inc"\r
-%include "SerialDebug.asm"\r
+\r
+%include "PostCodes.inc"\r
+\r
+%ifdef DEBUG_NONE\r
+  %include "DebugDisabled.asm"\r
+%elifdef DEBUG_PORT80\r
+  %include "Port80Debug.asm"\r
+%elifdef DEBUG_SERIAL\r
+  %include "SerialDebug.asm"\r
+%else\r
+  %error "No debug type was specified."\r
+%endif\r
+\r
 %include "Ia32/SearchForBfvBase.asm"\r
-%include "Ia32/SearchForSecAndPeiEntries.asm"\r
-%include "JumpToSec.asm"\r
-%include "Ia16/16RealTo32Flat.asm"\r
+%include "Ia32/SearchForSecEntry.asm"\r
 \r
 %ifdef ARCH_X64\r
 %include "Ia32/32FlatTo64Flat.asm"\r
 %endif\r
 \r
+%include "Ia16/16RealTo32Flat.asm"\r
+%include "Ia16/Init16.asm"\r
+\r
+%include "Main.asm"\r
+\r
 %include "Ia16/ResetVectorVtf0.asm"\r
 \r