BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / Nt32Pkg / Nt32Pkg.fdf

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index b46580e9c5a74949be47777f787b816fdf013423..db2719fd99df478771feb3d079771a99764e237e 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -1,7 +1,8 @@
 ## @file\r
 # This is NT32 FDF file with UEFI HII features enabled\r
 #\r
-# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -26,11 +27,11 @@
 #\r
 ################################################################################\r
 [FD.Nt32]\r
-BaseAddress   = 0x0|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress  #The base address of the FLASH Device.\r
-Size          = 0x002a0000                                           #The size in bytes of the FLASH Device\r
+BaseAddress   = 0x0|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress          #The base address of the FLASH Device.\r
+Size          = 0x00480000|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize  #The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
-NumBlocks     = 0x2a\r
+NumBlocks     = 0x48\r
 \r
 ################################################################################\r
 #\r
@@ -47,11 +48,11 @@ NumBlocks     = 0x2a
 # RegionType <FV, DATA, or FILE>\r
 #\r
 ################################################################################\r
-0x00000000|0x00280000\r
+0x00000000|0x00460000\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize\r
 FV = FvRecovery\r
 \r
-0x00280000|0x0000c000\r
+0x00460000|0x0000c000\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
 #NV_VARIABLE_STORE\r
 DATA = {\r
@@ -92,11 +93,11 @@ DATA = {
   0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r
-0x0028c000|0x00002000\r
+0x0046c000|0x00002000\r
 #NV_EVENT_LOG\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize\r
 \r
-0x0028e000|0x00002000\r
+0x0046e000|0x00002000\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
 #NV_FTW_WORKING\r
 DATA = {\r
@@ -110,7 +111,7 @@ DATA = {
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r
-0x00290000|0x00010000\r
+0x00470000|0x00010000\r
 #NV_FTW_SPARE\r
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
 \r
@@ -170,6 +171,9 @@ APRIORI DXE {
   INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
   INF  Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
+  INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\r
+  INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
+  INF  Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf\r
   }\r
 \r
 INF  MdeModulePkg/Core/Pei/PeiMain.inf\r
@@ -196,7 +200,7 @@ INF  MdeModulePkg/Core/Dxe/DxeMain.inf
 INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
 INF  Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
 INF  Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
-INF  Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
+INF  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
 INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 INF  Nt32Pkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
@@ -206,13 +210,9 @@ INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF  Nt32Pkg/WinNtThunkDxe/WinNtThunkDxe.inf\r
 INF  Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf\r
-!if $(USE_NEW_BDS) == TRUE\r
 INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-INF  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf\r
+INF  MdeModulePkg/Application/UiApp/UiApp.inf\r
 INF  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
-!else\r
-INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-!endif\r
 INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
 INF  Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
 INF  Nt32Pkg/TimerDxe/TimerDxe.inf\r
@@ -252,16 +252,34 @@ INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
 INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
 INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
 INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-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
 INF  Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
+!if $(NETWORK_IP6_ENABLE) == TRUE\r
+INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
+INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
+INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
+INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
+INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
+INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
+!else\r
+INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
 INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
 INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
+!endif\r
+INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
+INF  NetworkPkg/DnsDxe/DnsDxe.inf\r
+INF  NetworkPkg/HttpDxe/HttpDxe.inf\r
+INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
+!if $(TLS_ENABLE) == TRUE\r
+INF  NetworkPkg/TlsDxe/TlsDxe.inf\r
+INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
+!endif\r
+INF  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf\r
 ################################################################################\r
 #\r
 # FILE statements are provided so that a platform integrator can include\r
@@ -271,18 +289,16 @@ INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
 #\r
 ################################################################################\r
 !ifndef $(USE_OLD_SHELL)\r
-INF  ShellBinPkg/UefiShell/UefiShell.inf\r
+INF  ShellPkg/Application/Shell/Shell.inf\r
 !else\r
 INF  EdkShellBinPkg/FullShell/FullShell.inf\r
 !endif\r
 \r
-INF FatBinPkg/EnhancedFatDxe/Fat.inf\r
-\r
-FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
-    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-  }\r
-\r
+INF FatPkg/EnhancedFatDxe/Fat.inf\r
+INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
 \r
+INF MdeModulePkg/Logo/LogoDxe.inf\r
+INF MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf\r
 ################################################################################\r
 #\r
 # Rules are use with the [FV] section's module INF type to define\r