X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UnixPkg%2FUnixPkg.fdf;h=2a6ee25f6ce473144e8b88c1e54af625d13ce573;hb=3594574d13d7531ac220f84c714509c83e2722b0;hp=23d1d95ca8958fd730d6a6b24ec03fa048e52625;hpb=97ada49f3181ec678dddd25a35437164049793da;p=mirror_edk2.git

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 23d1d95ca8..2a6ee25f6c 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -217,7 +217,9 @@ INF  UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 INF  UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
 INF  UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
-INF  UnixPkg/UnixUgaDxe/UnixUga.inf
+#INF  UnixPkg/UnixUgaDxe/UnixUga.inf
+INF  UnixPkg/UnixGopDxe/UnixGop.inf
+
 #INF  UnixPkg/UnixConsoleDxe/UnixConsole.inf
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -229,57 +231,40 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 
 #
 # Network stack drivers
-# To test network drivers, need network Io driver(SnpNt32Io.dll), please refer to NETWORK-IO Subproject.
 #
-#INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-#INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-#INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-#INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
-#INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-#INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-#INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-#INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-#INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
-#INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-#INF  UnixPkg/SnpUnixDxe/SnpUnixDxe.inf
+!if $(NETWORK_SUPPORT)
+INF  UnixPkg/UnixSnpDxe/UnixSnpDxe.inf
+!endif
+INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
+INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
 
-#INF FatPkg/EnhancedFatDxe/Fat.inf
+#
+# Build from source or use checked in binary
+#
+!if $(COMPILE_BINS)
+INF FatPkg/EnhancedFatDxe/Fat.inf
+!else
+INF  RuleOverride = BINARY USE = IA32 FatBinPkg/EnhancedFatDxe/Fat.inf
+!endif
 
+# If  you build GccShellPkg you can source level debug shell
+#FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
+#  SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/IA32/ShellFull.efi
+#}
+INF  RuleOverride = BINARY USE = IA32 EdkShellBinPkg/FullShell/FullShell.inf
 
-   
-################################################################################
-#  
-# FILE statements are provided so that a platform integrator can include
-# complete EFI FFS files, as well as a method for constructing FFS files
-# using curly "{}" brace scoping. The following three FILEs are
-# for binary shell, binary fat and logo module.
-#  
-################################################################################
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
-    SECTION COMPRESS PI_STD {
-      SECTION GUIDED {
-        SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
-#        SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/IA32/ShellFull.efi
-#        SECTION PE32 = Build/Unix/DEBUG_XCODE32/IA32/Ebl.efi
-      }
-    }
-  }
-
-FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
-    SECTION COMPRESS PI_STD {
-      SECTION GUIDED {
-        SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi
-      }
-    }
-  }
 
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
-    SECTION COMPRESS PI_STD {
-      SECTION GUIDED {
-        SECTION RAW = MdeModulePkg/Logo/Logo.bmp
-      }
-    }
-  }
+  SECTION RAW = MdeModulePkg/Logo/Logo.bmp
+}
    
    
 ################################################################################
@@ -380,3 +365,20 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
       }
     }
   }
+  
+  
+[Rule.Common.UEFI_DRIVER.BINARY]
+  FILE DRIVER = $(NAMED_GUID) {
+    DXE_DEPEX DXE_DEPEX Optional      |.depex
+    PE32      PE32                    |.efi
+    UI        STRING="$(MODULE_NAME)" Optional
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+  }
+
+[Rule.Common.UEFI_APPLICATION.BINARY]
+  FILE APPLICATION = $(NAMED_GUID) {
+    PE32      PE32                    |.efi
+    UI        STRING="$(MODULE_NAME)" Optional
+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
+  }
+