|
 |
9fc821a |
From 30251344cfbd25212394c377b80cd720a3b85d46 Mon Sep 17 00:00:00 2001
|
|
 |
3485002 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
3485002 |
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
|
|
2941706 |
Subject: [PATCH] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH
|
|
|
2941706 |
only)
|
|
|
3485002 |
|
|
|
3485002 |
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
|
|
3485002 |
|
|
|
3485002 |
- no changes
|
|
|
3485002 |
|
|
|
3485002 |
Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
|
|
3485002 |
|
|
|
3485002 |
- refresh downstream-only commit 8abc2a6ddad2 against context differences
|
|
|
3485002 |
in the DSC files from upstream commit 5e167d7e784c
|
|
|
3485002 |
("OvmfPkg/PlatformPei: don't allocate reserved mem varstore if
|
|
|
3485002 |
SMM_REQUIRE", 2017-03-12).
|
|
|
3485002 |
|
|
|
3485002 |
Contributed-under: TianoCore Contribution Agreement 1.0
|
|
|
3485002 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
3485002 |
(cherry picked from commit 6fa0c4d67c0bb8bde2ddd6db41c19eb0c40b2721)
|
|
|
3485002 |
(cherry picked from commit 8abc2a6ddad25af7e88dc0cf57d55dfb75fbf92d)
|
|
|
7ae6f15 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
3485002 |
---
|
|
|
3485002 |
OvmfPkg/OvmfPkgIa32.dsc | 1 +
|
|
|
3485002 |
OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
|
|
|
3485002 |
OvmfPkg/OvmfPkgX64.dsc | 1 +
|
|
|
3485002 |
OvmfPkg/PlatformPei/Platform.c | 1 +
|
|
|
3485002 |
OvmfPkg/PlatformPei/PlatformPei.inf | 1 +
|
|
|
3485002 |
5 files changed, 5 insertions(+)
|
|
|
3485002 |
|
|
|
3485002 |
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
9fc821a |
index 0a49336c0d..8dc3ad2be4 100644
|
|
|
3485002 |
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
3485002 |
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
9fc821a |
@@ -535,6 +535,7 @@
|
|
|
3485002 |
# ($(SMM_REQUIRE) == FALSE)
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
|
|
3485002 |
|
|
|
3485002 |
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
|
|
3485002 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
9fc821a |
index a3d51ef0f7..d81cd865d5 100644
|
|
|
3485002 |
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
3485002 |
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
9fc821a |
@@ -541,6 +541,7 @@
|
|
|
3485002 |
# ($(SMM_REQUIRE) == FALSE)
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
|
|
3485002 |
|
|
|
3485002 |
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
|
|
3485002 |
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
9fc821a |
index f9b4ab4dfa..85bd8d4bf6 100644
|
|
|
3485002 |
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
3485002 |
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
9fc821a |
@@ -540,6 +540,7 @@
|
|
|
3485002 |
# ($(SMM_REQUIRE) == FALSE)
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
|
|
3485002 |
|
|
|
3485002 |
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
|
|
3485002 |
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
|
|
9fc821a |
index 5a78668126..544ac547bf 100644
|
|
|
3485002 |
--- a/OvmfPkg/PlatformPei/Platform.c
|
|
|
3485002 |
+++ b/OvmfPkg/PlatformPei/Platform.c
|
|
|
3485002 |
@@ -670,6 +670,7 @@ InitializePlatform (
|
|
|
3485002 |
PeiFvInitialization ();
|
|
|
3485002 |
MemMapInitialization ();
|
|
|
3485002 |
NoexecDxeInitialization ();
|
|
|
3485002 |
+ UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);
|
|
|
3485002 |
}
|
|
|
3485002 |
|
|
|
3485002 |
AmdSevInitialize ();
|
|
|
3485002 |
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
|
9fc821a |
index 9c5ad9961c..31baaa0a22 100644
|
|
|
3485002 |
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
|
3485002 |
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
|
7ae6f15 |
@@ -94,6 +94,7 @@
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
|
|
3485002 |
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
|
|
3485002 |
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|