|
 |
1d2c45 |
From 51e0de961029af84b5bdbfddcc9762b1819d500f Mon Sep 17 00:00:00 2001
|
|
|
7fdf80 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
7fdf80 |
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
|
|
7fdf80 |
Subject: OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only)
|
|
|
7fdf80 |
|
|
|
1d2c45 |
Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->
|
|
|
1d2c45 |
RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:
|
|
|
1d2c45 |
|
|
|
1d2c45 |
- Resolve contextual conflict in the DSC files, from upstream commit
|
|
|
1d2c45 |
b0ed7ebdebd1 ("OvmfPkg: set fixed FlashNvStorage base addresses with -D
|
|
|
1d2c45 |
SMM_REQUIRE", 2020-03-12).
|
|
|
1d2c45 |
|
|
|
1dc609 |
Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] ->
|
|
|
1dc609 |
RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase:
|
|
|
1dc609 |
|
|
|
1dc609 |
- no change
|
|
|
1dc609 |
|
|
|
7fdf80 |
Notes about the RHEL-8.0/20180508-ee3198e672e2 ->
|
|
|
7fdf80 |
RHEL-8.1/20190308-89910a39dcfd rebase:
|
|
|
7fdf80 |
|
|
|
7fdf80 |
- no change
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Notes about the RHEL-7.6/ovmf-20180508-2.gitee3198e672e2.el7 ->
|
|
|
7fdf80 |
RHEL-8.0/20180508-ee3198e672e2 rebase:
|
|
|
7fdf80 |
|
|
|
7fdf80 |
- reorder the rebase changelog in the commit message so that it reads like
|
|
|
7fdf80 |
a blog: place more recent entries near the top
|
|
|
7fdf80 |
- no changes to the patch body
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Notes about the 20171011-92d07e48907f -> 20180508-ee3198e672e2 rebase:
|
|
|
7fdf80 |
|
|
|
7fdf80 |
- no change
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
|
|
7fdf80 |
|
|
|
7fdf80 |
- refresh downstream-only commit 8abc2a6ddad2 against context differences
|
|
|
7fdf80 |
in the DSC files from upstream commit 5e167d7e784c
|
|
|
7fdf80 |
("OvmfPkg/PlatformPei: don't allocate reserved mem varstore if
|
|
|
7fdf80 |
SMM_REQUIRE", 2017-03-12).
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
|
|
7fdf80 |
|
|
|
7fdf80 |
- no changes
|
|
|
7fdf80 |
|
|
|
7fdf80 |
Contributed-under: TianoCore Contribution Agreement 1.0
|
|
|
7fdf80 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
7fdf80 |
(cherry picked from commit 6fa0c4d67c0bb8bde2ddd6db41c19eb0c40b2721)
|
|
|
7fdf80 |
(cherry picked from commit 8abc2a6ddad25af7e88dc0cf57d55dfb75fbf92d)
|
|
|
7fdf80 |
(cherry picked from commit b311932d3841c017a0f0fec553edcac365cc2038)
|
|
|
7fdf80 |
(cherry picked from commit 61914fb81cf624c9028d015533b400b2794e52d3)
|
|
|
7fdf80 |
(cherry picked from commit 2ebf3cc2ae99275d63bb6efd3c22dec76251a853)
|
|
|
1dc609 |
(cherry picked from commit f9b73437b9b231773c1a20e0c516168817a930a2)
|
|
|
1d2c45 |
(cherry picked from commit 2cc462ee963d0be119bc97bfc9c70d292a40516f)
|
|
|
7fdf80 |
---
|
|
|
7fdf80 |
OvmfPkg/OvmfPkgIa32.dsc | 1 +
|
|
|
7fdf80 |
OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
|
|
|
7fdf80 |
OvmfPkg/OvmfPkgX64.dsc | 1 +
|
|
|
7fdf80 |
OvmfPkg/PlatformPei/Platform.c | 1 +
|
|
|
7fdf80 |
OvmfPkg/PlatformPei/PlatformPei.inf | 1 +
|
|
|
7fdf80 |
5 files changed, 5 insertions(+)
|
|
|
7fdf80 |
|
|
|
7fdf80 |
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
1d2c45 |
index f8317a4f5d..6ce8a46d4e 100644
|
|
|
7fdf80 |
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
7fdf80 |
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
1d2c45 |
@@ -574,6 +574,7 @@
|
|
|
7fdf80 |
# ($(SMM_REQUIRE) == FALSE)
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
|
|
7fdf80 |
|
|
|
7fdf80 |
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
|
|
1d2c45 |
!if $(SMM_REQUIRE) == FALSE
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
|
|
7fdf80 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
1d2c45 |
index 55423d356c..89d414cda7 100644
|
|
|
7fdf80 |
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
7fdf80 |
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
1d2c45 |
@@ -580,6 +580,7 @@
|
|
|
7fdf80 |
# ($(SMM_REQUIRE) == FALSE)
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
|
|
7fdf80 |
|
|
|
7fdf80 |
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
|
|
1d2c45 |
!if $(SMM_REQUIRE) == FALSE
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
|
|
7fdf80 |
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
1d2c45 |
index 17aeeed96e..e567eb76e0 100644
|
|
|
7fdf80 |
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
7fdf80 |
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
1d2c45 |
@@ -578,6 +578,7 @@
|
|
|
7fdf80 |
# ($(SMM_REQUIRE) == FALSE)
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
|
|
7fdf80 |
|
|
|
7fdf80 |
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
|
|
1d2c45 |
!if $(SMM_REQUIRE) == FALSE
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
|
|
7fdf80 |
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
|
|
1d2c45 |
index 96468701e3..14efbabe39 100644
|
|
|
7fdf80 |
--- a/OvmfPkg/PlatformPei/Platform.c
|
|
|
7fdf80 |
+++ b/OvmfPkg/PlatformPei/Platform.c
|
|
|
1d2c45 |
@@ -748,6 +748,7 @@ InitializePlatform (
|
|
|
1d2c45 |
MemTypeInfoInitialization ();
|
|
|
7fdf80 |
MemMapInitialization ();
|
|
|
7fdf80 |
NoexecDxeInitialization ();
|
|
|
7fdf80 |
+ UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);
|
|
|
7fdf80 |
}
|
|
|
7fdf80 |
|
|
|
7fdf80 |
InstallClearCacheCallback ();
|
|
|
7fdf80 |
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
|
1d2c45 |
index ff397b3ee9..3a012a7fa4 100644
|
|
|
7fdf80 |
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
|
7fdf80 |
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
|
1d2c45 |
@@ -93,6 +93,7 @@
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
|
|
7fdf80 |
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
|
|
7fdf80 |
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|
|
|
7fdf80 |
--
|
|
|
7fdf80 |
2.18.1
|
|
|
7fdf80 |
|