diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2020-03-12 23:35:55 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-03-13 17:25:00 +0000 |
| commit | 799d88c1bae7978da23727df94b16f37bd1521f4 (patch) | |
| tree | 8d856c7204eef49e40eecdfbaf99dad32bd9389a | |
| parent | 912718d8c7c783c310a34f6a2dd816c359d9624a (diff) | |
| download | edk2-799d88c1bae7978da23727df94b16f37bd1521f4.zip edk2-799d88c1bae7978da23727df94b16f37bd1521f4.tar.gz edk2-799d88c1bae7978da23727df94b16f37bd1521f4.tar.bz2 | |
OvmfPkg: give more telling names to some FDF include files
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.perard@citrix.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien@xen.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: http://mid.mail-archive.com/20200312142006.GG23627@bivouac.eciton.net
Ref: https://edk2.groups.io/g/devel/message/55812
Suggested-by: Leif Lindholm <leif@nuviainc.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200312223555.29267-3-lersek@redhat.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>
| -rw-r--r-- | OvmfPkg/FvmainCompactScratchEnd.fdf.inc (renamed from OvmfPkg/DecomprScratchEnd.fdf.inc) | 0 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgDefines.fdf.inc (renamed from OvmfPkg/OvmfPkg.fdf.inc) | 0 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgIa32.fdf | 4 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgIa32X64.fdf | 4 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgX64.fdf | 4 | ||||
| -rw-r--r-- | OvmfPkg/OvmfXen.fdf | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/OvmfPkg/DecomprScratchEnd.fdf.inc b/OvmfPkg/FvmainCompactScratchEnd.fdf.inc index 46f5258..46f5258 100644 --- a/OvmfPkg/DecomprScratchEnd.fdf.inc +++ b/OvmfPkg/FvmainCompactScratchEnd.fdf.inc diff --git a/OvmfPkg/OvmfPkg.fdf.inc b/OvmfPkg/OvmfPkgDefines.fdf.inc index 35fd454..35fd454 100644 --- a/OvmfPkg/OvmfPkg.fdf.inc +++ b/OvmfPkg/OvmfPkgDefines.fdf.inc diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index f1a15de..da59437 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 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { }
}
-!include DecomprScratchEnd.fdf.inc
+!include FvmainCompactScratchEnd.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 9e2eb78..0e2a5ca 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 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { }
}
-!include DecomprScratchEnd.fdf.inc
+!include FvmainCompactScratchEnd.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 9e2eb78..0e2a5ca 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 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { }
}
-!include DecomprScratchEnd.fdf.inc
+!include FvmainCompactScratchEnd.fdf.inc
################################################################################
diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 5ca8081..3c4164a 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 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { }
}
-!include DecomprScratchEnd.fdf.inc
+!include FvmainCompactScratchEnd.fdf.inc
################################################################################
|