91 lines
3.9 KiB
Diff
91 lines
3.9 KiB
Diff
|
From 0616c1d69ef552bd35700992fae37263ddd8c4ce Mon Sep 17 00:00:00 2001
|
||
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
||
|
|
Subject: [PATCH] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH
|
||
|
|
only)
|
||
|
|
|
||
|
|
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)
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
---
|
||
|
|
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
|
||
|
|
index 2886c10b1b..b974740e2f 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
@@ -577,6 +577,7 @@
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
||
|
|
!endif
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|FALSE
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
index 5a9e9a707a..65a8c6764c 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
@@ -586,6 +586,7 @@
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|FALSE
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE
|
||
|
|
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0
|
||
|
|
gUefiOvmfPkgTokenSpaceGuid.PcdPciIoBase|0x0
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
index 70c2c3e3b9..72bc289f26 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
@@ -582,6 +582,7 @@
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
||
|
|
!endif
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|FALSE
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE
|
||
|
|
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
||
|
|
index 96468701e3..14efbabe39 100644
|
||
|
|
--- a/OvmfPkg/PlatformPei/Platform.c
|
||
|
|
+++ b/OvmfPkg/PlatformPei/Platform.c
|
||
|
|
@@ -748,6 +748,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 c53be2f492..e5744ed818 100644
|
||
|
|
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
||
|
|
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||
|
|
@@ -97,6 +97,7 @@
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
||
|
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
||
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|