ArmVirtPkg/ArmXenRelocatablePlatformLib: add ARM support

[mirror_edk2.git] / ArmVirtPkg / ArmVirtXen.fdf

diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index f98772b7191d78e16bdf597ea3d8ee8b10ad5971..729014753fa13c60b4182fefa38df709a311d1a4 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -1,6 +1,7 @@
 #\r
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
+#  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -134,7 +135,7 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-  INF EmbeddedPkg/SerialDxe/SerialDxe.inf\r
+  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
 \r
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
@@ -220,20 +221,20 @@ READ_LOCK_STATUS   = TRUE
 ############################################################################\r
 \r
 [Rule.Common.SEC]\r
-  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {\r
-    TE  TE Align = 4K                   $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED FIXED {\r
+    TE  TE Align = Auto                 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
   }\r
 \r
 [Rule.Common.PEI_CORE]\r
-  FILE PEI_CORE = $(NAMED_GUID) {\r
-    TE     TE Align = 8                 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+  FILE PEI_CORE = $(NAMED_GUID) FIXED {\r
+    TE     TE Align = Auto              $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI     STRING ="$(MODULE_NAME)" Optional\r
   }\r
 \r
 [Rule.Common.PEIM]\r
-  FILE PEIM = $(NAMED_GUID) {\r
+  FILE PEIM = $(NAMED_GUID) FIXED {\r
      PEI_DEPEX PEI_DEPEX Optional       $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-     TE       TE Align = 8              $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+     TE       TE Align = Auto           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional\r
   }\r
 \r