Leif suggested that FDF include files should preferably refer with their names to the FDF file sections from which they are included.
Therefore - rename "OvmfPkg.fdf.inc" to "OvmfPkgDefines.fdf.inc" (included from the [Defines] section), - rename "DecomprScratchEnd.fdf.inc" to "FvmainCompactScratchEnd.fdf.inc" (included under the [FV.FVMAIN_COMPACT] section). Cc: Anthony Perard <anthony.per...@citrix.com> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> Cc: Jordan Justen <jordan.l.jus...@intel.com> Cc: Julien Grall <jul...@xen.org> Cc: Leif Lindholm <l...@nuviainc.com> Cc: Philippe Mathieu-Daudé <phi...@redhat.com> Ref: 20200312142006.GG23627@bivouac.eciton.net">http://mid.mail-archive.com/20200312142006.GG23627@bivouac.eciton.net Ref: https://edk2.groups.io/g/devel/message/55812 Suggested-by: Leif Lindholm <l...@nuviainc.com> Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- OvmfPkg/OvmfPkgIa32.fdf | 4 ++-- OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++-- OvmfPkg/OvmfPkgX64.fdf | 4 ++-- OvmfPkg/OvmfXen.fdf | 4 ++-- OvmfPkg/{DecomprScratchEnd.fdf.inc => FvmainCompactScratchEnd.fdf.inc} | 0 OvmfPkg/{OvmfPkg.fdf.inc => OvmfPkgDefines.fdf.inc} | 0 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index f1a15de365fd..da5943769352 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -11,7 +11,7 @@ ################################################################################ [Defines] -!include OvmfPkg.fdf.inc +!include OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -397,7 +397,7 @@ [FV.FVMAIN_COMPACT] } } -!include DecomprScratchEnd.fdf.inc +!include FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 9e2eb78230e9..0e2a5caaf906 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -11,7 +11,7 @@ ################################################################################ [Defines] -!include OvmfPkg.fdf.inc +!include OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -400,7 +400,7 @@ [FV.FVMAIN_COMPACT] } } -!include DecomprScratchEnd.fdf.inc +!include FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 9e2eb78230e9..0e2a5caaf906 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -11,7 +11,7 @@ ################################################################################ [Defines] -!include OvmfPkg.fdf.inc +!include OvmfPkgDefines.fdf.inc # # Build the variable store and the firmware code as one unified flash device @@ -400,7 +400,7 @@ [FV.FVMAIN_COMPACT] } } -!include DecomprScratchEnd.fdf.inc +!include FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 5ca8081c0265..3c4164a5f50e 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -12,7 +12,7 @@ ################################################################################ [Defines] -!include OvmfPkg.fdf.inc +!include OvmfPkgDefines.fdf.inc # # This will allow the flash device image to be recognize as an ELF, with first @@ -442,7 +442,7 @@ [FV.FVMAIN_COMPACT] } } -!include DecomprScratchEnd.fdf.inc +!include FvmainCompactScratchEnd.fdf.inc ################################################################################ diff --git a/OvmfPkg/DecomprScratchEnd.fdf.inc b/OvmfPkg/FvmainCompactScratchEnd.fdf.inc similarity index 100% rename from OvmfPkg/DecomprScratchEnd.fdf.inc rename to OvmfPkg/FvmainCompactScratchEnd.fdf.inc diff --git a/OvmfPkg/OvmfPkg.fdf.inc b/OvmfPkg/OvmfPkgDefines.fdf.inc similarity index 100% rename from OvmfPkg/OvmfPkg.fdf.inc rename to OvmfPkg/OvmfPkgDefines.fdf.inc -- 2.19.1.3.g30247aa5d201 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#55839): https://edk2.groups.io/g/devel/message/55839 Mute This Topic: https://groups.io/mt/71914083/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
