[edk2-platforms][PATCH V1 25/27] WhitleyOpenBoardPkg/Build: Use common SPI FV Header include


Oram, Isaac W
 

Use the MinPlatformPkg version of CommonSpiFvHeaderInfo.fdf.

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>

Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf | 24 ----------
Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf | 48 ++++++++++----------
Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf | 48 ++++++++++----------
3 files changed, 48 insertions(+), 72 deletions(-)

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
deleted file mode 100644
index 08f8b95938..0000000000
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+++ /dev/null
@@ -1,24 +0,0 @@
-## @file CommonSpiFvHeaderInfo.fdf
-#
-# @copyright
-# Copyright 2020 - 2021 Intel Corporation. <BR>
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-
-FvAlignment = 16 #FV alignment and FV attributes setting.
-ERASE_POLARITY = 1
-MEMORY_MAPPED = TRUE
-STICKY_WRITE = TRUE
-LOCK_CAP = TRUE
-LOCK_STATUS = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP = TRUE
-WRITE_STATUS = TRUE
-WRITE_LOCK_CAP = TRUE
-WRITE_LOCK_STATUS = TRUE
-READ_DISABLED_CAP = TRUE
-READ_ENABLED_CAP = TRUE
-READ_STATUS = TRUE
-READ_LOCK_CAP = TRUE
-READ_LOCK_STATUS = TRUE
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
index 70ceaa1889..0b919b5ea9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
@@ -394,13 +394,13 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
################################################################################

[FV.FvSecurityPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 40ab290f-8494-41cf-b302-31b178b4ce0b

!include MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf

[FV.FvPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 6522280D-28F9-4131-ADC4-F40EBFA45864

INF UefiCpuPkg/SecCore/SecCore.inf
@@ -481,13 +481,13 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 09f25d44-b2ef-4225-8b2e-e0e094b51775

!include AdvancedFeaturePkg/Include/PreMemory.fdf

[FV.FvBspPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e6c65995-8c2d-4119-a52d-7dbf1acb45a1

FILE FV_IMAGE = 09f25d44-b2ef-4225-8b2e-e0e094b51775 {
@@ -498,11 +498,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvPostMemory includes common hardware, common core variable services, load and invoke DXE etc
#
[FV.FvPostMemoryUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA

[FV.FvPostMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 3298afc4-c484-47f1-a65a-5917a54b5e8c

FILE FV_IMAGE = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA {
@@ -515,11 +515,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvBsp includes board specific components
#
[FV.FvBspUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e4c65347-fd90-4143-8a41-113e1015fe07

[FV.FvBsp]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 9e151cf3-ca90-444f-b33b-a9941cbc772f

FILE FV_IMAGE = e4c65347-fd90-4143-8a41-113e1015fe07 {
@@ -529,7 +529,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvUefiBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = C4D3B0E2-FB26-44f8-A05B-E95895FCB960

INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -567,7 +567,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000


[FV.FvUefiBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = ab9fe87b-1e37-440c-91cc-9aea03ce7bec

FILE FV_IMAGE = C4D3B0E2-FB26-44f8-A05B-E95895FCB960 {
@@ -577,7 +577,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvOsBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0

#
@@ -686,7 +686,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
INF MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf

[FV.FvOsBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = c7488640-5f51-4969-b63b-89fc369e1725

FILE FV_IMAGE = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0 {
@@ -696,13 +696,13 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecuritySilicon]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = AD262F8D-BDED-4668-A8D4-8BC73516652F

!include MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf

[FV.FvSecurityUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 03E25550-89A5-4ee6-AF60-DB0553D91FD2

FILE FV_IMAGE = 81F80AEA-91EB-4AD9-A563-7CEBAA167B25 {
@@ -712,7 +712,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecurity]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 68134833-2ff6-4d22-973b-575d0eae8ffd

FILE FV_IMAGE = 03E25550-89A5-4ee6-AF60-DB0553D91FD2 {
@@ -722,13 +722,13 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 70aeaf57-4997-49ce-a4f7-122980745670

!include AdvancedFeaturePkg/Include/PostMemory.fdf

[FV.FvAdvanced]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = f21ee7a1-53a9-453d-aee3-b6a5c25bada5

FILE FV_IMAGE = 70aeaf57-4997-49ce-a4f7-122980745670 {
@@ -741,7 +741,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FV for all Microcode Updates.
#
[FV.FvMicrocode]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = D2C29BA7-3809-480F-9C3D-DE389C61425A

@@ -753,7 +753,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000


[FV.FvVPD]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = FFC29BA7-3809-480F-9C3D-DE389C61425A
FILE RAW = FF7DB236-F856-4924-90F8-CDF12FB875F3 {
@@ -764,11 +764,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# Various Vendor UEFI Drivers (OROMs).
#
[FV.FvOpromUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B6EDE22C-DE30-45fa-BB09-CA202C1654B7

[FV.FvOprom]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 983BCAB5-BF10-42ce-B85D-CB805DCB1EFD

FILE FV_IMAGE = B6EDE22C-DE30-45fa-BB09-CA202C1654B7 {
@@ -780,7 +780,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvWhea]
BlockSize = 0x1000
NumBlocks = 0x30
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = d6a1cd70-4b33-4994-a6ea-375f2ccc5437

#
@@ -789,11 +789,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvAcm]
BlockSize = 0x1000
NumBlocks = 0x50
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 11668261-8A8D-47ca-9893-052D24435E59

[FV.FvFpga]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 974650E7-6DFE-4998-A124-CEDEC5C9B47D

################################################################################
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
index 14d7502b59..7e2a8b1b9f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
@@ -393,11 +393,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
################################################################################

[FV.FvSecurityPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 40ab290f-8494-41cf-b302-31b178b4ce0b

[FV.FvPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 6522280D-28F9-4131-ADC4-F40EBFA45864

INF UefiCpuPkg/SecCore/SecCore.inf
@@ -478,11 +478,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 09f25d44-b2ef-4225-8b2e-e0e094b51775

[FV.FvBspPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e6c65995-8c2d-4119-a52d-7dbf1acb45a1

FILE FV_IMAGE = 09f25d44-b2ef-4225-8b2e-e0e094b51775 {
@@ -493,11 +493,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvPostMemory includes common hardware, common core variable services, load and invoke DXE etc
#
[FV.FvPostMemoryUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA

[FV.FvPostMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 3298afc4-c484-47f1-a65a-5917a54b5e8c

FILE FV_IMAGE = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA {
@@ -510,11 +510,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvBsp includes board specific components
#
[FV.FvBspUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e4c65347-fd90-4143-8a41-113e1015fe07

[FV.FvBsp]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 9e151cf3-ca90-444f-b33b-a9941cbc772f

FILE FV_IMAGE = e4c65347-fd90-4143-8a41-113e1015fe07 {
@@ -524,7 +524,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvUefiBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = C4D3B0E2-FB26-44f8-A05B-E95895FCB960

INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -556,7 +556,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
INF BoardModulePkg/BoardBdsHookDxe/BoardBdsHookDxe.inf

[FV.FvUefiBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = ab9fe87b-1e37-440c-91cc-9aea03ce7bec

FILE FV_IMAGE = C4D3B0E2-FB26-44f8-A05B-E95895FCB960 {
@@ -566,7 +566,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvOsBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0

#
@@ -673,7 +673,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
INF MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf

[FV.FvOsBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = c7488640-5f51-4969-b63b-89fc369e1725

FILE FV_IMAGE = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0 {
@@ -683,11 +683,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecuritySilicon]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = AD262F8D-BDED-4668-A8D4-8BC73516652F

[FV.FvSecurityUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 03E25550-89A5-4ee6-AF60-DB0553D91FD2

FILE FV_IMAGE = 81F80AEA-91EB-4AD9-A563-7CEBAA167B25 {
@@ -697,7 +697,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecurity]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 68134833-2ff6-4d22-973b-575d0eae8ffd

FILE FV_IMAGE = 03E25550-89A5-4ee6-AF60-DB0553D91FD2 {
@@ -707,11 +707,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 70aeaf57-4997-49ce-a4f7-122980745670

[FV.FvAdvanced]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = f21ee7a1-53a9-453d-aee3-b6a5c25bada5

FILE FV_IMAGE = 70aeaf57-4997-49ce-a4f7-122980745670 {
@@ -724,7 +724,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FV for all Microcode Updates.
#
[FV.FvMicrocode]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = D2C29BA7-3809-480F-9C3D-DE389C61425A

@@ -736,7 +736,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000


[FV.FvVPD]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = FFC29BA7-3809-480F-9C3D-DE389C61425A
FILE RAW = FF7DB236-F856-4924-90F8-CDF12FB875F3 {
@@ -747,11 +747,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# Various Vendor UEFI Drivers (OROMs).
#
[FV.FvOpromUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B6EDE22C-DE30-45fa-BB09-CA202C1654B7

[FV.FvOprom]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 983BCAB5-BF10-42ce-B85D-CB805DCB1EFD

FILE FV_IMAGE = B6EDE22C-DE30-45fa-BB09-CA202C1654B7 {
@@ -763,7 +763,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvWhea]
BlockSize = 0x1000
NumBlocks = 0x30
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = d6a1cd70-4b33-4994-a6ea-375f2ccc5437

#
@@ -772,11 +772,11 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvAcm]
BlockSize = 0x1000
NumBlocks = 0x50
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 11668261-8A8D-47ca-9893-052D24435E59

[FV.FvFpga]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 974650E7-6DFE-4998-A124-CEDEC5C9B47D

################################################################################
--
2.27.0.windows.1


Nate DeSimone
 

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@intel.com>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@intel.com>; Desimone, Nathaniel L
<nathaniel.l.desimone@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
Subject: [edk2-devel][edk2-platforms][PATCH V1 25/27]
WhitleyOpenBoardPkg/Build: Use common SPI FV Header include

Use the MinPlatformPkg version of CommonSpiFvHeaderInfo.fdf.

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>

Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---

Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInf
o.fdf | 24 ----------
Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf |
48 ++++++++++----------
Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf | 48
++++++++++----------
3 files changed, 48 insertions(+), 72 deletions(-)

diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderI
nfo.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderI
nfo.fdf
deleted file mode 100644
index 08f8b95938..0000000000
---
a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderI
nfo.fdf
+++ /dev/null
@@ -1,24 +0,0 @@
-## @file CommonSpiFvHeaderInfo.fdf
-#
-# @copyright
-# Copyright 2020 - 2021 Intel Corporation. <BR> -# -# SPDX-License-
Identifier: BSD-2-Clause-Patent -##
-
-FvAlignment = 16 #FV alignment and FV attributes setting.
-ERASE_POLARITY = 1
-MEMORY_MAPPED = TRUE
-STICKY_WRITE = TRUE
-LOCK_CAP = TRUE
-LOCK_STATUS = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP = TRUE
-WRITE_STATUS = TRUE
-WRITE_LOCK_CAP = TRUE
-WRITE_LOCK_STATUS = TRUE
-READ_DISABLED_CAP = TRUE
-READ_ENABLED_CAP = TRUE
-READ_STATUS = TRUE
-READ_LOCK_CAP = TRUE
-READ_LOCK_STATUS = TRUE
diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
index 70ceaa1889..0b919b5ea9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
@@ -394,13 +394,13 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000

##########################################################
######################

[FV.FvSecurityPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 40ab290f-8494-41cf-b302-31b178b4ce0b

!include MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf

[FV.FvPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 6522280D-28F9-4131-ADC4-F40EBFA45864

INF UefiCpuPkg/SecCore/SecCore.inf
@@ -481,13 +481,13 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 09f25d44-b2ef-4225-8b2e-e0e094b51775

!include AdvancedFeaturePkg/Include/PreMemory.fdf

[FV.FvBspPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e6c65995-8c2d-4119-a52d-7dbf1acb45a1

FILE FV_IMAGE = 09f25d44-b2ef-4225-8b2e-e0e094b51775 {
@@ -498,11 +498,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvPostMemory includes common hardware, common core variable
services, load and invoke DXE etc # [FV.FvPostMemoryUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA

[FV.FvPostMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 3298afc4-c484-47f1-a65a-5917a54b5e8c

FILE FV_IMAGE = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA {
@@ -515,11 +515,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvBsp includes board specific components # [FV.FvBspUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e4c65347-fd90-4143-8a41-113e1015fe07

[FV.FvBsp]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 9e151cf3-ca90-444f-b33b-a9941cbc772f

FILE FV_IMAGE = e4c65347-fd90-4143-8a41-113e1015fe07 {
@@ -529,7 +529,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvUefiBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = C4D3B0E2-FB26-44f8-A05B-E95895FCB960

INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -567,7 +567,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000


[FV.FvUefiBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = ab9fe87b-1e37-440c-91cc-9aea03ce7bec

FILE FV_IMAGE = C4D3B0E2-FB26-44f8-A05B-E95895FCB960 {
@@ -577,7 +577,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvOsBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0

#
@@ -686,7 +686,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
INF MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf

[FV.FvOsBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = c7488640-5f51-4969-b63b-89fc369e1725

FILE FV_IMAGE = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0 {
@@ -696,13 +696,13 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecuritySilicon]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = AD262F8D-BDED-4668-A8D4-8BC73516652F

!include MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf

[FV.FvSecurityUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 03E25550-89A5-4ee6-AF60-DB0553D91FD2

FILE FV_IMAGE = 81F80AEA-91EB-4AD9-A563-7CEBAA167B25 {
@@ -712,7 +712,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecurity]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 68134833-2ff6-4d22-973b-575d0eae8ffd

FILE FV_IMAGE = 03E25550-89A5-4ee6-AF60-DB0553D91FD2 {
@@ -722,13 +722,13 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 70aeaf57-4997-49ce-a4f7-122980745670

!include AdvancedFeaturePkg/Include/PostMemory.fdf

[FV.FvAdvanced]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = f21ee7a1-53a9-453d-aee3-b6a5c25bada5

FILE FV_IMAGE = 70aeaf57-4997-49ce-a4f7-122980745670 {
@@ -741,7 +741,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FV for all Microcode Updates.
#
[FV.FvMicrocode]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = D2C29BA7-3809-480F-9C3D-DE389C61425A

@@ -753,7 +753,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000


[FV.FvVPD]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = FFC29BA7-3809-480F-9C3D-DE389C61425A
FILE RAW = FF7DB236-F856-4924-90F8-CDF12FB875F3 {
@@ -764,11 +764,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# Various Vendor UEFI Drivers (OROMs).
#
[FV.FvOpromUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B6EDE22C-DE30-45fa-BB09-CA202C1654B7

[FV.FvOprom]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 983BCAB5-BF10-42ce-B85D-CB805DCB1EFD

FILE FV_IMAGE = B6EDE22C-DE30-45fa-BB09-CA202C1654B7 {
@@ -780,7 +780,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvWhea]
BlockSize = 0x1000
NumBlocks = 0x30
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = d6a1cd70-4b33-4994-a6ea-375f2ccc5437

#
@@ -789,11 +789,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvAcm]
BlockSize = 0x1000
NumBlocks = 0x50
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 11668261-8A8D-47ca-9893-052D24435E59

[FV.FvFpga]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 974650E7-6DFE-4998-A124-CEDEC5C9B47D


##########################################################
######################
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
index 14d7502b59..7e2a8b1b9f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
@@ -393,11 +393,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000

##########################################################
######################

[FV.FvSecurityPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 40ab290f-8494-41cf-b302-31b178b4ce0b

[FV.FvPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 6522280D-28F9-4131-ADC4-F40EBFA45864

INF UefiCpuPkg/SecCore/SecCore.inf
@@ -478,11 +478,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 09f25d44-b2ef-4225-8b2e-e0e094b51775

[FV.FvBspPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e6c65995-8c2d-4119-a52d-7dbf1acb45a1

FILE FV_IMAGE = 09f25d44-b2ef-4225-8b2e-e0e094b51775 {
@@ -493,11 +493,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvPostMemory includes common hardware, common core variable
services, load and invoke DXE etc # [FV.FvPostMemoryUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA

[FV.FvPostMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 3298afc4-c484-47f1-a65a-5917a54b5e8c

FILE FV_IMAGE = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA {
@@ -510,11 +510,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvBsp includes board specific components # [FV.FvBspUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e4c65347-fd90-4143-8a41-113e1015fe07

[FV.FvBsp]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 9e151cf3-ca90-444f-b33b-a9941cbc772f

FILE FV_IMAGE = e4c65347-fd90-4143-8a41-113e1015fe07 {
@@ -524,7 +524,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvUefiBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = C4D3B0E2-FB26-44f8-A05B-E95895FCB960

INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -556,7 +556,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
INF BoardModulePkg/BoardBdsHookDxe/BoardBdsHookDxe.inf

[FV.FvUefiBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = ab9fe87b-1e37-440c-91cc-9aea03ce7bec

FILE FV_IMAGE = C4D3B0E2-FB26-44f8-A05B-E95895FCB960 {
@@ -566,7 +566,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvOsBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0

#
@@ -673,7 +673,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
INF MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf

[FV.FvOsBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = c7488640-5f51-4969-b63b-89fc369e1725

FILE FV_IMAGE = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0 {
@@ -683,11 +683,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecuritySilicon]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = AD262F8D-BDED-4668-A8D4-8BC73516652F

[FV.FvSecurityUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 03E25550-89A5-4ee6-AF60-DB0553D91FD2

FILE FV_IMAGE = 81F80AEA-91EB-4AD9-A563-7CEBAA167B25 {
@@ -697,7 +697,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecurity]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 68134833-2ff6-4d22-973b-575d0eae8ffd

FILE FV_IMAGE = 03E25550-89A5-4ee6-AF60-DB0553D91FD2 {
@@ -707,11 +707,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 70aeaf57-4997-49ce-a4f7-122980745670

[FV.FvAdvanced]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = f21ee7a1-53a9-453d-aee3-b6a5c25bada5

FILE FV_IMAGE = 70aeaf57-4997-49ce-a4f7-122980745670 {
@@ -724,7 +724,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FV for all Microcode Updates.
#
[FV.FvMicrocode]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = D2C29BA7-3809-480F-9C3D-DE389C61425A

@@ -736,7 +736,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000


[FV.FvVPD]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = FFC29BA7-3809-480F-9C3D-DE389C61425A
FILE RAW = FF7DB236-F856-4924-90F8-CDF12FB875F3 {
@@ -747,11 +747,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# Various Vendor UEFI Drivers (OROMs).
#
[FV.FvOpromUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B6EDE22C-DE30-45fa-BB09-CA202C1654B7

[FV.FvOprom]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 983BCAB5-BF10-42ce-B85D-CB805DCB1EFD

FILE FV_IMAGE = B6EDE22C-DE30-45fa-BB09-CA202C1654B7 {
@@ -763,7 +763,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvWhea]
BlockSize = 0x1000
NumBlocks = 0x30
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = d6a1cd70-4b33-4994-a6ea-375f2ccc5437

#
@@ -772,11 +772,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvAcm]
BlockSize = 0x1000
NumBlocks = 0x50
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 11668261-8A8D-47ca-9893-052D24435E59

[FV.FvFpga]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 974650E7-6DFE-4998-A124-CEDEC5C9B47D


##########################################################
######################
--
2.27.0.windows.1


Oram, Isaac W
 

Pushed as 6e4384833e..b2503a71a3

-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Sent: Wednesday, January 12, 2022 6:51 PM
To: Oram, Isaac W <isaac.w.oram@intel.com>; devel@edk2.groups.io
Cc: Chiu, Chasel <chasel.chiu@intel.com>
Subject: RE: [edk2-devel][edk2-platforms][PATCH V1 25/27] WhitleyOpenBoardPkg/Build: Use common SPI FV Header include

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@intel.com>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@intel.com>; Desimone, Nathaniel L
<nathaniel.l.desimone@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
Subject: [edk2-devel][edk2-platforms][PATCH V1 25/27]
WhitleyOpenBoardPkg/Build: Use common SPI FV Header include

Use the MinPlatformPkg version of CommonSpiFvHeaderInfo.fdf.

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>

Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---

Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInf
o.fdf | 24 ----------
Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf |
48 ++++++++++----------
Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf | 48
++++++++++----------
3 files changed, 48 insertions(+), 72 deletions(-)

diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderI
nfo.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderI
nfo.fdf
deleted file mode 100644
index 08f8b95938..0000000000
---
a/Platform/Intel/WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderI
nfo.fdf
+++ /dev/null
@@ -1,24 +0,0 @@
-## @file CommonSpiFvHeaderInfo.fdf
-#
-# @copyright
-# Copyright 2020 - 2021 Intel Corporation. <BR> -# -# SPDX-License-
Identifier: BSD-2-Clause-Patent -##
-
-FvAlignment = 16 #FV alignment and FV attributes setting.
-ERASE_POLARITY = 1
-MEMORY_MAPPED = TRUE
-STICKY_WRITE = TRUE
-LOCK_CAP = TRUE
-LOCK_STATUS = TRUE
-WRITE_DISABLED_CAP = TRUE
-WRITE_ENABLED_CAP = TRUE
-WRITE_STATUS = TRUE
-WRITE_LOCK_CAP = TRUE
-WRITE_LOCK_STATUS = TRUE
-READ_DISABLED_CAP = TRUE
-READ_ENABLED_CAP = TRUE
-READ_STATUS = TRUE
-READ_LOCK_CAP = TRUE
-READ_LOCK_STATUS = TRUE
diff --git
a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
index 70ceaa1889..0b919b5ea9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf
@@ -394,13 +394,13 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000

##########################################################
######################

[FV.FvSecurityPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 40ab290f-8494-41cf-b302-31b178b4ce0b

!include
MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclude.fdf

[FV.FvPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 6522280D-28F9-4131-ADC4-F40EBFA45864

INF UefiCpuPkg/SecCore/SecCore.inf @@ -481,13 +481,13 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 09f25d44-b2ef-4225-8b2e-e0e094b51775

!include AdvancedFeaturePkg/Include/PreMemory.fdf

[FV.FvBspPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e6c65995-8c2d-4119-a52d-7dbf1acb45a1

FILE FV_IMAGE = 09f25d44-b2ef-4225-8b2e-e0e094b51775 { @@ -498,11
+498,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvPostMemory includes common hardware, common core variable
services, load and invoke DXE etc # [FV.FvPostMemoryUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA

[FV.FvPostMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 3298afc4-c484-47f1-a65a-5917a54b5e8c

FILE FV_IMAGE = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA { @@ -515,11
+515,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvBsp includes board specific components # [FV.FvBspUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e4c65347-fd90-4143-8a41-113e1015fe07

[FV.FvBsp]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 9e151cf3-ca90-444f-b33b-a9941cbc772f

FILE FV_IMAGE = e4c65347-fd90-4143-8a41-113e1015fe07 { @@ -529,7
+529,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvUefiBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = C4D3B0E2-FB26-44f8-A05B-E95895FCB960

INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -567,7 +567,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000


[FV.FvUefiBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = ab9fe87b-1e37-440c-91cc-9aea03ce7bec

FILE FV_IMAGE = C4D3B0E2-FB26-44f8-A05B-E95895FCB960 { @@ -577,7
+577,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvOsBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0

#
@@ -686,7 +686,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
INF MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf

[FV.FvOsBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = c7488640-5f51-4969-b63b-89fc369e1725

FILE FV_IMAGE = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0 { @@ -696,13
+696,13 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecuritySilicon]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = AD262F8D-BDED-4668-A8D4-8BC73516652F

!include MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf

[FV.FvSecurityUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 03E25550-89A5-4ee6-AF60-DB0553D91FD2

FILE FV_IMAGE = 81F80AEA-91EB-4AD9-A563-7CEBAA167B25 { @@ -712,7
+712,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecurity]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 68134833-2ff6-4d22-973b-575d0eae8ffd

FILE FV_IMAGE = 03E25550-89A5-4ee6-AF60-DB0553D91FD2 { @@ -722,13
+722,13 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 70aeaf57-4997-49ce-a4f7-122980745670

!include AdvancedFeaturePkg/Include/PostMemory.fdf

[FV.FvAdvanced]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = f21ee7a1-53a9-453d-aee3-b6a5c25bada5

FILE FV_IMAGE = 70aeaf57-4997-49ce-a4f7-122980745670 { @@ -741,7
+741,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FV for all Microcode Updates.
#
[FV.FvMicrocode]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = D2C29BA7-3809-480F-9C3D-DE389C61425A

@@ -753,7 +753,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000


[FV.FvVPD]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = FFC29BA7-3809-480F-9C3D-DE389C61425A
FILE RAW = FF7DB236-F856-4924-90F8-CDF12FB875F3 { @@ -764,11
+764,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# Various Vendor UEFI Drivers (OROMs).
#
[FV.FvOpromUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B6EDE22C-DE30-45fa-BB09-CA202C1654B7

[FV.FvOprom]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 983BCAB5-BF10-42ce-B85D-CB805DCB1EFD

FILE FV_IMAGE = B6EDE22C-DE30-45fa-BB09-CA202C1654B7 { @@ -780,7
+780,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvWhea]
BlockSize = 0x1000
NumBlocks = 0x30
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = d6a1cd70-4b33-4994-a6ea-375f2ccc5437

#
@@ -789,11 +789,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvAcm]
BlockSize = 0x1000
NumBlocks = 0x50
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 11668261-8A8D-47ca-9893-052D24435E59

[FV.FvFpga]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 974650E7-6DFE-4998-A124-CEDEC5C9B47D


##########################################################
######################
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
index 14d7502b59..7e2a8b1b9f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf
@@ -393,11 +393,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000

##########################################################
######################

[FV.FvSecurityPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 40ab290f-8494-41cf-b302-31b178b4ce0b

[FV.FvPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 6522280D-28F9-4131-ADC4-F40EBFA45864

INF UefiCpuPkg/SecCore/SecCore.inf @@ -478,11 +478,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 09f25d44-b2ef-4225-8b2e-e0e094b51775

[FV.FvBspPreMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e6c65995-8c2d-4119-a52d-7dbf1acb45a1

FILE FV_IMAGE = 09f25d44-b2ef-4225-8b2e-e0e094b51775 { @@ -493,11
+493,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvPostMemory includes common hardware, common core variable
services, load and invoke DXE etc # [FV.FvPostMemoryUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA

[FV.FvPostMemory]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 3298afc4-c484-47f1-a65a-5917a54b5e8c

FILE FV_IMAGE = B4705B4B-0BE6-4BDB-A83A-51CAD2345CEA { @@ -510,11
+510,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FvBsp includes board specific components # [FV.FvBspUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = e4c65347-fd90-4143-8a41-113e1015fe07

[FV.FvBsp]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 9e151cf3-ca90-444f-b33b-a9941cbc772f

FILE FV_IMAGE = e4c65347-fd90-4143-8a41-113e1015fe07 { @@ -524,7
+524,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvUefiBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = C4D3B0E2-FB26-44f8-A05B-E95895FCB960

INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -556,7 +556,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
INF BoardModulePkg/BoardBdsHookDxe/BoardBdsHookDxe.inf

[FV.FvUefiBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = ab9fe87b-1e37-440c-91cc-9aea03ce7bec

FILE FV_IMAGE = C4D3B0E2-FB26-44f8-A05B-E95895FCB960 { @@ -566,7
+566,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvOsBootUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0

#
@@ -673,7 +673,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
INF MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf

[FV.FvOsBoot]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = c7488640-5f51-4969-b63b-89fc369e1725

FILE FV_IMAGE = CDBB7B35-6833-4ed6-9AB2-57D2ACDDF6F0 { @@ -683,11
+683,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecuritySilicon]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = AD262F8D-BDED-4668-A8D4-8BC73516652F

[FV.FvSecurityUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 03E25550-89A5-4ee6-AF60-DB0553D91FD2

FILE FV_IMAGE = 81F80AEA-91EB-4AD9-A563-7CEBAA167B25 { @@ -697,7
+697,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvSecurity]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 68134833-2ff6-4d22-973b-575d0eae8ffd

FILE FV_IMAGE = 03E25550-89A5-4ee6-AF60-DB0553D91FD2 { @@ -707,11
+707,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
}

[FV.FvAdvancedUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 70aeaf57-4997-49ce-a4f7-122980745670

[FV.FvAdvanced]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = f21ee7a1-53a9-453d-aee3-b6a5c25bada5

FILE FV_IMAGE = 70aeaf57-4997-49ce-a4f7-122980745670 { @@ -724,7
+724,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# FV for all Microcode Updates.
#
[FV.FvMicrocode]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = D2C29BA7-3809-480F-9C3D-DE389C61425A

@@ -736,7 +736,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000


[FV.FvVPD]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
LOCK_STATUS = FALSE
FvNameGuid = FFC29BA7-3809-480F-9C3D-DE389C61425A
FILE RAW = FF7DB236-F856-4924-90F8-CDF12FB875F3 { @@ -747,11
+747,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
# Various Vendor UEFI Drivers (OROMs).
#
[FV.FvOpromUncompressed]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = B6EDE22C-DE30-45fa-BB09-CA202C1654B7

[FV.FvOprom]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 983BCAB5-BF10-42ce-B85D-CB805DCB1EFD

FILE FV_IMAGE = B6EDE22C-DE30-45fa-BB09-CA202C1654B7 { @@ -763,7
+763,7 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvWhea]
BlockSize = 0x1000
NumBlocks = 0x30
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = d6a1cd70-4b33-4994-a6ea-375f2ccc5437

#
@@ -772,11 +772,11 @@ SET
gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = 0x01000000
[FV.FvAcm]
BlockSize = 0x1000
NumBlocks = 0x50
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 11668261-8A8D-47ca-9893-052D24435E59

[FV.FvFpga]
- !include WhitleyOpenBoardPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
+ !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf
FvNameGuid = 974650E7-6DFE-4998-A124-CEDEC5C9B47D


##########################################################
######################
--
2.27.0.windows.1