ArmVirtPkg/ArmVirtQemuKernel: increase slack space for DTB

The relocatable build of ArmVirtQemuKernel is designed to be executed
from RAM, and contains some scratch memory at the start of the image
to use as a stack very early on, and to preserve the DTB image received
from QEMU while it discovers and initializes memory.

It turns out that 8 KB is a bit on the small side here, especially when
executing with secure world emulation enabled, in which case there are
additional nodes present.

So increase the slack space to 32 KB.

While at it, remove a stale Xen reference that was copy/pasted when this
file was created.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf
index 7bc62f6b0b481e0a1121699dbc83d92509710b9d..55541a1075d82ebfdae5d84053f034c3f6d55fff 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -52,15 +52,15 @@ NumBlocks     = 0x200
 ################################################################################\r
 \r
 #\r
-# Implement the Linux kernel header layout so that the Xen loader will identify\r
+# Implement the Linux kernel header layout so that the loader will identify\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
+# This area will be reused to store a copy of the FDT so round it up to 32 KB.\r
 #\r
-0x00000000|0x00002000\r
+0x00000000|0x00008000\r
 DATA = {\r
 !if $(ARCH) == AARCH64\r
   0x01, 0x00, 0x00, 0x10,                         # code0: adr x1, .\r
-  0xff, 0x07, 0x00, 0x14,                         # code1: b 0x2000\r
+  0xff, 0x1f, 0x00, 0x14,                         # code1: b 0x8000\r
   0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, # text_offset: 512 KB\r
   0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, # image_size: 2 MB\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # flags\r
@@ -79,7 +79,7 @@ DATA = {
   0x00, 0x00, 0xa0, 0xe1, # nop\r
   0x00, 0x00, 0xa0, 0xe1, # nop\r
 \r
-  0xf6, 0x07, 0x00, 0xea, # b 0x2000\r
+  0xf6, 0x1f, 0x00, 0xea, # b 0x8000\r
   0x18, 0x28, 0x6f, 0x01, # magic\r
   0x00, 0x00, 0x00, 0x00, # start\r
   0x00, 0x00, 0x20, 0x00, # image size: 2 MB\r
@@ -87,7 +87,7 @@ DATA = {
 !endif\r
 }\r
 \r
-0x00002000|0x001fe000\r
+0x00008000|0x001f8000\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r