Add Tper Reset Logic by using MOR bit.

[mirror_edk2.git] / Nt32Pkg / Nt32Pkg.fdf

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 4e041ab6656ff726da17ac3456d63005b0a64e67..b00cb774d71ff6e6b3cf47fbacc18a81f962cbfe 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -1,8 +1,9 @@
+## @file\r
 # This is NT32 FDF file with UEFI HII features enabled\r
 #\r
-# Copyright (c) 2007 - 2009, Intel Corporation\r
+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
 #\r
-#  All rights reserved. This program and the accompanying materials\r
+#    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
 #    which accompanies this distribution. The full text of the license may be found at\r
 #    http://opensource.org/licenses/bsd-license.php\r
@@ -73,10 +74,17 @@ DATA = {
   #Blockmap[1]: End\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   ## This is the VARIABLE_STORE_HEADER\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+  #Signature: gEfiAuthenticatedVariableGuid =\r
+  #  { 0xaaf32c78, 0x947b, 0x439a, { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}\r
+  0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,\r
+  0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,\r
+!else\r
   #Signature: gEfiVariableGuid =\r
   #  { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}\r
   0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,\r
   0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,\r
+!endif\r
   #Size: 0xc000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0xBFB8\r
   # This can speed up the Variable Dispatch a bit.\r
   0xB8, 0xBF, 0x00, 0x00,\r
@@ -155,7 +163,7 @@ FvNameGuid         = 6D99E806-3D38-42c2-A095-5F4300BFD7DC
 APRIORI PEI {\r
   INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
   INF  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf\r
-  INF  IntelFrameworkModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf\r
+  INF  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf\r
   INF  Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf\r
   }\r
 APRIORI DXE {\r
@@ -166,13 +174,20 @@ APRIORI DXE {
 INF  MdeModulePkg/Core/Pei/PeiMain.inf\r
 INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
 INF  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf\r
-INF  IntelFrameworkModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf\r
+INF  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf\r
 INF  Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf\r
 INF  Nt32Pkg/BootModePei/BootModePei.inf\r
+INF  Nt32Pkg/StallPei/StallPei.inf\r
 INF  Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf\r
 INF  Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf\r
 INF  Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf\r
+\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+INF  SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf\r
+!else\r
 INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
+!endif\r
+\r
 INF  Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf\r
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
@@ -187,7 +202,6 @@ INF  Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
 INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 INF  Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
-INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
 INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
@@ -196,13 +210,17 @@ INF  Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf
 INF  Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf\r
 INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
 INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
-INF  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf\r
 INF  Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
 INF  Nt32Pkg/TimerDxe/TimerDxe.inf\r
 INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\r
-INF  IntelFrameworkModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
+INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
 INF  Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+INF  SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf\r
+INF  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+!else\r
 INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+!endif\r
 INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
@@ -234,6 +252,7 @@ INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
 INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf\r
 INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
 INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
+INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
 INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
 INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
 INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
@@ -277,10 +296,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 #\r
 #[Rule.Common.DXE_DRIVER]\r
 #  FILE DRIVER = $(NAMED_GUID) {\r
-#    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+#    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
 #    COMPRESS PI_STD {\r
 #      GUIDED {\r
-#        PE32     PE32                    |.efi\r
+#        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
 #        UI       STRING="$(MODULE_NAME)" Optional\r
 #        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
 #      }\r
@@ -291,15 +310,15 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32    Align=4K     |.efi\r
+    PE32     PE32    Align=4K     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional         \r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)    \r
   }\r
 \r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
-     PEI_DEPEX PEI_DEPEX Optional        |.depex\r
-     PE32      PE32    Align=4K          |.efi\r
+     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+     PE32      PE32    Align=4K          $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional         \r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   \r
   }\r
@@ -307,7 +326,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
-      PE32     PE32      |.efi\r
+      PE32     PE32      $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI       STRING="$(MODULE_NAME)" Optional\r
       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -315,10 +334,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    |.efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -327,9 +346,9 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.UEFI_DRIVER.TIANOCOMPRESSED]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
-      PE32     PE32                    |.efi\r
+      PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
       UI       STRING="$(MODULE_NAME)" Optional\r
       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
     }\r
@@ -337,10 +356,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    |.efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -349,10 +368,10 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex\r
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    |.efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r
@@ -363,7 +382,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
   FILE APPLICATION = $(NAMED_GUID) {\r
     COMPRESS PI_STD {\r
       GUIDED {\r
-        PE32     PE32                    |.efi\r
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
         UI       STRING="$(MODULE_NAME)" Optional\r
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
       }\r