Port UnixPkg to also support X64. Currently only supports Unix x86_64 ABI. In the...

[mirror_edk2.git] / UnixPkg / UnixPkg.fdf

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 23d1d95ca8958fd730d6a6b24ec03fa048e52625..81929cfc59e66df88546d9619e6d887d7a8fb5ae 100644 (file)
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -243,43 +243,22 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 #INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
 #INF  UnixPkg/SnpUnixDxe/SnpUnixDxe.inf\r
 \r
+#\r
+# Build from source or use checked in binary\r
+#\r
 #INF FatPkg/EnhancedFatDxe/Fat.inf\r
+INF  RuleOverride = BINARY USE = IA32 FatBinPkg/EnhancedFatDxe/Fat.inf\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 +359,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