X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Nt32Pkg%2FNt32Pkg.fdf;h=26eb28f2602cd3c5ab91c7d4c984652c146c0187;hb=ff37790d3d3805b232cecb19867d19f44860112c;hp=64f481e610b467cadd6a8b93164d4004d2324dd7;hpb=d87750555d7913028ac90c101ef64365a2837d89;p=mirror_edk2.git

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 64f481e610..26eb28f260 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -1,20 +1,31 @@
 # This is NT32 FDF file
+#
+# Copyright (c) 2007, Intel Corporation
+#
+#  All rights reserved. This program and the accompanying materials
+#    are licensed and made available under the terms and conditions of the BSD License
+#    which accompanies this distribution. The full text of the license may be found at
+#    http://opensource.org/licenses/bsd-license.php
+#
+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
 
 ################################################################################
 #
 # FD Section
 # The [FD] Section is made up of the definition statements and a
 # description of what goes into  the Flash Device Image.  Each FD section
-# defines one flash ¡°device¡± image.  A flash device image may be one of
+# defines one flash "device" image.  A flash device image may be one of
 # the following: Removable media bootable image (like a boot floppy
-# image,) an Option ROM image (that would be ¡°flashed¡± into an add-in
-# card,) a System ¡°Flash¡±  image (that would be burned into a system¡¯s
-# flash) or an Update (¡°Capsule¡±) image that will be used to update and
+# image,) an Option ROM image (that would be "flashed" into an add-in
+# card,) a System "Flash"  image (that would be burned into a system¡¯s
+# flash) or an Update ("Capsule") image that will be used to update and
 # existing system flash.
 #
 ################################################################################
 [FD.Fv_Recovery]
-BaseAddress   = 0x0|PcdFdBaseAddress  #The base address of the FLASH Device.
+BaseAddress   = 0x0|PcdWinNtFdBaseAddress  #The base address of the FLASH Device.
 Size          = 0x002a0000            #The size in bytes of the FLASH Device
 ErasePolarity = 1
 BlockSize     = 0x10000
@@ -27,20 +38,20 @@ NumBlocks     = 0x2a
 #
 # Regions must be defined in ascending order and may not overlap.
 #
-# A Layout Region start with a eight digit hex offset (leading ¡°0x¡± required) followed by
-# the pipe ¡°|¡± character, followed by the size of the region, also in hex with the leading
-# ¡°0x¡± characters. Like:
+# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by
+# the pipe "|" character, followed by the size of the region, also in hex with the leading
+# "0x" characters. Like:
 # Offset|Size
 # PcdOffsetCName|PcdSizeCName
 # RegionType <FV, DATA, or FILE>
 #
 ################################################################################
 0x00000000|0x00280000
-PcdFlashFvRecoveryBase|PcdFlashFvRecoverySize
+PcdWinNtFlashFvRecoveryBase|PcdWinNtFlashFvRecoverySize
 FV = FvRecovery
 
 0x00280000|0x0000c000
-PcdFlashNvStorageBase|PcdFlashNvStorageSize
+PcdWinNtFlashNvStorageVariableBase|PcdFlashNvStorageVariableSize
 DATA = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -56,10 +67,10 @@ DATA = {
 }
 
 0x0028c000|0x00002000
-PcdFlashNvStorageEventLogBase|PcdFlashNvStorageEventLogSize
+PcdWinNtFlashNvStorageEventLogBase|PcdWinNtFlashNvStorageEventLogSize
 
 0x0028e000|0x00002000
-PcdFlashNvStorageFtwWorkingBase|PcdFlashNvStorageFtwWorkingSize
+PcdWinNtFlashNvStorageFtwWorkingBase|PcdFlashNvStorageFtwWorkingSize
 DATA = {
   0x8d, 0x2b, 0xf1, 0xff, 0x96, 0x76, 0x8b, 0x4c,
   0xa9, 0x85, 0x27, 0x47, 0x07, 0x5b, 0x4f, 0x50,
@@ -68,7 +79,7 @@ DATA = {
 }
 
 0x00290000|0x00010000
-PcdFlashNvStorageFtwSpareBase|PcdFlashNvStorageFtwSpareBase
+PcdWinNtFlashNvStorageFtwSpareBase|PcdFlashNvStorageFtwSpareSize
 
 ################################################################################
 #
@@ -118,7 +129,7 @@ INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode
 INF  $(WORKSPACE)/Nt32Pkg/BootModePei/BootModePei.inf
 INF  $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
 INF  $(WORKSPACE)/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
-INF  $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/VariablePei.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
@@ -148,7 +159,7 @@ INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdE
 INF  $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf
 INF  $(WORKSPACE)/Nt32Pkg/TimerDxe/TimerDxe.inf
 INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
-INF  $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/VariableRuntimeDxe.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
@@ -183,21 +194,21 @@ INF  $(WORKSPACE)/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 # for binary shell, binary fat and logo module.
 #
 ################################################################################
-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 CHECKSUM {
+FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {
     SECTION COMPRESS PI_STD {
       SECTION GUIDED {
         SECTION PE32 = EdkShellBinPkg/FullShell/ia32/Shell_Full.efi
       }
     }
   }
-FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F CHECKSUM {
+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 CHECKSUM {
+FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
     SECTION COMPRESS PI_STD {
       SECTION GUIDED {
         SECTION RAW = MdeModulePkg/Logo/Logo.bmp
@@ -214,15 +225,35 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D CHECKSUM {
 # content of the FFS file.
 #
 ################################################################################
+
+
+############################################################################
+# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section   # 
+############################################################################
+#
+#[Rule.Common.DXE_DRIVER]
+#  FILE DRIVER = $(NAMED_GUID) CheckSum {
+#    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)
+#      }
+#    }
+#  }
+#
+############################################################################
+
 [Rule.Common.PEI_CORE]
-  FILE PEI_CORE = $(NAMED_GUID) CheckSum {
+  FILE PEI_CORE = $(NAMED_GUID) {
     PE32                $(INF_OUTPUT)/$(MODULE_NAME).efi
     UI Optional         $(MODULE_NAME)
     VERSION Optional    BUILD_NUM=$(BUILD_NUMBER) $(INF_VERSION)
   }
 
 [Rule.Common.PEIM]
-  FILE PEIM = $(NAMED_GUID) CheckSum {
+  FILE PEIM = $(NAMED_GUID) {
      PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).Depex
      PE32                      $(INF_OUTPUT)/$(MODULE_NAME).efi
      UI Optional               $(MODULE_NAME)
@@ -230,7 +261,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D CHECKSUM {
   }
 
 [Rule.Common.DXE_CORE]
-  FILE DXE_CORE = $(NAMED_GUID) CheckSum {
+  FILE DXE_CORE = $(NAMED_GUID) {
     COMPRESS PI_STD {
       PE32                      $(INF_OUTPUT)/$(MODULE_NAME).efi
       UI Optional               $(MODULE_NAME)
@@ -239,7 +270,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D CHECKSUM {
   }
 
 [Rule.Common.UEFI_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) CheckSum {
+  FILE DRIVER = $(NAMED_GUID) {
     COMPRESS PI_STD {
       GUIDED {
         DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex
@@ -251,7 +282,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D CHECKSUM {
   }
 
 [Rule.Common.DXE_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) CheckSum {
+  FILE DRIVER = $(NAMED_GUID) {
     COMPRESS PI_STD {
       GUIDED {
         DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex
@@ -263,7 +294,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D CHECKSUM {
   }
 
 [Rule.Common.DXE_RUNTIME_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) CheckSum {
+  FILE DRIVER = $(NAMED_GUID) {
     COMPRESS PI_STD {
       GUIDED {
         DXE_DEPEX Optional     $(INF_OUTPUT)/$(MODULE_NAME).depex
@@ -275,7 +306,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D CHECKSUM {
   }
 
 [Rule.Common.UEFI_APPLICATION]
-  FILE APPLICATION = $(NAMED_GUID) CheckSum {
+  FILE APPLICATION = $(NAMED_GUID) {
     COMPRESS PI_STD {
       GUIDED {
         PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi