From 84374b9593cb8ca1648e27ace02d4ac60709ed1b Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Mon, 29 Oct 2007 04:58:20 +0000 Subject: [PATCH] Adjust the build infrastructure to support IA32 architect build. Ia32.dsc is more suitable than reuse Nt32.dsc git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4225 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Platform/{Nt32 => Ia32}/Build/Config.env | 12 ++-- .../Build/Nt32.dsc => Ia32/Build/Ia32.dsc} | 57 +------------------ .../Platform/{Nt32 => Ia32}/Build/Makefile | 0 .../{Nt32 => Ia32}/Build/PlatformTools.env | 6 +- .../Platform/{Nt32 => Ia32}/Build/build.bat | 0 .../Sample/Platform/Ipf/Build/IPF.dsc | 3 +- .../Sample/Platform/X64/Build/X64.dsc | 4 +- 7 files changed, 15 insertions(+), 67 deletions(-) rename EdkCompatibilityPkg/Sample/Platform/{Nt32 => Ia32}/Build/Config.env (81%) rename EdkCompatibilityPkg/Sample/Platform/{Nt32/Build/Nt32.dsc => Ia32/Build/Ia32.dsc} (55%) rename EdkCompatibilityPkg/Sample/Platform/{Nt32 => Ia32}/Build/Makefile (100%) rename EdkCompatibilityPkg/Sample/Platform/{Nt32 => Ia32}/Build/PlatformTools.env (90%) rename EdkCompatibilityPkg/Sample/Platform/{Nt32 => Ia32}/Build/build.bat (100%) diff --git a/EdkCompatibilityPkg/Sample/Platform/Nt32/Build/Config.env b/EdkCompatibilityPkg/Sample/Platform/Ia32/Build/Config.env similarity index 81% rename from EdkCompatibilityPkg/Sample/Platform/Nt32/Build/Config.env rename to EdkCompatibilityPkg/Sample/Platform/Ia32/Build/Config.env index 43d7fa939a..51ce1dd6a5 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Nt32/Build/Config.env +++ b/EdkCompatibilityPkg/Sample/Platform/Ia32/Build/Config.env @@ -21,13 +21,13 @@ #--*/ BUILD_TARGET_DIRECTORY = Build -EFI_DEBUG = YES -EFI_DEBUG_CLEAR_MEMORY = YES -EFI_PEI_PERFORMANCE = YES -EFI_DXE_PERFORMANCE = YES -EFI_SYMBOLIC_DEBUG = YES +EFI_DEBUG = NO +EFI_DEBUG_CLEAR_MEMORY = NO +EFI_PEI_PERFORMANCE = NO +EFI_DXE_PERFORMANCE = NO +EFI_SYMBOLIC_DEBUG = NO EFI_GENERATE_INTERMEDIATE_FILE = NO -EFI_PEI_REPORT_STATUS_CODE = YES +EFI_PEI_REPORT_STATUS_CODE = NO UEFI_MODE = YES PI_MODE = YES USE_VC8 = NO diff --git a/EdkCompatibilityPkg/Sample/Platform/Nt32/Build/Nt32.dsc b/EdkCompatibilityPkg/Sample/Platform/Ia32/Build/Ia32.dsc similarity index 55% rename from EdkCompatibilityPkg/Sample/Platform/Nt32/Build/Nt32.dsc rename to EdkCompatibilityPkg/Sample/Platform/Ia32/Build/Ia32.dsc index 03c14e0dc2..220847a6b9 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Nt32/Build/Nt32.dsc +++ b/EdkCompatibilityPkg/Sample/Platform/Ia32/Build/Ia32.dsc @@ -11,7 +11,7 @@ # # Module Name: # -# Nt32.dsc +# Ia32.dsc # # Abstract: # @@ -82,14 +82,11 @@ DEFINE EDK_PREFIX= # [=============================================================================] [Libraries.Platform] -Sample\Platform\Nt32\Protocol\EdkNt32ProtocolLib.inf -Sample\Library\Dxe\WinNt\WinNtLib.inf -#Sample\Platform\Generic\MonoStatusCode\Library\Pei\MemoryStatusCode\MemoryStatusCode.inf Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\BsDataHubStatusCode\BsDataHubStatusCode.inf Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtMemoryStatusCode\RtMemoryStatusCode.inf Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtPlatformStatusCode\$(PROJECT_NAME)\RtPlatformStatusCode.inf -Other\Maintained\Application\Shell\Library\EfiShellLib.inf +#Other\Maintained\Application\Shell\Library\EfiShellLib.inf [=============================================================================] # @@ -99,56 +96,8 @@ Other\Maintained\Application\Shell\Library\EfiShellLib.inf [Components] DEFINE PACKAGE=Default -#Other\Maintained\Application\Shell\Shell.inf +#Add EDK INF file here: #Other\Maintained\Application\Shell\ShellFull.inf -Other\Maintained\Application\Shell\attrib\attrib.inf -Other\Maintained\Application\Shell\cls\cls.inf -Other\Maintained\Application\Shell\comp\comp.inf -Other\Maintained\Application\Shell\cp\cp.inf -Other\Maintained\Application\Shell\date\date.inf -Other\Maintained\Application\Shell\dblk\dblk.inf -Other\Maintained\Application\Shell\devices\devices.inf -Other\Maintained\Application\Shell\DeviceTree\devicetree.inf -Other\Maintained\Application\Shell\dmem\dmem.inf -Other\Maintained\Application\Shell\dmpstore\dmpstore.inf -Other\Maintained\Application\Shell\drivers\drivers.inf -Other\Maintained\Application\Shell\drvcfg\drvcfg.inf -Other\Maintained\Application\Shell\drvdiag\drvdiag.inf -Other\Maintained\Application\Shell\edit\edit.inf -Other\Maintained\Application\Shell\EfiCompress\compress.inf -Other\Maintained\Application\Shell\EfiDecompress\Decompress.inf -Other\Maintained\Application\Shell\err\err.inf -Other\Maintained\Application\Shell\guid\guid.inf -Other\Maintained\Application\Shell\hexedit\hexedit.inf -Other\Maintained\Application\Shell\IfConfig\IfConfig.inf -Other\Maintained\Application\Shell\IpConfig\IpConfig.inf -Other\Maintained\Application\Shell\load\load.inf -Other\Maintained\Application\Shell\LoadPciRom\LoadPciRom.inf -Other\Maintained\Application\Shell\ls\ls.inf -Other\Maintained\Application\Shell\mem\mem.inf -Other\Maintained\Application\Shell\memmap\memmap.inf -Other\Maintained\Application\Shell\mkdir\mkdir.inf -Other\Maintained\Application\Shell\mm\mm.inf -Other\Maintained\Application\Shell\mode\mode.inf -Other\Maintained\Application\Shell\mount\mount.inf -Other\Maintained\Application\Shell\mv\mv.inf -Other\Maintained\Application\Shell\newshell\nshell.inf -Other\Maintained\Application\Shell\openinfo\openinfo.inf -Other\Maintained\Application\Shell\pci\pci.inf -Other\Maintained\Application\Shell\Ping\Ping.inf -Other\Maintained\Application\Shell\reset\reset.inf -Other\Maintained\Application\Shell\rm\rm.inf -Other\Maintained\Application\Shell\sermode\sermode.inf -Other\Maintained\Application\Shell\SmbiosView\Smbiosview.inf -Other\Maintained\Application\Shell\stall\stall.inf -Other\Maintained\Application\Shell\TelnetMgmt\TelnetMgmt.inf -Other\Maintained\Application\Shell\time\time.inf -Other\Maintained\Application\Shell\touch\touch.inf -Other\Maintained\Application\Shell\type\type.inf -Other\Maintained\Application\Shell\tzone\timezone.inf -Other\Maintained\Application\Shell\unload\unload.inf -Other\Maintained\Application\Shell\ver\Ver.inf -Other\Maintained\Application\Shell\vol\Vol.inf [=============================================================================] diff --git a/EdkCompatibilityPkg/Sample/Platform/Nt32/Build/Makefile b/EdkCompatibilityPkg/Sample/Platform/Ia32/Build/Makefile similarity index 100% rename from EdkCompatibilityPkg/Sample/Platform/Nt32/Build/Makefile rename to EdkCompatibilityPkg/Sample/Platform/Ia32/Build/Makefile diff --git a/EdkCompatibilityPkg/Sample/Platform/Nt32/Build/PlatformTools.env b/EdkCompatibilityPkg/Sample/Platform/Ia32/Build/PlatformTools.env similarity index 90% rename from EdkCompatibilityPkg/Sample/Platform/Nt32/Build/PlatformTools.env rename to EdkCompatibilityPkg/Sample/Platform/Ia32/Build/PlatformTools.env index ec799ab2f5..224783c39c 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Nt32/Build/PlatformTools.env +++ b/EdkCompatibilityPkg/Sample/Platform/Ia32/Build/PlatformTools.env @@ -25,7 +25,7 @@ # # Set the project name # -PROJECT_NAME = Nt32 +PROJECT_NAME = Ia32 # # Set the build directory @@ -54,8 +54,8 @@ EFI_ASL_LOCAL = NO # Processor architecture specific and global macros can be found in # CommonTools.env, macros named xxx_ARCH_FLAGS and xxx_STD_FLAGS respectively. # -C_PROJ_FLAGS = /D UNICODE /D NEW_PEI_HOBS -ASM_PROJ_FLAGS = /Cx /Zd /Fl$*.lst /DEFI_NT_EMULATOR +C_PROJ_FLAGS = /O1 /D UNICODE /D NEW_PEI_HOBS +ASM_PROJ_FLAGS = /Cx /Zd /Fl$*.lst LINK_PROJ_FLAGS = LIB_PROJ_FLAGS = EBC_C_PROJ_FLAGS = diff --git a/EdkCompatibilityPkg/Sample/Platform/Nt32/Build/build.bat b/EdkCompatibilityPkg/Sample/Platform/Ia32/Build/build.bat similarity index 100% rename from EdkCompatibilityPkg/Sample/Platform/Nt32/Build/build.bat rename to EdkCompatibilityPkg/Sample/Platform/Ia32/Build/build.bat diff --git a/EdkCompatibilityPkg/Sample/Platform/Ipf/Build/IPF.dsc b/EdkCompatibilityPkg/Sample/Platform/Ipf/Build/IPF.dsc index c36e6b0436..d1574df403 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Ipf/Build/IPF.dsc +++ b/EdkCompatibilityPkg/Sample/Platform/Ipf/Build/IPF.dsc @@ -95,7 +95,8 @@ Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\BsSerialStatusCode\BsSerialSta [Components] DEFINE PACKAGE=Default +#Add EDK INF file here: #Other\Maintained\Application\Shell\Shell.inf -Other\Maintained\Application\Shell\ShellFull.inf + [=============================================================================] diff --git a/EdkCompatibilityPkg/Sample/Platform/X64/Build/X64.dsc b/EdkCompatibilityPkg/Sample/Platform/X64/Build/X64.dsc index 4dd85ae95c..2893d8794c 100644 --- a/EdkCompatibilityPkg/Sample/Platform/X64/Build/X64.dsc +++ b/EdkCompatibilityPkg/Sample/Platform/X64/Build/X64.dsc @@ -89,8 +89,6 @@ DEFINE PROCESSOR=X64 Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\BsDataHubStatusCode\BsDataHubStatusCode.inf Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtMemoryStatusCode\RtMemoryStatusCode.inf -#Other\Maintained\Application\Shell\Library\EfiShellLib.inf - [=============================================================================] # # These are the components that will be built by the master makefile @@ -99,7 +97,7 @@ Sample\Platform\Generic\RuntimeDxe\StatusCode\Lib\RtMemoryStatusCode\RtMemorySta [Components] DEFINE PACKAGE=Default -#Other\Maintained\Application\Shell\Shell.inf +#Add EDK INF file here: #Other\Maintained\Application\Shell\ShellFull.inf