Revision: 15821
http://sourceforge.net/p/edk2/code/15821
Author: jljusten
Date: 2014-08-18 23:03:30 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
UefiCpuPkg: Support building VTF0 ResetVector during the EDK II build
Using NASM we build VTF0 as part of the EDK II build process.
v2:
* Use EDK II extension of .nasmb rather than .nasmbin
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Laszlo Ersek <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Build.py
Added Paths:
-----------
trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf
trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb
Removed Paths:
-------------
trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/ResetVectorCode.asm
Modified: trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Build.py
===================================================================
--- trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Build.py 2014-08-18 23:03:17 UTC
(rev 15820)
+++ trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Build.py 2014-08-18 23:03:30 UTC
(rev 15821)
@@ -36,7 +36,7 @@
'-D', 'ARCH_%s' % arch.upper(),
'-D', 'DEBUG_%s' % str(debugType).upper(),
'-o', output,
- 'ResetVectorCode.asm',
+ 'Vtf0.nasmb',
)
ret = RunCommand(commandLine)
print '\tASM\t' + output
Deleted: trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/ResetVectorCode.asm
===================================================================
--- trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/ResetVectorCode.asm 2014-08-18
23:03:17 UTC (rev 15820)
+++ trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/ResetVectorCode.asm 2014-08-18
23:03:30 UTC (rev 15821)
@@ -1,53 +0,0 @@
-;------------------------------------------------------------------------------
-; @file
-; This file includes all other code files to assemble the reset vector code
-;
-; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>
-; This program and the accompanying materials
-; are licensed and made available under the terms and conditions of the BSD
License
-; which accompanies this distribution. The full text of the license may be
found at
-; http://opensource.org/licenses/bsd-license.php
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-;
-;------------------------------------------------------------------------------
-
-%ifdef ARCH_IA32
- %ifdef ARCH_X64
- %error "Only one of ARCH_IA32 or ARCH_X64 can be defined."
- %endif
-%elifdef ARCH_X64
-%else
- %error "Either ARCH_IA32 or ARCH_X64 must be defined."
-%endif
-
-%include "CommonMacros.inc"
-
-%include "PostCodes.inc"
-
-%ifdef DEBUG_NONE
- %include "DebugDisabled.asm"
-%elifdef DEBUG_PORT80
- %include "Port80Debug.asm"
-%elifdef DEBUG_SERIAL
- %include "SerialDebug.asm"
-%else
- %error "No debug type was specified."
-%endif
-
-%include "Ia32/SearchForBfvBase.asm"
-%include "Ia32/SearchForSecEntry.asm"
-
-%ifdef ARCH_X64
-%include "Ia32/Flat32ToFlat64.asm"
-%include "Ia32/PageTables64.asm"
-%endif
-
-%include "Ia16/Real16ToFlat32.asm"
-%include "Ia16/Init16.asm"
-
-%include "Main.asm"
-
-%include "Ia16/ResetVectorVtf0.asm"
-
Added: trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf
===================================================================
--- trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf
(rev 0)
+++ trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf 2014-08-18 23:03:30 UTC
(rev 15821)
@@ -0,0 +1,32 @@
+## @file
+# Reset Vector
+#
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+#
+# This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD
License
+# which accompanies this distribution. The full text of the license may be
found at
+# http://opensource.org/licenses/bsd-license.php
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
+#
+##
+
+[Defines]
+ INF_VERSION = 0x00010005
+ BASE_NAME = ResetVector
+ FILE_GUID = 1BA0062E-C779-4582-8566-336AE8F78F09
+ MODULE_TYPE = SEC
+ VERSION_STRING = 1.1
+
+#
+# The following information is for reference only and not required by the
build tools.
+#
+# VALID_ARCHITECTURES = IA32 X64
+#
+
+[Sources]
+ Vtf0.nasmb
+
+[Packages]
+ MdePkg/MdePkg.dec
Copied: trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb (from rev 15820,
trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/ResetVectorCode.asm)
===================================================================
--- trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb
(rev 0)
+++ trunk/edk2/UefiCpuPkg/ResetVector/Vtf0/Vtf0.nasmb 2014-08-18 23:03:30 UTC
(rev 15821)
@@ -0,0 +1,66 @@
+;------------------------------------------------------------------------------
+; @file
+; This file includes all other code files to assemble the reset vector code
+;
+; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>
+; This program and the accompanying materials
+; are licensed and made available under the terms and conditions of the BSD
License
+; which accompanies this distribution. The full text of the license may be
found at
+; http://opensource.org/licenses/bsd-license.php
+;
+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+;
+;------------------------------------------------------------------------------
+
+;
+; If neither ARCH_IA32 nor ARCH_X64 are defined, then try to include
+; Base.h to use the C pre-processor to determine the architecture.
+;
+%ifndef ARCH_IA32
+ %ifndef ARCH_X64
+ #include <Base.h>
+ #if defined (MDE_CPU_IA32)
+ %define ARCH_IA32
+ #elif defined (MDE_CPU_X64)
+ %define ARCH_X64
+ #endif
+ %endif
+%endif
+
+%ifdef ARCH_IA32
+ %ifdef ARCH_X64
+ %error "Only one of ARCH_IA32 or ARCH_X64 can be defined."
+ %endif
+%elifdef ARCH_X64
+%else
+ %error "Either ARCH_IA32 or ARCH_X64 must be defined."
+%endif
+
+%include "CommonMacros.inc"
+
+%include "PostCodes.inc"
+
+%ifdef DEBUG_PORT80
+ %include "Port80Debug.asm"
+%elifdef DEBUG_SERIAL
+ %include "SerialDebug.asm"
+%else
+ %include "DebugDisabled.asm"
+%endif
+
+%include "Ia32/SearchForBfvBase.asm"
+%include "Ia32/SearchForSecEntry.asm"
+
+%ifdef ARCH_X64
+%include "Ia32/Flat32ToFlat64.asm"
+%include "Ia32/PageTables64.asm"
+%endif
+
+%include "Ia16/Real16ToFlat32.asm"
+%include "Ia16/Init16.asm"
+
+%include "Main.asm"
+
+%include "Ia16/ResetVectorVtf0.asm"
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
