X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Nt32Pkg%2FNt32Pkg.fdf;h=fc65e181429706d65884a39a7ef75ecf130ab00c;hb=db168de9b09ab36330fb74af590cc80ef6a9e85a;hp=f7591fceba343a384e3dcd523963a03dcbf94a1b;hpb=8df425cb512a572c6589e4fef7942987b9532373;p=mirror_edk2.git diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index f7591fceba..fc65e18142 100644 --- a/Nt32Pkg/Nt32Pkg.fdf +++ b/Nt32Pkg/Nt32Pkg.fdf @@ -25,8 +25,8 @@ # ################################################################################ [FD.Fv_Recovery] -BaseAddress = 0x0|PcdWinNtFdBaseAddress #The base address of the FLASH Device. -Size = 0x002a0000 #The size in bytes of the FLASH Device +BaseAddress = 0x0|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress #The base address of the FLASH Device. +Size = 0x002a0000 #The size in bytes of the FLASH Device ErasePolarity = 1 BlockSize = 0x10000 NumBlocks = 0x2a @@ -47,11 +47,11 @@ NumBlocks = 0x2a # ################################################################################ 0x00000000|0x00280000 -PcdWinNtFlashFvRecoveryBase|PcdWinNtFlashFvRecoverySize +gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize FV = FvRecovery 0x00280000|0x0000c000 -PcdWinNtFlashNvStorageVariableBase|PcdFlashNvStorageVariableSize +gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize DATA = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -67,10 +67,10 @@ DATA = { } 0x0028c000|0x00002000 -PcdWinNtFlashNvStorageEventLogBase|PcdWinNtFlashNvStorageEventLogSize +gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize 0x0028e000|0x00002000 -PcdWinNtFlashNvStorageFtwWorkingBase|PcdFlashNvStorageFtwWorkingSize +gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize DATA = { 0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c, 0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50, @@ -79,7 +79,7 @@ DATA = { } 0x00290000|0x00010000 -PcdWinNtFlashNvStorageFtwSpareBase|PcdFlashNvStorageFtwSpareSize +gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize ################################################################################ # @@ -123,68 +123,78 @@ READ_LOCK_STATUS = TRUE ## # PEI Phase modules ## -INF $(WORKSPACE)/MdeModulePkg/Core/Pei/PeiMain.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/PCD/Pei/Pcd.inf -INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf -INF $(WORKSPACE)/Nt32Pkg/BootModePei/BootModePei.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtFirmwareVolumePei/WinNtFirmwareVolumePei.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocolPei.inf -INF $(WORKSPACE)/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf + ## + # 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 +INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf ## # DXE Phase modules ## -INF $(WORKSPACE)/MdeModulePkg/Core/Dxe/DxeMain.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf -INF $(WORKSPACE)/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf -INF $(WORKSPACE)/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf -INF $(WORKSPACE)/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf -INF $(WORKSPACE)/Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf -INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/Crc32SectionExtractDxe/Crc32SectionExtractDxe.inf -INF $(WORKSPACE)/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf -INF $(WORKSPACE)/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf -INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf -INF $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf -INF $(WORKSPACE)/Nt32Pkg/TimerDxe/TimerDxe.inf -INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf -INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf -INF $(WORKSPACE)/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Bus/Pci/AtapiPassThruDxe/AtapiPassThru.inf -INF $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf ##This driver follows UEFI specification definition -INF $(WORKSPACE)/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf ##This driver follows UEFI specification definition -INF $(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtConsoleDxe/WinNtConsoleDxe.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf -INF $(WORKSPACE)/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf -INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf -INF $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf +INF MdeModulePkg/Core/Dxe/DxeMain.inf +INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +INF Nt32Pkg/MetronomeDxe/MetronomeDxe.inf +INF Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf +INF Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf +INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf +INF Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf +INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf +INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf +INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf +INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf +INF IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf +INF Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf +INF Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf +INF Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf +INF MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf +INF IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf +INF Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf +INF Nt32Pkg/TimerDxe/TimerDxe.inf +INF IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf +INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf +INF MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf +INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf +INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf +INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf +INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf +INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf +INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf +INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf +INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf +INF IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf +INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf +INF MdeModulePkg/Bus/Pci/AtapiPassThruDxe/AtapiPassThru.inf +INF IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf +INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf ##This driver follows UEFI specification definition +INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf ##This driver follows UEFI specification definition +INF IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf +INF Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf +INF Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf +INF Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIoDxe.inf +INF Nt32Pkg/WinNtGopDxe/WinNtGopDxe.inf +INF Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf +INF IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf +INF MdeModulePkg/Application/HelloWorld/HelloWorld.inf ################################################################################ # @@ -232,13 +242,13 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D { ############################################################################ # #[Rule.Common.DXE_DRIVER] -# FILE DRIVER = $(NAMED_GUID) CheckSum { +# FILE DRIVER = $(NAMED_GUID) { +# DXE_DEPEX DXE_DEPEX Optional |.depex # COMPRESS PI_STD { # GUIDED { -# DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex -# PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi -# UI Optional $(MODULE_NAME) -# VERSION Optional BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION) +# PE32 PE32 |.efi +# UI STRING="$(MODULE_NAME)" Optional +# VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) # } # } # } @@ -247,60 +257,60 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D { [Rule.Common.PEI_CORE] FILE PEI_CORE = $(NAMED_GUID) { - PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi - UI Optional $(MODULE_NAME) - VERSION Optional BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION) + PE32 PE32 |.efi + UI STRING ="$(MODULE_NAME)" Optional + VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } [Rule.Common.PEIM] FILE PEIM = $(NAMED_GUID) { - PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).Depex - PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi - UI Optional $(MODULE_NAME) - VERSION Optional BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION) + PEI_DEPEX PEI_DEPEX Optional |.depex + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } [Rule.Common.DXE_CORE] FILE DXE_CORE = $(NAMED_GUID) { COMPRESS PI_STD { - PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi - UI Optional $(MODULE_NAME) - VERSION Optional BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION) + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } } [Rule.Common.UEFI_DRIVER] FILE DRIVER = $(NAMED_GUID) { + DXE_DEPEX DXE_DEPEX Optional |.depex COMPRESS PI_STD { GUIDED { - DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex - PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi - UI Optional $(MODULE_NAME) - VERSION Optional BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION) + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } } } [Rule.Common.DXE_DRIVER] FILE DRIVER = $(NAMED_GUID) { + DXE_DEPEX DXE_DEPEX Optional |.depex COMPRESS PI_STD { GUIDED { - DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex - PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi - UI Optional $(MODULE_NAME) - VERSION Optional BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION) + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } } } [Rule.Common.DXE_RUNTIME_DRIVER] FILE DRIVER = $(NAMED_GUID) { + DXE_DEPEX DXE_DEPEX Optional |.depex COMPRESS PI_STD { GUIDED { - DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex - PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi - UI Optional $(MODULE_NAME) - VERSION Optional BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION) + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } } } @@ -309,9 +319,9 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D { FILE APPLICATION = $(NAMED_GUID) { COMPRESS PI_STD { GUIDED { - PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi - UI Optional $(MODULE_NAME) - VERSION Optional BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION) + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } } }