153 lines
6.2 KiB
Diff
153 lines
6.2 KiB
Diff
|
From 9ea7b3f689bf7d21b869adb829139be7eb91bb33 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
||
|
|
Subject: OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only)
|
||
|
|
|
||
|
|
Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->
|
||
|
|
RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:
|
||
|
|
|
||
|
|
- Extend the DSC change to the new OvmfPkg/AmdSev platform, which has been
|
||
|
|
introduced upstream in commit 30d277ed7a82 ("OvmfPkg/Amdsev: Base commit
|
||
|
|
to build encrypted boot specific OVMF", 2020-12-14), for TianoCore#3077.
|
||
|
|
|
||
|
|
We've always patched all those DSC/FDF files in OvmfPkg down-stream that
|
||
|
|
made sense at least in theory on QEMU. (For example, we've always
|
||
|
|
patched "OvmfPkgIa32.dsc" and "OvmfPkgIa32.fdf", even though we never
|
||
|
|
build or ship the pure IA32 firmware platform.) Follow suit with
|
||
|
|
"AmdSevX64.dsc".
|
||
|
|
|
||
|
|
Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->
|
||
|
|
RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:
|
||
|
|
|
||
|
|
- Resolve contextual conflict in the DSC files, from upstream commit
|
||
|
|
b0ed7ebdebd1 ("OvmfPkg: set fixed FlashNvStorage base addresses with -D
|
||
|
|
SMM_REQUIRE", 2020-03-12).
|
||
|
|
|
||
|
|
Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] ->
|
||
|
|
RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase:
|
||
|
|
|
||
|
|
- no change
|
||
|
|
|
||
|
|
Notes about the RHEL-8.0/20180508-ee3198e672e2 ->
|
||
|
|
RHEL-8.1/20190308-89910a39dcfd rebase:
|
||
|
|
|
||
|
|
- no change
|
||
|
|
|
||
|
|
Notes about the RHEL-7.6/ovmf-20180508-2.gitee3198e672e2.el7 ->
|
||
|
|
RHEL-8.0/20180508-ee3198e672e2 rebase:
|
||
|
|
|
||
|
|
- reorder the rebase changelog in the commit message so that it reads like
|
||
|
|
a blog: place more recent entries near the top
|
||
|
|
- no changes to the patch body
|
||
|
|
|
||
|
|
Notes about the 20171011-92d07e48907f -> 20180508-ee3198e672e2 rebase:
|
||
|
|
|
||
|
|
- no change
|
||
|
|
|
||
|
|
Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||
|
|
|
||
|
|
- refresh downstream-only commit 8abc2a6ddad2 against context differences
|
||
|
|
in the DSC files from upstream commit 5e167d7e784c
|
||
|
|
("OvmfPkg/PlatformPei: don't allocate reserved mem varstore if
|
||
|
|
SMM_REQUIRE", 2017-03-12).
|
||
|
|
|
||
|
|
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||
|
|
|
||
|
|
- no changes
|
||
|
|
|
||
|
|
Contributed-under: TianoCore Contribution Agreement 1.0
|
||
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
(cherry picked from commit 6fa0c4d67c0bb8bde2ddd6db41c19eb0c40b2721)
|
||
|
|
(cherry picked from commit 8abc2a6ddad25af7e88dc0cf57d55dfb75fbf92d)
|
||
|
|
(cherry picked from commit b311932d3841c017a0f0fec553edcac365cc2038)
|
||
|
|
(cherry picked from commit 61914fb81cf624c9028d015533b400b2794e52d3)
|
||
|
|
(cherry picked from commit 2ebf3cc2ae99275d63bb6efd3c22dec76251a853)
|
||
|
|
(cherry picked from commit f9b73437b9b231773c1a20e0c516168817a930a2)
|
||
|
|
(cherry picked from commit 2cc462ee963d0be119bc97bfc9c70d292a40516f)
|
||
|
|
(cherry picked from commit 51e0de961029af84b5bdbfddcc9762b1819d500f)
|
||
|
|
---
|
||
|
|
OvmfPkg/AmdSev/AmdSevX64.dsc | 1 +
|
||
|
|
OvmfPkg/OvmfPkgIa32.dsc | 1 +
|
||
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
|
||
|
|
OvmfPkg/OvmfPkgX64.dsc | 1 +
|
||
|
|
OvmfPkg/PlatformPei/Platform.c | 1 +
|
||
|
|
OvmfPkg/PlatformPei/PlatformPei.inf | 2 ++
|
||
|
|
6 files changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
index 5ee5445116..6ea3621225 100644
|
||
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
@@ -534,6 +534,7 @@
|
||
|
|
[PcdsDynamicDefault]
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||
|
|
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
index 6a5be97c05..4cacf0ea94 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
@@ -594,6 +594,7 @@
|
||
|
|
# ($(SMM_REQUIRE) == FALSE)
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||
|
|
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
||
|
|
!if $(SMM_REQUIRE) == FALSE
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
index 71227d1b70..6225f8e095 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
@@ -600,6 +600,7 @@
|
||
|
|
# ($(SMM_REQUIRE) == FALSE)
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||
|
|
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
||
|
|
!if $(SMM_REQUIRE) == FALSE
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
index 52f7598cf1..b66fc67563 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
@@ -600,6 +600,7 @@
|
||
|
|
# ($(SMM_REQUIRE) == FALSE)
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||
|
|
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
||
|
|
!if $(SMM_REQUIRE) == FALSE
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||
|
|
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
||
|
|
index df2d9ad015..d0e2c08de9 100644
|
||
|
|
--- a/OvmfPkg/PlatformPei/Platform.c
|
||
|
|
+++ b/OvmfPkg/PlatformPei/Platform.c
|
||
|
|
@@ -752,6 +752,7 @@ InitializePlatform (
|
||
|
|
MemTypeInfoInitialization ();
|
||
|
|
MemMapInitialization ();
|
||
|
|
NoexecDxeInitialization ();
|
||
|
|
+ UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);
|
||
|
|
}
|
||
|
|
|
||
|
|
InstallClearCacheCallback ();
|
||
|
|
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||
|
|
index 67eb7aa716..7d26b43680 100644
|
||
|
|
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
||
|
|
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||
|
|
@@ -93,6 +93,8 @@
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|