OvmfPkg/Csm/VideoDxe: Update to make it build for OVMF

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.fdf

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf
index 7bc62f6b0b481e0a1121699dbc83d92509710b9d..f675b6d65ee1010604309ee87128d2abd007979f 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
 #  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.\r
 #\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 ################################################################################\r
@@ -52,15 +46,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 +73,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 +81,7 @@ DATA = {
 !endif\r
 }\r
 \r
-0x00002000|0x001fe000\r
+0x00008000|0x001f8000\r
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r