2019-07-11 23:42:10 +00:00
|
|
|
From 50d915724e8283db90d402d8cd8ce10bdd93c3cb Mon Sep 17 00:00:00 2001
|
2017-11-14 15:05:26 +00:00
|
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
|
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
2018-08-31 17:06:06 +00:00
|
|
|
Subject: [PATCH] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH
|
|
|
|
|
only)
|
2017-11-14 15:05:26 +00:00
|
|
|
|
|
|
|
|
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
|
|
|
|
|
|
|
|
|
- no changes
|
|
|
|
|
|
|
|
|
|
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).
|
|
|
|
|
|
|
|
|
|
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)
|
2018-05-29 21:06:35 +00:00
|
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
2017-11-14 15:05:26 +00:00
|
|
|
---
|
|
|
|
|
OvmfPkg/OvmfPkgIa32.dsc | 1 +
|
|
|
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
|
|
|
|
|
OvmfPkg/OvmfPkgX64.dsc | 1 +
|
|
|
|
|
OvmfPkg/PlatformPei/Platform.c | 1 +
|
|
|
|
|
OvmfPkg/PlatformPei/PlatformPei.inf | 1 +
|
|
|
|
|
5 files changed, 5 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
2019-07-11 23:42:10 +00:00
|
|
|
index 5ef48d2410..f03cbe713f 100644
|
2017-11-14 15:05:26 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
2019-07-11 23:42:10 +00:00
|
|
|
@@ -527,6 +527,7 @@
|
2017-11-14 15:05:26 +00:00
|
|
|
# ($(SMM_REQUIRE) == FALSE)
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
|
|
|
|
|
|
|
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2019-07-11 23:42:10 +00:00
|
|
|
index b55a88d1c4..248030402c 100644
|
2017-11-14 15:05:26 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2019-07-11 23:42:10 +00:00
|
|
|
@@ -533,6 +533,7 @@
|
2017-11-14 15:05:26 +00:00
|
|
|
# ($(SMM_REQUIRE) == FALSE)
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
|
|
|
|
|
|
|
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
2019-07-11 23:42:10 +00:00
|
|
|
index 80ba78628e..2788e84401 100644
|
2017-11-14 15:05:26 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
2019-07-11 23:42:10 +00:00
|
|
|
@@ -532,6 +532,7 @@
|
2017-11-14 15:05:26 +00:00
|
|
|
# ($(SMM_REQUIRE) == FALSE)
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
|
|
|
|
|
|
|
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
|
|
|
|
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
2019-07-11 23:42:10 +00:00
|
|
|
index 3ba2459872..bbbf1ac2a8 100644
|
2017-11-14 15:05:26 +00:00
|
|
|
--- a/OvmfPkg/PlatformPei/Platform.c
|
|
|
|
|
+++ b/OvmfPkg/PlatformPei/Platform.c
|
2019-07-11 23:42:10 +00:00
|
|
|
@@ -667,6 +667,7 @@ InitializePlatform (
|
2017-11-14 15:05:26 +00:00
|
|
|
PeiFvInitialization ();
|
|
|
|
|
MemMapInitialization ();
|
|
|
|
|
NoexecDxeInitialization ();
|
|
|
|
|
+ UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-15 16:27:02 +00:00
|
|
|
InstallClearCacheCallback ();
|
2017-11-14 15:05:26 +00:00
|
|
|
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
2019-07-11 23:42:10 +00:00
|
|
|
index f660c2d9e4..3e0d7917ab 100644
|
2017-11-14 15:05:26 +00:00
|
|
|
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
|
|
|
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
2019-07-11 23:42:10 +00:00
|
|
|
@@ -90,6 +90,7 @@
|
2017-11-14 15:05:26 +00:00
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
|
|
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|
