[edk2-devel] [PATCH v3 4/4] OvmfPkg/OvmfPkg*.dsc: Change PCDs type about status code
Laszlo Ersek
lersek at redhat.com
Tue Jun 9 21:01:51 UTC 2020
On 06/09/20 13:23, Tan, Ming wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2786
>
> Since the type of PcdStatusCodeUseSerial and PcdStatusCodeUseMemory
> in MdeModulePkg.dec are changed, so change them from
> PcdsFeatureFlag to PcdsFixedAtBuild in dsc files.
>
> Cc: Jordan Justen <jordan.l.justen at intel.com>
> Cc: Laszlo Ersek <lersek at redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel at arm.com>
> Signed-off-by: Ming Tan <ming.tan at intel.com>
> ---
> V3: Split one patch to several patchs, each Pkg has one patch.
>
> OvmfPkg/OvmfPkgIa32.dsc | 8 +++++---
> OvmfPkg/OvmfPkgIa32X64.dsc | 8 +++++---
> OvmfPkg/OvmfPkgX64.dsc | 8 +++++---
> OvmfPkg/OvmfXen.dsc | 8 +++++---
> 4 files changed, 20 insertions(+), 12 deletions(-)
I have confirmed that both the PEI phase and the DXE phase of OVMF
consume both of these PCDs, therefore adding them to the
[PcdsFixedAtBuild] section in "OvmfPkgIa32X64.dsc", which applies to
both the IA32 PEI phase and the X64 DXE phase, is correct.
However, as a consequence, the current patch introduces a bit of
unwanted discrepancy between the OVMF DSC files.
(1) Therefore, in the DSC files other than "OvmfPkgIa32X64.dsc", please
locate "gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod",
and add the new PCD settings right after that. This will keep the DSC
files more similar (and diffable) to each other.
The "OvmfPkgIa32X64.dsc" change is good already.
(2) Before you post v4, please run "BaseTools/Scripts/SetupGit.py" in
your edk2 clone.
Thanks,
Laszlo
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index d0df9cbbfb..ef34c05bb4 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -1,7 +1,7 @@
> ## @file
> # EFI/Framework Open Virtual Machine Firmware (OVMF) platform
> #
> -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
> # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -449,8 +449,6 @@
> ################################################################################
> [PcdsFeatureFlag]
> gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE
> - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE
> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
> @@ -563,6 +561,10 @@
> # Point to the MdeModulePkg/Application/UiApp/UiApp.inf
> gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
>
> + # Status Code support.
> + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
> +
> ################################################################################
> #
> # Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index b3ae62fee9..83808c7940 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -1,7 +1,7 @@
> ## @file
> # EFI/Framework Open Virtual Machine Firmware (OVMF) platform
> #
> -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
> # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -453,8 +453,6 @@
> ################################################################################
> [PcdsFeatureFlag]
> gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE
> - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE
> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE
> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
> @@ -540,6 +538,10 @@
> gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2
> !endif
>
> + # Status Code support.
> + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
> +
> [PcdsFixedAtBuild.IA32]
> #
> # The NumberOfPages values below are ad-hoc. They are updated sporadically at
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index f7fe75ebf5..6c7a94f377 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -1,7 +1,7 @@
> ## @file
> # EFI/Framework Open Virtual Machine Firmware (OVMF) platform
> #
> -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
> # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -453,8 +453,6 @@
> ################################################################################
> [PcdsFeatureFlag]
> gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE
> - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE
> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
> @@ -567,6 +565,10 @@
> # Point to the MdeModulePkg/Application/UiApp/UiApp.inf
> gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
>
> + # Status Code support.
> + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
> +
> ################################################################################
> #
> # Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform
> diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
> index 3af0ee7054..e2a930fe4b 100644
> --- a/OvmfPkg/OvmfXen.dsc
> +++ b/OvmfPkg/OvmfXen.dsc
> @@ -1,7 +1,7 @@
> ## @file
> # EFI/Framework Open Virtual Machine Firmware (OVMF) platform
> #
> -# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
> # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> # Copyright (c) 2019, Citrix Systems, Inc.
> #
> @@ -334,8 +334,6 @@
> ################################################################################
> [PcdsFeatureFlag]
> gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE
> - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress|FALSE
> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
> @@ -433,6 +431,10 @@
> ## Xen vlapic's frequence is 100 MHz
> gEfiMdePkgTokenSpaceGuid.PcdFSBClock|100000000
>
> + # Status Code support.
> + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
> + gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|TRUE
> +
> ################################################################################
> #
> # Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#60988): https://edk2.groups.io/g/devel/message/60988
Mute This Topic: https://groups.io/mt/74771802/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list