Update DebugLib to provide support for "err" command in the EFI Shell to adjust the...

[mirror_edk2.git] / UnixPkg / UnixPkg.fdf

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