Revision: 14900
http://sourceforge.net/p/edk2/code/14900
Author: shenshushi
Date: 2013-11-26 07:36:29 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
Follow UEFI spec to add the definition for EFI_SPECIFICATION_VERSION, and
update other table version to refer to it. Remove the ?\226?\128?\156/D
TIANO_RELEASE_VERSION=0x00080006?\226?\128?\157 option in Nt32Pkg DSC file,
since it?\226?\128?\153s not used in source code.
Signed-off-by: Shumin Qiu <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
trunk/edk2/EdkShellPkg/EdkShellPkg.dsc
trunk/edk2/MdePkg/Include/Uefi/UefiSpec.h
trunk/edk2/Nt32Pkg/Nt32Pkg.dsc
Modified: trunk/edk2/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
===================================================================
--- trunk/edk2/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc 2013-11-26
05:41:34 UTC (rev 14899)
+++ trunk/edk2/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc 2013-11-26
07:36:29 UTC (rev 14900)
@@ -85,7 +85,7 @@
ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
-[BuildOptions]
+[BuildOptions.Common.EDK]
GCC:*_*_IA32_CC_FLAGS = -DEFI32 $(GCC_MACRO)
GCC:*_*_IA32_ASM_FLAGS =
GCC:*_*_IA32_VFRPP_FLAGS = -DEFI32 $(GCC_MACRO)
Modified: trunk/edk2/EdkShellPkg/EdkShellPkg.dsc
===================================================================
--- trunk/edk2/EdkShellPkg/EdkShellPkg.dsc 2013-11-26 05:41:34 UTC (rev
14899)
+++ trunk/edk2/EdkShellPkg/EdkShellPkg.dsc 2013-11-26 07:36:29 UTC (rev
14900)
@@ -188,7 +188,7 @@
$(EDK_SHELL_DIR)/ver/Ver.inf
$(EDK_SHELL_DIR)/vol/Vol.inf
-[BuildOptions]
+[BuildOptions.Common.EDK]
MSFT:*_*_IA32_CC_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D
PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
MSFT:*_*_IA32_ASM_FLAGS = /DEFI32
MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D
PI_SPECIFICATION_VERSION=0x00010000 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
Modified: trunk/edk2/MdePkg/Include/Uefi/UefiSpec.h
===================================================================
--- trunk/edk2/MdePkg/Include/Uefi/UefiSpec.h 2013-11-26 05:41:34 UTC (rev
14899)
+++ trunk/edk2/MdePkg/Include/Uefi/UefiSpec.h 2013-11-26 07:36:29 UTC (rev
14900)
@@ -1771,9 +1771,10 @@
#define EFI_1_10_SYSTEM_TABLE_REVISION ((1 << 16) | (10))
#define EFI_1_02_SYSTEM_TABLE_REVISION ((1 << 16) | (02))
#define EFI_SYSTEM_TABLE_REVISION EFI_2_40_SYSTEM_TABLE_REVISION
+#define EFI_SPECIFICATION_VERSION EFI_SYSTEM_TABLE_REVISION
#define EFI_RUNTIME_SERVICES_SIGNATURE SIGNATURE_64
('R','U','N','T','S','E','R','V')
-#define EFI_RUNTIME_SERVICES_REVISION EFI_2_40_SYSTEM_TABLE_REVISION
+#define EFI_RUNTIME_SERVICES_REVISION EFI_SPECIFICATION_VERSION
///
/// EFI Runtime Services Table.
@@ -1825,7 +1826,7 @@
#define EFI_BOOT_SERVICES_SIGNATURE SIGNATURE_64
('B','O','O','T','S','E','R','V')
-#define EFI_BOOT_SERVICES_REVISION EFI_2_40_SYSTEM_TABLE_REVISION
+#define EFI_BOOT_SERVICES_REVISION EFI_SPECIFICATION_VERSION
///
/// EFI Boot Services Table.
Modified: trunk/edk2/Nt32Pkg/Nt32Pkg.dsc
===================================================================
--- trunk/edk2/Nt32Pkg/Nt32Pkg.dsc 2013-11-26 05:41:34 UTC (rev 14899)
+++ trunk/edk2/Nt32Pkg/Nt32Pkg.dsc 2013-11-26 07:36:29 UTC (rev 14900)
@@ -448,12 +448,11 @@
[BuildOptions]
DEBUG_*_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT)
/BASE:0x10000 /ALIGN:4096 /FILEALIGN:4096 /SUBSYSTEM:CONSOLE
RELEASE_*_*_DLINK_FLAGS = /ALIGN:4096 /FILEALIGN:4096
- *_*_IA32_CC_FLAGS = /D EFI_SPECIFICATION_VERSION=0x0002000A /D
TIANO_RELEASE_VERSION=0x00080006
# Add override here, because default X64_CC_FLAGS add /X
- DEBUG_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE
/O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /D
EFI_SPECIFICATION_VERSION=0x0002000A /D TIANO_RELEASE_VERSION=0x00080006
-RELEASE_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE
/O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /D
EFI_SPECIFICATION_VERSION=0x0002000A /D TIANO_RELEASE_VERSION=0x00080006
-NOOPT_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /Gy
/FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od /D
EFI_SPECIFICATION_VERSION=0x0002000A /D TIANO_RELEASE_VERSION=0x00080006
+ DEBUG_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE
/O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
+ RELEASE_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE
/O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF
+ NOOPT_*_X64_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE
/Gy /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm /Od
#############################################################################################################
# NOTE:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing
conversations that shape the rapidly evolving mobile landscape. Sign up now.
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
