MdeModulePkg-DxeCore: rename CoreGetMemoryMapPropertiesTable

[mirror_edk2.git] / ArmVirtPkg / ArmVirtXen.fdf

diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 729014753fa13c60b4182fefa38df709a311d1a4..13412f9e245526d9543b3f4830f30d7faf9248a4 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -1,7 +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
+#  Copyright (c) 2015 - 2016, 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
@@ -53,11 +53,12 @@ NumBlocks     = 0x200
 \r
 #\r
 # Implement the Linux kernel header layout so that the Xen loader will identify\r
-# it as something bootable, and execute it with a FDT pointer in x0. This area\r
-# will be reused to store a copy of the FDT so round it up to 8 KB.\r
+# it as something bootable, and execute it with a FDT pointer in x0 or r2.\r
+# This area will be reused to store a copy of the FDT so round it up to 8 KB.\r
 #\r
 0x00000000|0x00002000\r
 DATA = {\r
+!if $(ARCH) == AARCH64\r
   0x01, 0x00, 0x00, 0x10,                         # code0: adr x1, .\r
   0xff, 0x07, 0x00, 0x14,                         # code1: b 0x2000\r
   0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, # text_offset: 512 KB\r
@@ -68,6 +69,22 @@ DATA = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res4\r
   0x41, 0x52, 0x4d, 0x64,                         # magic: "ARM\x64"\r
   0x00, 0x00, 0x00, 0x00                          # res5\r
+!else\r
+  0x08, 0x10, 0x4f, 0xe2, # adr r1, .\r
+  0x02, 0x00, 0xa0, 0xe1, # mov r0, r2 (DTB)\r
+  0x00, 0x00, 0xa0, 0xe1, # nop\r
+  0x00, 0x00, 0xa0, 0xe1, # nop\r
+  0x00, 0x00, 0xa0, 0xe1, # nop\r
+  0x00, 0x00, 0xa0, 0xe1, # nop\r
+  0x00, 0x00, 0xa0, 0xe1, # nop\r
+  0x00, 0x00, 0xa0, 0xe1, # nop\r
+\r
+  0xf6, 0x07, 0x00, 0xea, # b 0x2000\r
+  0x18, 0x28, 0x6f, 0x01, # magic\r
+  0x00, 0x00, 0x00, 0x00, # start\r
+  0x00, 0x00, 0x20, 0x00, # image size: 2 MB\r
+  0x01, 0x02, 0x03, 0x04  # endiannness flag\r
+!endif\r
 }\r
 \r
 0x00002000|0x001fe000\r
@@ -106,13 +123,10 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-  APRIORI DXE {\r
-    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-    INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
-  }\r
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-  INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
+  INF ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf\r
+  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
 \r
   #\r
   # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
@@ -146,7 +160,7 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-  INF FatBinPkg/EnhancedFatDxe/Fat.inf\r
+  INF FatPkg/EnhancedFatDxe/Fat.inf\r
   INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 \r
   #\r