BaseTools GNUmakefile: Move HOST_ARCH detection into common makefile

[mirror_edk2.git] / Nt32Pkg / Nt32Pkg.fdf

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index bbb4cccb34681568e182ebef87e91c76e7300540..d104cb764504e7d9de0d08492f49b46fb9fd8fdb 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -200,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
@@ -256,11 +256,21 @@ INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
 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
@@ -279,12 +289,13 @@ INF  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.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 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