diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2017-01-10 16:40:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 11:17:45 +0000 |
commit | b9824b1cecd8dec1bef43687c1c02e3c9721a9e5 (patch) | |
tree | 5e18aa98a730f96c534ebebefd3c1ff233a3f38d /meta/recipes-core | |
parent | ae147e9cf5d0f0504adcc08fd20d36e1f269593e (diff) | |
download | poky-b9824b1cecd8dec1bef43687c1c02e3c9721a9e5.tar.gz |
ovmf: remove BGRT patch
This patch was added to meta-luv for kernel testing purposes and
probably is not relevant for OE-core.
(From OE-Core rev: 240e96e6196c32ddabb0c1aff3ee83458c98a9bd)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0001-OvmfPkg-Enable-BGRT-in-OVMF.patch | 110 | ||||
-rw-r--r-- | meta/recipes-core/ovmf/ovmf_git.bb | 1 |
2 files changed, 0 insertions, 111 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0001-OvmfPkg-Enable-BGRT-in-OVMF.patch b/meta/recipes-core/ovmf/ovmf/0001-OvmfPkg-Enable-BGRT-in-OVMF.patch deleted file mode 100644 index 4531a6ddfb..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0001-OvmfPkg-Enable-BGRT-in-OVMF.patch +++ /dev/null | |||
@@ -1,110 +0,0 @@ | |||
1 | From 66a4020c3c2163aeffc9757851f33c346ecfd870 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com> | ||
3 | Date: Mon, 4 Apr 2016 12:15:12 -0700 | ||
4 | Subject: [PATCH] OvmfPkg: Enable BGRT in OVMF | ||
5 | |||
6 | By default, firmware (OVMF - Open source Virtual Machine Firmware) | ||
7 | never publishes BGRT (Boot Graphics Resource Table) and in the boot | ||
8 | process Linux kernel checks for this table and if it fails to find BGRT | ||
9 | table then corresponding code in Linux kernel is not executed. EDK II | ||
10 | (EFI Development Kit, thus OVMF) already has BGRT source code packaged | ||
11 | into it but it is excluded from the build process of OVMF. These changes | ||
12 | to build system of OVMF enables BGRT in 32-bit and 64-bit OVMF. | ||
13 | |||
14 | There are only two files that need to be modified in order to do this. | ||
15 | The first one being OvmfPkg*.dsc (this file describes the platform) and | ||
16 | the second one being OvmfPkg*.fdf (this file describes firmware descriptor | ||
17 | volume). A *.inf file (here "BootGraphicsResourceTableDxe.inf") | ||
18 | describes a module (here BGRT). So, include | ||
19 | "BootGraphicsResourceTableDxe.inf" file in "OvmfPkg*.dsc" so that BGRT | ||
20 | source code will be compiled and "BootGraphicsResourceTableDxe.efi" file | ||
21 | is generated and we should also include | ||
22 | "BootGraphicsResourceTableDxe.inf" file in "OvmfPkg*.fdf" file so that | ||
23 | "BootGraphicsResourceTableDxe.efi" will be placed in a firmware volume | ||
24 | and thus gets published. | ||
25 | |||
26 | Signed-off-by: Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com> | ||
27 | --- | ||
28 | OvmfPkg/OvmfPkgIa32.dsc | 1 + | ||
29 | OvmfPkg/OvmfPkgIa32.fdf | 1 + | ||
30 | OvmfPkg/OvmfPkgIa32X64.dsc | 1 + | ||
31 | OvmfPkg/OvmfPkgIa32X64.fdf | 1 + | ||
32 | OvmfPkg/OvmfPkgX64.dsc | 1 + | ||
33 | OvmfPkg/OvmfPkgX64.fdf | 1 + | ||
34 | 6 files changed, 6 insertions(+) | ||
35 | |||
36 | diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc | ||
37 | index 9e5b477..0582219 100644 | ||
38 | --- a/OvmfPkg/OvmfPkgIa32.dsc | ||
39 | +++ b/OvmfPkg/OvmfPkgIa32.dsc | ||
40 | @@ -647,6 +647,7 @@ | ||
41 | OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | ||
42 | MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf | ||
43 | MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf | ||
44 | + MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf | ||
45 | |||
46 | # | ||
47 | # Network Support | ||
48 | diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf | ||
49 | index fc203f2..f968cb7 100644 | ||
50 | --- a/OvmfPkg/OvmfPkgIa32.fdf | ||
51 | +++ b/OvmfPkg/OvmfPkgIa32.fdf | ||
52 | @@ -274,6 +274,7 @@ INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf | ||
53 | INF OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | ||
54 | INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf | ||
55 | INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf | ||
56 | +INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf | ||
57 | |||
58 | INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf | ||
59 | |||
60 | diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc | ||
61 | index 6e4da4f..8289385 100644 | ||
62 | --- a/OvmfPkg/OvmfPkgIa32X64.dsc | ||
63 | +++ b/OvmfPkg/OvmfPkgIa32X64.dsc | ||
64 | @@ -656,6 +656,7 @@ | ||
65 | OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | ||
66 | MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf | ||
67 | MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf | ||
68 | + MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf | ||
69 | |||
70 | # | ||
71 | # Network Support | ||
72 | diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf | ||
73 | index d3f46f3..282d40b 100644 | ||
74 | --- a/OvmfPkg/OvmfPkgIa32X64.fdf | ||
75 | +++ b/OvmfPkg/OvmfPkgIa32X64.fdf | ||
76 | @@ -274,6 +274,7 @@ INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf | ||
77 | INF OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | ||
78 | INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf | ||
79 | INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf | ||
80 | +INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf | ||
81 | |||
82 | INF RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf | ||
83 | |||
84 | diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc | ||
85 | index 3d6d43e..0f956a7 100644 | ||
86 | --- a/OvmfPkg/OvmfPkgX64.dsc | ||
87 | +++ b/OvmfPkg/OvmfPkgX64.dsc | ||
88 | @@ -654,6 +654,7 @@ | ||
89 | OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | ||
90 | MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf | ||
91 | MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf | ||
92 | + MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf | ||
93 | |||
94 | # | ||
95 | # Network Support | ||
96 | diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf | ||
97 | index 15ef13a..9708fd5 100644 | ||
98 | --- a/OvmfPkg/OvmfPkgX64.fdf | ||
99 | +++ b/OvmfPkg/OvmfPkgX64.fdf | ||
100 | @@ -274,6 +274,7 @@ INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf | ||
101 | INF OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | ||
102 | INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf | ||
103 | INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf | ||
104 | +INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf | ||
105 | |||
106 | INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf | ||
107 | |||
108 | -- | ||
109 | 2.7.4 | ||
110 | |||
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 436b2f06f2..6b3a597dfd 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb | |||
@@ -12,7 +12,6 @@ PACKAGECONFIG[secureboot] = ",,," | |||
12 | 12 | ||
13 | SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ | 13 | SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ |
14 | file://0001-BaseTools-Force-tools-variables-to-host-toolchain.patch \ | 14 | file://0001-BaseTools-Force-tools-variables-to-host-toolchain.patch \ |
15 | file://0001-OvmfPkg-Enable-BGRT-in-OVMF.patch \ | ||
16 | file://0002-ovmf-update-path-to-native-BaseTools.patch \ | 15 | file://0002-ovmf-update-path-to-native-BaseTools.patch \ |
17 | file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ | 16 | file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ |
18 | " | 17 | " |