diff options
author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-11-30 09:25:57 +0000 |
---|---|---|
committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-11-30 09:25:57 +0000 |
commit | c47eca1a283fd8eadaf96a349c2e5ad28f4f7f2d (patch) | |
tree | 29a85bc6b5b93fab247c019925615d5b36338c89 /Nt32Pkg | |
parent | 706e75346786ac8abc02ba018e39b8765ef86abc (diff) | |
download | edk2-c47eca1a283fd8eadaf96a349c2e5ad28f4f7f2d.tar.gz edk2-c47eca1a283fd8eadaf96a349c2e5ad28f4f7f2d.tar.bz2 edk2-c47eca1a283fd8eadaf96a349c2e5ad28f4f7f2d.zip |
Roll back 4348 version for wrong check in.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4350 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Nt32Pkg')
-rw-r--r-- | Nt32Pkg/Nt32Pkg.fdf | 168 | ||||
-rw-r--r-- | Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c | 3 |
2 files changed, 55 insertions, 116 deletions
diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index 248dc6a1f4..8809805d24 100644 --- a/Nt32Pkg/Nt32Pkg.fdf +++ b/Nt32Pkg/Nt32Pkg.fdf @@ -80,7 +80,6 @@ DATA = { 0x00290000|0x00010000
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
-FV = FvDxe
################################################################################
#
@@ -92,8 +91,7 @@ FV = FvDxe # module statements.
#
################################################################################
-[FV.FvDxe]
-BlockSize = 0x10000
+[FV.FvRecovery]
FvAlignment = 16 #FV alignment and FV attributes setting.
ERASE_POLARITY = 1
MEMORY_MAPPED = TRUE
@@ -111,42 +109,48 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE
READ_LOCK_STATUS = TRUE
-#INF MdeModulePkg/Core/Dxe/DxeMain.inf
-FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
- SECTION COMPRESS PI_STD {
- SECTION GUIDED {
- SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi
- }
- }
+################################################################################
+#
+# The INF statements point to EDK component and EDK II module INF files, which will be placed into this FV image.
+# Parsing tools will scan the INF file to determine the type of component or module.
+# The component or module type is used to reference the standard rules
+# defined elsewhere in the FDF file.
+#
+# The format for INF statements is:
+# INF $(PathAndInfFileName)
+#
+################################################################################
+ ##
+ # PEI Phase modules
+ ##
+ ##
+ # PEI Apriori file example, more PEIM module added later.
+ ##
+APRIORI PEI {
+ INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+ INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
}
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
- SECTION COMPRESS PI_STD {
- SECTION GUIDED {
- SECTION RAW = MdeModulePkg/Logo/Logo.bmp
- }
- }
+APRIORI DXE {
+ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+ INF Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
}
-[FV.FvMain]
-BlockSize = 0x10000
-FvAlignment = 16 #FV alignment and FV attributes setting.
-ERASE_POLARITY = 1
-MEMORY_MAPPED = TRUE
-STICKY_WRITE = TRUE
-LOCK_CAP = TRUE
-LOCK_STATUS = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP = TRUE
-WRITE_STATUS = TRUE
-WRITE_LOCK_CAP = TRUE
-WRITE_LOCK_STATUS = TRUE
-READ_DISABLED_CAP = TRUE
-READ_ENABLED_CAP = TRUE
-READ_STATUS = TRUE
-READ_LOCK_CAP = TRUE
-READ_LOCK_STATUS = TRUE
+INF MdeModulePkg/Core/Pei/PeiMain.inf
+INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
+INF Nt32Pkg/BootModePei/BootModePei.inf
+INF Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
+INF MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
+INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
+INF Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
+INF Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
+INF Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf
+INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
-#INF MdeModulePkg/Core/Dxe/DxeMain.inf
+ ##
+ # DXE Phase modules
+ ##
+INF MdeModulePkg/Core/Dxe/DxeMain.inf
INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
INF Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
INF Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
@@ -191,83 +195,6 @@ INF Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf INF IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
INF MdeModulePkg/Application/HelloWorld/HelloWorld.inf
-
-[FV.FvRecovery]
-FvAlignment = 16 #FV alignment and FV attributes setting.
-ERASE_POLARITY = 1
-MEMORY_MAPPED = TRUE
-STICKY_WRITE = TRUE
-LOCK_CAP = TRUE
-LOCK_STATUS = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP = TRUE
-WRITE_STATUS = TRUE
-WRITE_LOCK_CAP = TRUE
-WRITE_LOCK_STATUS = TRUE
-READ_DISABLED_CAP = TRUE
-READ_ENABLED_CAP = TRUE
-READ_STATUS = TRUE
-READ_LOCK_CAP = TRUE
-READ_LOCK_STATUS = TRUE
-
-################################################################################
-#
-# The INF statements point to EDK component and EDK II module INF files, which will be placed into this FV image.
-# Parsing tools will scan the INF file to determine the type of component or module.
-# The component or module type is used to reference the standard rules
-# defined elsewhere in the FDF file.
-#
-# The format for INF statements is:
-# INF $(PathAndInfFileName)
-#
-################################################################################
- ##
- # PEI Phase modules
- ##
- ##
- # PEI Apriori file example, more PEIM module added later.
- ##
-APRIORI PEI {
- INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
- INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
- }
-APRIORI DXE {
- INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
- INF Nt32Pkg/MetronomeDxe/MetronomeDxe.inf
- }
-
-INF MdeModulePkg/Core/Pei/PeiMain.inf
-INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
-INF Nt32Pkg/BootModePei/BootModePei.inf
-INF Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
-INF MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
-INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
-INF Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
-INF Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf
-INF Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf
-#FILE PEIM = 86D70125-BAA3-4296-A62F-602BEBBB9081 {
-# SECTION PEI_DEPEX = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/IA32/MdeModulePkg/Core/DxeIplPeim/DxeIpl/OUTPUT/DxeIpl.depex
-# SECTION UI = "DxeIpl"
-# SECTION PE32 = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/IA32/MdeModulePkg/Core/DxeIplPeim/DxeIpl/DEBUG/DxeIpl.efi
-# }
-
-INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
-
-FILE FV_IMAGE = bdddaa2d-7f72-4a0d-b35a-bef1b64f6a09 {
- SECTION PEI_DEPEX = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/IA32/MdeModulePkg/Core/Pei/PeiMain/OUTPUT/PeiMain.depex
- SECTION DXE_DEPEX = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/IA32/MdeModulePkg/Core/Pei/PeiMain/OUTPUT/PeiMain.depex
- SECTION FV_IMAGE = FvMain
- }
- ##
- # DXE Phase modules
- ##
-INF MdeModulePkg/Core/Dxe/DxeMain.inf
-
-#FILE FV_IMAGE = cc00b922-8c49-4ea6-b6e9-17920bae36e0 {
-# SECTION FV_IMAGE = FvDxe
-# }
-
################################################################################
#
# FILE statements are provided so that a platform integrator can include
@@ -283,6 +210,21 @@ FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 { }
}
}
+FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
+ SECTION COMPRESS PI_STD {
+ SECTION GUIDED {
+ SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi
+ }
+ }
+ }
+FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
+ SECTION COMPRESS PI_STD {
+ SECTION GUIDED {
+ SECTION RAW = MdeModulePkg/Logo/Logo.bmp
+ }
+ }
+ }
+
################################################################################
#
@@ -322,7 +264,7 @@ FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 { [Rule.Common.PEIM]
FILE PEIM = $(NAMED_GUID) {
PEI_DEPEX PEI_DEPEX Optional |.depex
- PE32 PE32 |.efi
+ PE32 PE32 |.efi
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
diff --git a/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c b/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c index e78059385a..fa96836030 100644 --- a/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c +++ b/Nt32Pkg/WinNtFirmwareVolumePei/WinntFwh.c @@ -117,7 +117,6 @@ Returns: // Hard code the address of the spare block and variable services.
// Assume it's a hard coded offset from FV0 in FD0.
//
- // FdBase = FdBase + PcdGet32 (PcdWinNtFlashNvStorageVariableBase);
FdSize =
PcdGet32 (PcdFlashNvStorageVariableSize) +
PcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
@@ -125,8 +124,6 @@ Returns: PcdGet32 (PcdWinNtFlashNvStorageEventLogSize);
BuildFvHob (FdBase + PcdGet32 (PcdWinNtFlashNvStorageVariableBase), FdSize);
-
- BuildFvHob (FdBase + PcdGet32 (PcdWinNtFlashNvStorageFtwSpareBase), PcdGet32 (PcdFlashNvStorageFtwSpareSize));
} else {
//
// For other FD's just map them in.
|