OVMF: Update OVMF FD/FV build to minimize ROM size

* Only SEC is uncompressed now
* The MAIN FV with PEI & DXE can easily shrink and grow as needed
* The final output will now be OVMF.Fv rather than OVMF.fd
* The final output size will be a multiple of 64kb

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9672 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 8 insertions, 14 deletions

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 4dc00d6e1a..11e1f98f1a 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -1,7 +1,7 @@
 #/** @file

 #  EFI/Framework Open Virtual Machine Firmware (OVMF) platform

 #

-#  Copyright (c) 2006 - 2009, Intel Corporation

+#  Copyright (c) 2006 - 2010, Intel Corporation

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -81,6 +81,7 @@
 [LibraryClasses.common.SEC]

   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

   ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf

+  ExtractGuidedSectionLib|OvmfPkg/Library/SecExtractGuidedSectionLib/SecExtractGuidedSectionLib.inf

 

 [LibraryClasses.common.PEI_CORE]

   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf

@@ -128,7 +129,6 @@
   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf

   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

 

@@ -140,7 +140,6 @@
   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

 

 [LibraryClasses.common.DXE_DRIVER]

@@ -179,11 +178,6 @@
   gEfiSioTokenSpaceGuid.PcdSerialLineControl|0x07

   gEfiSioTokenSpaceGuid.PcdSerialBoudRate|115200

 

-  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize|0x200000

-  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize|0x10000

-  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashFvRecoveryBase|0xFFE00000

-  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashFvRecoverySize|0x00200000

-

   gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported|6

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv|32

@@ -233,7 +227,10 @@
   #

   # SEC Phase modules

   #

-  OvmfPkg/Sec/SecMain.inf

+  OvmfPkg/Sec/SecMain.inf {

+    <LibraryClasses>

+      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

+  }

 

   #

   # PEI Phase modules

@@ -244,10 +241,7 @@
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   }

   IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {

-    <LibraryClasses>

-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

-  }

+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

 

   OvmfPkg/PlatformPei/PlatformPei.inf {

     <LibraryClasses>

@@ -290,7 +284,7 @@
       TimerLib|OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf

   }

 

-  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf  {

+  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf {

     <LibraryClasses>

       TimerLib|OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.inf

   }