OVMF: Move DXE drivers into a new firmware volume

A separate FV is created for DXE drivers so the DXE drivers will
not be rebased along with the PEI drivers.

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

diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index b15ad29a2eaed02a7b9a3e53cf1a6c0d8b599963..c55b6a3b9aa91243e377cbad7f327931cbbf5379 100644 (file)
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -100,11 +100,6 @@ APRIORI PEI {
   INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
 }\r
 \r
-APRIORI DXE {\r
-  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-  INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
-}\r
-\r
 #\r
 #  PEI Phase modules\r
 #\r
@@ -114,6 +109,36 @@ INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
 INF  OvmfPkg/PlatformPei/PlatformPei.inf\r
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
+FILE FV_IMAGE = 20bc8ac9-94d1-4208-ab28-5d673fd73486 {\r
+  SECTION FV_IMAGE = DXEFV\r
+}\r
+\r
+################################################################################\r
+\r
+[FV.DXEFV]\r
+BlockSize          = 0x10000\r
+FvAlignment        = 16\r
+ERASE_POLARITY     = 1\r
+MEMORY_MAPPED      = TRUE\r
+STICKY_WRITE       = TRUE\r
+LOCK_CAP           = TRUE\r
+LOCK_STATUS        = TRUE\r
+WRITE_DISABLED_CAP = TRUE\r
+WRITE_ENABLED_CAP  = TRUE\r
+WRITE_STATUS       = TRUE\r
+WRITE_LOCK_CAP     = TRUE\r
+WRITE_LOCK_STATUS  = TRUE\r
+READ_DISABLED_CAP  = TRUE\r
+READ_ENABLED_CAP   = TRUE\r
+READ_STATUS        = TRUE\r
+READ_LOCK_CAP      = TRUE\r
+READ_LOCK_STATUS   = TRUE\r
+\r
+APRIORI DXE {\r
+  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
+}\r
+\r
 #\r
 # DXE Phase modules\r
 #\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index be988723ef94cdff7e7e1ac431ae73351e940533..7e5c0d7cefecb533281764b72054144f74bc7371 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -102,11 +102,6 @@ APRIORI PEI {
   INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
 }\r
 \r
-APRIORI DXE {\r
-  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-  INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
-}\r
-\r
 #\r
 #  PEI Phase modules\r
 #\r
@@ -116,6 +111,36 @@ INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
 INF  OvmfPkg/PlatformPei/PlatformPei.inf\r
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
+FILE FV_IMAGE = 20bc8ac9-94d1-4208-ab28-5d673fd73486 {\r
+  SECTION FV_IMAGE = DXEFV\r
+}\r
+\r
+################################################################################\r
+\r
+[FV.DXEFV]\r
+BlockSize          = 0x10000\r
+FvAlignment        = 16\r
+ERASE_POLARITY     = 1\r
+MEMORY_MAPPED      = TRUE\r
+STICKY_WRITE       = TRUE\r
+LOCK_CAP           = TRUE\r
+LOCK_STATUS        = TRUE\r
+WRITE_DISABLED_CAP = TRUE\r
+WRITE_ENABLED_CAP  = TRUE\r
+WRITE_STATUS       = TRUE\r
+WRITE_LOCK_CAP     = TRUE\r
+WRITE_LOCK_STATUS  = TRUE\r
+READ_DISABLED_CAP  = TRUE\r
+READ_ENABLED_CAP   = TRUE\r
+READ_STATUS        = TRUE\r
+READ_LOCK_CAP      = TRUE\r
+READ_LOCK_STATUS   = TRUE\r
+\r
+APRIORI DXE {\r
+  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
+}\r
+\r
 #\r
 # DXE Phase modules\r
 #\r