We enabled X64 native version NT32, and made it works on Windows 7 X64 OS.

Signed-off-by: Jiamin Ma <mjmthy@gmail.com>
Reviewed by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed by: Liming Gao <liming.gao@intel.com>
Reviewed by: Jiewen Yao <jiewen.yao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14766 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 26 insertions, 10 deletions

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 923bc4e7a9..56c97e51b1 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -27,7 +27,7 @@
   PLATFORM_VERSION               = 0.4

   DSC_SPECIFICATION              = 0x00010005

   OUTPUT_DIRECTORY               = Build/NT32

-  SUPPORTED_ARCHITECTURES        = IA32

+  SUPPORTED_ARCHITECTURES        = IA32|X64

   BUILD_TARGETS                  = DEBUG|RELEASE

   SKUID_IDENTIFIER               = DEFAULT

   FLASH_DEFINITION               = Nt32Pkg/Nt32Pkg.fdf

@@ -119,6 +119,7 @@
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

+  LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf

   

 !if $(SECURE_BOOT_ENABLE) == TRUE

   PlatformSecureLib|Nt32Pkg/Library/PlatformSecureLib/PlatformSecureLib.inf

@@ -208,6 +209,7 @@
 [PcdsFeatureFlag]

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildPageTables|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|TRUE

 

@@ -239,7 +241,6 @@
 ################################################################################

 [PcdsDynamicDefault.common.DEFAULT]

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort|L"COM1!COM2"|VOID*|20

-  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\..\..\..\EdkShellBinPkg\Bin\Ia32\Apps"|VOID*|106

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA Window 2"|VOID*|52

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console Window"|VOID*|52

   gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk|L"FW;40960;512"|VOID*|26

@@ -251,6 +252,12 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0

 

+[PcdsDynamicDefault.Ia32]

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\..\..\..\EdkShellBinPkg\Bin\Ia32\Apps"|VOID*|106

+

+[PcdsDynamicDefault.x64]

+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\..\..\..\EdkShellBinPkg\Bin\X64\Apps"|VOID*|106

+

 [PcdsDynamicHii.common.DEFAULT]

   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutColumn|L"SetupConsoleConfig"|gEfiNt32PkgTokenSpaceGuid|0x0|80

   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutRow|L"SetupConsoleConfig"|gEfiNt32PkgTokenSpaceGuid|0x4|25

@@ -275,11 +282,15 @@
 #       generated for it, but the binary will not be put into any firmware volume.

 #

 ###################################################################################################

-[Components.IA32]

+[Components]

   ##

   #  SEC Phase modules

   ##

-  Nt32Pkg/Sec/SecMain.inf

+  Nt32Pkg/Sec/SecMain.inf {

+  <BuildOptions>

+    # Add override here, because default X64_CC_FLAGS is already overriden in DSC

+    MSFT:*_*_X64_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE

+  }

 

   ##

   #  PEI Phase modules

@@ -315,7 +326,7 @@
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf

       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

     <BuildOptions>

-      *_*_IA32_CC_FLAGS =

+      *_*_*_CC_FLAGS =

   }

 

   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {

@@ -429,19 +440,24 @@
 #

 ###################################################################################################

 [BuildOptions]

-  DEBUG_*_IA32_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000 /ALIGN:4096 /FILEALIGN:4096 /SUBSYSTEM:CONSOLE

-  RELEASE_*_IA32_DLINK_FLAGS = /ALIGN:4096 /FILEALIGN:4096

+  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

+

 #############################################################################################################

 # NOTE:

-# The following [Libraries.IA32] section is for building EDK module under the EDKII tool chain.

-# If you want build EDK module for Nt32 platform, please uncomment [Libraries.IA32] section and

+# The following [Libraries] section is for building EDK module under the EDKII tool chain.

+# If you want build EDK module for Nt32 platform, please uncomment [Libraries] section and

 # libraries used by that EDK module.

 # Currently, Nt32 platform do not has any EDK style module

 #

 #

-#[Libraries.IA32]

+#[Libraries]

   #

   # Libraries common to PEI and DXE

   #