Index: AppPkg/AppPkg.dsc
===================================================================
--- AppPkg/AppPkg.dsc	(revision 16313)
+++ AppPkg/AppPkg.dsc	(working copy)
@@ -24,7 +24,7 @@
   DSC_SPECIFICATION              = 0x00010006
   OUTPUT_DIRECTORY               = Build/AppPkg
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 #
Index: ArmPkg/ArmPkg.dsc
===================================================================
--- ArmPkg/ArmPkg.dsc	(revision 16313)
+++ ArmPkg/ArmPkg.dsc	(working copy)
@@ -26,7 +26,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/Arm
   SUPPORTED_ARCHITECTURES        = ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [BuildOptions]
Index: ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc
===================================================================
--- ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc	(working copy)
@@ -22,7 +22,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmJuno
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf
 
Index: ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
===================================================================
--- ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc	(working copy)
@@ -22,7 +22,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
   SUPPORTED_ARCHITECTURES        = ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmPlatformPkg-2ndstage.fdf
 
Index: ArmPlatformPkg/ArmPlatformPkg.dsc
===================================================================
--- ArmPlatformPkg/ArmPlatformPkg.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmPlatformPkg.dsc	(working copy)
@@ -22,7 +22,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)
   SUPPORTED_ARCHITECTURES        = ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmPlatformPkg.fdf
 
Index: ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
===================================================================
--- ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc	(working copy)
@@ -23,7 +23,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmRealViewEb-RTSM-A8
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
 
Index: ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
===================================================================
--- ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc	(working copy)
@@ -23,7 +23,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmRealViewEb-RTSM-A9x2
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
 
Index: ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
===================================================================
--- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc	(working copy)
@@ -23,7 +23,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmVExpress-CTA15-A7
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
   DEFINE EDK2_SKIP_PEICORE=1
Index: ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
===================================================================
--- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc	(working copy)
@@ -22,7 +22,7 @@
   PLATFORM_VERSION               = 0.1
   DSC_SPECIFICATION              = 0x00010005
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
 
Index: ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
===================================================================
--- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc	(working copy)
@@ -23,7 +23,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmVExpress-FVP-AArch64
   SUPPORTED_ARCHITECTURES        = AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
 
Index: ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
===================================================================
--- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc	(working copy)
@@ -23,7 +23,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmVExpress-RTSM-A15
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
 
Index: ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
===================================================================
--- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc	(working copy)
@@ -23,7 +23,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmVExpress-RTSM-A15_MPCore
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
 
Index: ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
===================================================================
--- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc	(working copy)
@@ -23,7 +23,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmVExpress-RTSM-A9x4
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
 
Index: ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc
===================================================================
--- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc	(working copy)
@@ -23,7 +23,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmVExpress-RTSM-AEMv8Ax4-foundation
   SUPPORTED_ARCHITECTURES        = AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
 
Index: ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
===================================================================
--- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc	(working copy)
@@ -23,7 +23,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmVExpress-RTSM-AEMv8Ax4
   SUPPORTED_ARCHITECTURES        = AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
 
Index: ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
===================================================================
--- ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc	(revision 16313)
+++ ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc	(working copy)
@@ -24,7 +24,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/ArmVirtualizationQemu-$(ARCH)
   SUPPORTED_ARCHITECTURES        = AARCH64|ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf
 
Index: BeagleBoardPkg/BeagleBoardPkg.dsc
===================================================================
--- BeagleBoardPkg/BeagleBoardPkg.dsc	(revision 16313)
+++ BeagleBoardPkg/BeagleBoardPkg.dsc	(working copy)
@@ -25,7 +25,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/BeagleBoard
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = BeagleBoardPkg/BeagleBoardPkg.fdf
 
Index: CryptoPkg/CryptoPkg.dsc
===================================================================
--- CryptoPkg/CryptoPkg.dsc	(revision 16313)
+++ CryptoPkg/CryptoPkg.dsc	(working copy)
@@ -24,7 +24,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/CryptoPkg
   SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 ################################################################################
Index: DuetPkg/DuetPkgIa32.dsc
===================================================================
--- DuetPkg/DuetPkgIa32.dsc	(revision 16313)
+++ DuetPkg/DuetPkgIa32.dsc	(working copy)
@@ -28,7 +28,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/DuetPkgIA32
   SUPPORTED_ARCHITECTURES        = IA32
-  BUILD_TARGETS                  = DEBUG
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = DuetPkg/DuetPkg.fdf
 
Index: DuetPkg/DuetPkgX64.dsc
===================================================================
--- DuetPkg/DuetPkgX64.dsc	(revision 16313)
+++ DuetPkg/DuetPkgX64.dsc	(working copy)
@@ -28,7 +28,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/DuetPkgX64
   SUPPORTED_ARCHITECTURES        = X64
-  BUILD_TARGETS                  = DEBUG
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = DuetPkg/DuetPkg.fdf
 
Index: EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
===================================================================
--- EdkCompatibilityPkg/EdkCompatibilityPkg.dsc	(revision 16313)
+++ EdkCompatibilityPkg/EdkCompatibilityPkg.dsc	(working copy)
@@ -26,7 +26,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/EdkCompatibilityPkg
   SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|EBC
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 DEFINE MSFT_MACRO                = /D EFI_SPECIFICATION_VERSION=0x00020000 /D PI_SPECIFICATION_VERSION=0x00009000 /D TIANO_RELEASE_VERSION=0x00080006 /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000 /D EFI_DEBUG
 DEFINE INTEL_MACRO                = /D EFI_SPECIFICATION_VERSION=0x00020000 /D PI_SPECIFICATION_VERSION=0x00009000 /D TIANO_RELEASE_VERSION=0x00080006 /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xE0000000 /D EFI_DEBUG
Index: EdkShellPkg/EdkShellPkg.dsc
===================================================================
--- EdkShellPkg/EdkShellPkg.dsc	(revision 16313)
+++ EdkShellPkg/EdkShellPkg.dsc	(working copy)
@@ -22,7 +22,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/EdkShellPkg
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 # 
 # Change the macro to the directory containing the source code from EDK Shell Project.  
Index: EmbeddedPkg/EmbeddedPkg.dsc
===================================================================
--- EmbeddedPkg/EmbeddedPkg.dsc	(revision 16313)
+++ EmbeddedPkg/EmbeddedPkg.dsc	(working copy)
@@ -27,7 +27,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/Embedded
   SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = EmbeddedPkg/EmbeddedPkg.fdf
 
Index: EmulatorPkg/EmulatorPkg.dsc
===================================================================
--- EmulatorPkg/EmulatorPkg.dsc	(revision 16313)
+++ EmulatorPkg/EmulatorPkg.dsc	(working copy)
@@ -29,7 +29,7 @@
 !endif
 
   SUPPORTED_ARCHITECTURES        = X64|IA32
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = EmulatorPkg/EmulatorPkg.fdf
 
Index: IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
===================================================================
--- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc	(revision 16313)
+++ IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc	(working copy)
@@ -26,7 +26,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/IntelFrameworkModuleAll
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC|ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 ################################################################################
Index: IntelFrameworkPkg/IntelFrameworkPkg.dsc
===================================================================
--- IntelFrameworkPkg/IntelFrameworkPkg.dsc	(revision 16313)
+++ IntelFrameworkPkg/IntelFrameworkPkg.dsc	(working copy)
@@ -27,7 +27,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/IntelFramework
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC|ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 ################################################################################
Index: IntelFspPkg/IntelFspPkg.dsc
===================================================================
--- IntelFspPkg/IntelFspPkg.dsc	(revision 16313)
+++ IntelFspPkg/IntelFspPkg.dsc	(working copy)
@@ -18,7 +18,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/IntelFspPkg
   SUPPORTED_ARCHITECTURES        = IA32
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses]
Index: IntelFspWrapperPkg/IntelFspWrapperPkg.dsc
===================================================================
--- IntelFspWrapperPkg/IntelFspWrapperPkg.dsc	(revision 16313)
+++ IntelFspWrapperPkg/IntelFspWrapperPkg.dsc	(working copy)
@@ -20,7 +20,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/IntelFspWrapperPkg
   SUPPORTED_ARCHITECTURES        = IA32|X64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses]
Index: MdeModulePkg/MdeModulePkg.dsc
===================================================================
--- MdeModulePkg/MdeModulePkg.dsc	(revision 16313)
+++ MdeModulePkg/MdeModulePkg.dsc	(working copy)
@@ -20,7 +20,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/MdeModule
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC|ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses]
Index: MdePkg/MdePkg.dsc
===================================================================
--- MdePkg/MdePkg.dsc	(revision 16313)
+++ MdePkg/MdePkg.dsc	(working copy)
@@ -21,7 +21,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/Mde
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC|ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [PcdsFeatureFlag]
Index: NetworkPkg/NetworkPkg.dsc
===================================================================
--- NetworkPkg/NetworkPkg.dsc	(revision 16313)
+++ NetworkPkg/NetworkPkg.dsc	(working copy)
@@ -20,7 +20,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/NetworkPkg
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC|ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses]
Index: Nt32Pkg/Nt32Pkg.dsc
===================================================================
--- Nt32Pkg/Nt32Pkg.dsc	(revision 16313)
+++ Nt32Pkg/Nt32Pkg.dsc	(working copy)
@@ -28,7 +28,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/NT32$(ARCH)
   SUPPORTED_ARCHITECTURES        = IA32|X64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = Nt32Pkg/Nt32Pkg.fdf
   #
Index: Omap35xxPkg/Omap35xxPkg.dsc
===================================================================
--- Omap35xxPkg/Omap35xxPkg.dsc	(revision 16313)
+++ Omap35xxPkg/Omap35xxPkg.dsc	(working copy)
@@ -25,7 +25,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/Omap35xxPkg
   SUPPORTED_ARCHITECTURES        = ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   DEFINE TARGET_HACK             = DEBUG
 
Index: OptionRomPkg/OptionRomPkg.dsc
===================================================================
--- OptionRomPkg/OptionRomPkg.dsc	(revision 16313)
+++ OptionRomPkg/OptionRomPkg.dsc	(working copy)
@@ -30,7 +30,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/OptionRomPkg
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 ################################################################################
Index: OvmfPkg/OvmfPkgIa32.dsc
===================================================================
--- OvmfPkg/OvmfPkgIa32.dsc	(revision 16313)
+++ OvmfPkg/OvmfPkgIa32.dsc	(working copy)
@@ -25,7 +25,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/OvmfIa32
   SUPPORTED_ARCHITECTURES        = IA32
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = OvmfPkg/OvmfPkgIa32.fdf
 
Index: OvmfPkg/OvmfPkgIa32X64.dsc
===================================================================
--- OvmfPkg/OvmfPkgIa32X64.dsc	(revision 16313)
+++ OvmfPkg/OvmfPkgIa32X64.dsc	(working copy)
@@ -25,7 +25,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/Ovmf3264
   SUPPORTED_ARCHITECTURES        = IA32|X64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = OvmfPkg/OvmfPkgIa32X64.fdf
 
Index: OvmfPkg/OvmfPkgX64.dsc
===================================================================
--- OvmfPkg/OvmfPkgX64.dsc	(revision 16313)
+++ OvmfPkg/OvmfPkgX64.dsc	(working copy)
@@ -25,7 +25,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/OvmfX64
   SUPPORTED_ARCHITECTURES        = X64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = OvmfPkg/OvmfPkgX64.fdf
 
Index: PcAtChipsetPkg/PcAtChipsetPkg.dsc
===================================================================
--- PcAtChipsetPkg/PcAtChipsetPkg.dsc	(revision 16313)
+++ PcAtChipsetPkg/PcAtChipsetPkg.dsc	(working copy)
@@ -20,7 +20,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/PcAtChipset
   SUPPORTED_ARCHITECTURES        = IA32|X64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses]
Index: PerformancePkg/PerformancePkg.dsc
===================================================================
--- PerformancePkg/PerformancePkg.dsc	(revision 16313)
+++ PerformancePkg/PerformancePkg.dsc	(working copy)
@@ -19,7 +19,7 @@
   PLATFORM_VERSION               = 0.2
   OUTPUT_DIRECTORY               = Build/PerformancePkg
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses]
Index: SecurityPkg/SecurityPkg.dsc
===================================================================
--- SecurityPkg/SecurityPkg.dsc	(revision 16313)
+++ SecurityPkg/SecurityPkg.dsc	(working copy)
@@ -19,7 +19,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/SecurityPkg
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses]
Index: ShellPkg/ShellPkg.dsc
===================================================================
--- ShellPkg/ShellPkg.dsc	(revision 16313)
+++ ShellPkg/ShellPkg.dsc	(working copy)
@@ -20,7 +20,7 @@
   DSC_SPECIFICATION              = 0x00010006
   OUTPUT_DIRECTORY               = Build/Shell
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64|EBC|ARM|AARCH64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses.common]
Index: SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
===================================================================
--- SourceLevelDebugPkg/SourceLevelDebugPkg.dsc	(revision 16313)
+++ SourceLevelDebugPkg/SourceLevelDebugPkg.dsc	(working copy)
@@ -26,7 +26,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/SourceLevelDebugPkg
   SUPPORTED_ARCHITECTURES        = IA32|X64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses.common]
Index: StdLib/StdLib.dsc
===================================================================
--- StdLib/StdLib.dsc	(revision 16313)
+++ StdLib/StdLib.dsc	(working copy)
@@ -28,7 +28,7 @@
   DSC_SPECIFICATION              = 0x00010006
   OUTPUT_DIRECTORY               = Build/StdLib
   SUPPORTED_ARCHITECTURES        = IA32|X64|ARM
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 #
Index: UefiCpuPkg/UefiCpuPkg.dsc
===================================================================
--- UefiCpuPkg/UefiCpuPkg.dsc	(revision 16313)
+++ UefiCpuPkg/UefiCpuPkg.dsc	(working copy)
@@ -20,7 +20,7 @@
   DSC_SPECIFICATION              = 0x00010005
   OUTPUT_DIRECTORY               = Build/UefiCpu
   SUPPORTED_ARCHITECTURES        = IA32|IPF|X64
-  BUILD_TARGETS                  = DEBUG|RELEASE
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 #
