1From ad5c297dfebc2b7c8379c752ad7f2e6d27740893 Mon Sep 17 00:00:00 2001
2From: Junming Liu <junming.liu@intel.com>
3Date: Thu, 30 Apr 2020 00:42:35 +0800
4Subject: [PATCH 1/2] Use the default vbt released with GOP driver
5
6This patch use the default vbt which released along with GOP driver.
7
8Tracked-On: projectacrn/acrn-hypervisor#4365
9
10Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com>
11Signed-off-by: Junming Liu <junming.liu@intel.com>
12---
13 OvmfPkg/OvmfPkgX64.dsc |  1 +
14 OvmfPkg/OvmfPkgX64.fdf |  1 +
15 OvmfPkg/Vbt/Vbt.inf    | 17 +++++++++++++++++
16 3 files changed, 19 insertions(+)
17 create mode 100644 OvmfPkg/Vbt/Vbt.inf
18
19Index: acrn-edk2/OvmfPkg/OvmfPkgX64.dsc
20===================================================================
21--- acrn-edk2.orig/OvmfPkg/OvmfPkgX64.dsc
22+++ acrn-edk2/OvmfPkg/OvmfPkgX64.dsc
23@@ -756,6 +756,7 @@
24   #OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf
25   #OvmfPkg/XenBusDxe/XenBusDxe.inf
26   #OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf
27+  OvmfPkg/Vbt/Vbt.inf
28   OvmfPkg/PlatformGopPolicy/PlatformGopPolicy.inf
29   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
30   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
31Index: acrn-edk2/OvmfPkg/OvmfPkgX64.fdf
32===================================================================
33--- acrn-edk2.orig/OvmfPkg/OvmfPkgX64.fdf
34+++ acrn-edk2/OvmfPkg/OvmfPkgX64.fdf
35@@ -235,6 +235,7 @@ INF  OvmfPkg/GvtGopDxe/GvtGopDxe.inf
36 #INF  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf
37 #INF  OvmfPkg/XenBusDxe/XenBusDxe.inf
38 #INF  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf
39+INF  RuleOverride=CSM OvmfPkg/Vbt/Vbt.inf
40 INF  OvmfPkg/PlatformGopPolicy/PlatformGopPolicy.inf
41
42 !if $(SECURE_BOOT_ENABLE) == TRUE
43Index: acrn-edk2/OvmfPkg/Vbt/Vbt.inf
44===================================================================
45--- /dev/null
46+++ acrn-edk2/OvmfPkg/Vbt/Vbt.inf
47@@ -0,0 +1,17 @@
48+## @file
49+#  Vbt Binary
50+#
51+#  Copyright (c) 2006 - 2011, Intel Corporation.<BR>
52+#  SPDX-License-Identifier: BSD-2-Clause-Patent
53+#
54+##
55+
56+[Defines]
57+  INF_VERSION                    = 0x00010005
58+  BASE_NAME                      = Vbt
59+  FILE_GUID                      = 1647B4F3-3E8A-4FEF-81C8-328ED647AB1A
60+  MODULE_TYPE                    = USER_DEFINED
61+  VERSION_STRING                 = 1.0
62+
63+[Binaries]
64+  BIN|Vbt.bin|*
65