Simplify DSC/FDF files for OVMF

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.fdf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index ee0b94b0c4f0408b83a0ea98027dedf72ea8bf5a..c644ae96b0f74f9bae54ce83793b0c7168f58ab7 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -14,15 +14,19 @@
 ##\r
 \r
 ################################################################################\r
-[FD.SEC]\r
-BaseAddress   = 0xFFFEE000\r
-Size          = 0x00012000\r
+[FD.OVMF]\r
+BaseAddress   = 0xFFF00000\r
+Size          = 0x00100000\r
 ErasePolarity = 1\r
 BlockSize     = 0x1000\r
-NumBlocks     = 0x12\r
+NumBlocks     = 0x100\r
 \r
-0x0|0x12000\r
+0x00000000|0x000EE000\r
+FV = FVMAIN_COMPACT\r
+\r
+0x000EE000|0x12000\r
 FV = SECFV\r
+  \r
 \r
 ################################################################################\r
 \r
@@ -112,9 +116,7 @@ INF  OvmfPkg/PlatformPei/PlatformPei.inf
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
 FILE FV_IMAGE = A4EF5A93-3F1B-4232-A1C4-F0910E6D1D9C {\r
-  SECTION COMPRESS PI_NONE {\r
-    SECTION FV_IMAGE = DXEFV\r
-  }\r
+  SECTION FV_IMAGE = DXEFV\r
 }\r
 \r
 ################################################################################\r
@@ -197,25 +199,18 @@ INF  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
 INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
+INF  OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf\r
 \r
-FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
-    SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi\r
-  }\r
-\r
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {\r
-    SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_full.efi\r
-  }\r
+INF  FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  EdkShellBinPkg/FullShell/FullShell.inf\r
 \r
 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
-    SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress\r
-      SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-    }\r
-  }\r
-\r
+  SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
+}\r
+  \r
 ################################################################################\r
 \r
-[FV.OVMF]\r
-BlockSize          = 0x10000\r
+[FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -233,37 +228,14 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-#\r
-# This file contains the compressed MAINFV, which is compressed\r
-# in a single compression operation in order to achieve better\r
-# overall compression.\r
-#\r
-FILE FV_IMAGE = 20bc8ac9-94d1-4208-ab28-5d673fd73486 {\r
-   SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress\r
-      SECTION FV_IMAGE = MAINFV\r
-   }\r
- }\r
-\r
-#\r
-# This file contains the uncompressed SECFV, which contains the initial\r
-# boot code.  The code in this FV decompresses the MAINFV.\r
-#\r
-# It uses the Volume Top File (VTF) GUID so it will be placed at the\r
-# end of the FV.\r
-#\r
-FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {\r
-  SECTION Align=16 FV_IMAGE = SECFV\r
-}\r
-\r
+FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {\r
+       SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {\r
+          SECTION FV_IMAGE = MAINFV\r
+       }\r
+     }\r
+  \r
 ################################################################################\r
 \r
-[Rule.Common.PEI_CORE]\r
-  FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32   Align=32    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-    UI       STRING ="$(MODULE_NAME)" Optional\r
-    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
-  }\r
-\r
 [Rule.Common.SEC]\r
   FILE SEC = $(NAMED_GUID) {\r
     PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
@@ -271,12 +243,11 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
-[Rule.Common.PEIM.NORELOC]\r
-  FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED  {\r
-     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-     TE        TE                        $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-     UI        STRING="$(MODULE_NAME)" Optional\r
-     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+[Rule.Common.PEI_CORE]\r
+  FILE PEI_CORE = $(NAMED_GUID) {\r
+    PE32     PE32   Align=32    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    UI       STRING ="$(MODULE_NAME)" Optional\r
+    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
 [Rule.Common.PEIM]\r
@@ -287,16 +258,6 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
-[Rule.Common.PEIM.TIANOCOMPRESSED]\r
-  FILE PEIM = $(NAMED_GUID) {\r
-    PEI_DEPEX PEI_DEPEX Optional         $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-    GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {\r
-      PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi\r
-      UI        STRING="$(MODULE_NAME)" Optional\r
-      VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
-    }\r
-  }\r
-\r
 [Rule.Common.DXE_CORE]\r
   FILE DXE_CORE = $(NAMED_GUID) {\r
     PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
@@ -304,7 +265,7 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
-[Rule.Common.UEFI_DRIVER]\r
+[Rule.Common.DXE_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
     DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
@@ -312,7 +273,7 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
-[Rule.Common.DXE_DRIVER]\r
+[Rule.Common.DXE_RUNTIME_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
     DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
@@ -320,7 +281,7 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
-[Rule.Common.DXE_RUNTIME_DRIVER]\r
+[Rule.Common.UEFI_DRIVER]\r
   FILE DRIVER = $(NAMED_GUID) {\r
     DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
     PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
@@ -341,11 +302,6 @@ FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 {
     RAW ASL                |.aml\r
   }\r
 \r
-[Rule.Common.SEC.RESET_VECTOR]\r
-  FILE RAW = $(NAMED_GUID) {\r
-    RAW RAW                |.raw\r
-  }\r
-\r
 [OptionRom.CirrusLogic5446]\r
 INF  OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf {\r
     PCI_DEVICE_ID  = 0x00B8\r