UnitTestFrameworkPkg/UnitTestResultReportLib: Use AsciiStrnCpyS()

[mirror_edk2.git] / OvmfPkg / OvmfXen.fdf

diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf
index 5ca8081c02656ff7590c6cdf069e586a67960cba..d9ee14b484a06875111997f29bad6f1f827b6203 100644 (file)
--- a/OvmfPkg/OvmfXen.fdf
+++ b/OvmfPkg/OvmfXen.fdf
@@ -12,7 +12,7 @@
 ################################################################################\r
 \r
 [Defines]\r
-!include OvmfPkg.fdf.inc\r
+!include OvmfPkgDefines.fdf.inc\r
 \r
 #\r
 # This will allow the flash device image to be recognize as an ELF, with first\r
@@ -363,8 +363,8 @@ INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 \r
 !if $(TOOL_CHAIN_TAG) != "XCODE5"\r
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
-!endif\r
 INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf\r
+!endif\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
 \r
 INF MdeModulePkg/Logo/LogoDxe.inf\r
@@ -442,7 +442,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
    }\r
  }\r
 \r
-!include DecomprScratchEnd.fdf.inc\r
+!include FvmainCompactScratchEnd.fdf.inc\r
 \r
 ################################################################################\r
 \r