ArmVirtPkg/ArmVirtXen: don't set PcdTerminalTypeGuidBuffer

According to the

  PCDs not used by modules or in conditional directives

sections of all the build reports for

  {AARCH64,ARM} x {Xen} x {DEBUG,NOOPT,RELEASE} x {feat-0,feat-1}

(12 builds in total), the PCD is not used in any of those builds.

Restrict the setting to the ArmVirtQemu and ArmVirtQemuKernel platforms.
Restrict the TTY_TERMINAL define similarly.

("feat-1" stands for "-D HTTP_BOOT_ENABLE -D NETWORK_IP6_ENABLE -D
SECURE_BOOT_ENABLE -D TTY_TERMINAL", while "feat-0" stands for "".)

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Julien Grall <julien.grall@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

4 files changed, 6 insertions, 9 deletions

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 1f8da7feb7..c97edfb84f 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -15,7 +15,6 @@
 

 [Defines]

   DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F

-  DEFINE TTY_TERMINAL            = FALSE

 

 [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]

   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000

@@ -357,11 +356,6 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy|0x04

 !endif

 

-!if $(TTY_TERMINAL) == TRUE

-  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID

-  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}

-!endif

-

   #

   # Enable strict image permissions for all images. (This applies

   # only to images that were built with >= 4 KB section alignment.)

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 170821e5ac..f4aac11ee4 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -33,6 +33,7 @@
   # Defines for default states.  These can be changed on the command line.

   # -D FLAG=VALUE

   #

+  DEFINE TTY_TERMINAL            = FALSE

   DEFINE SECURE_BOOT_ENABLE      = FALSE

   DEFINE NETWORK_IP6_ENABLE      = FALSE

   DEFINE HTTP_BOOT_ENABLE        = FALSE

@@ -110,6 +111,8 @@
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM

 !if $(TTY_TERMINAL) == TRUE

   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

+  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID

+  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}

 !else

   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1

 !endif

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index d5328ed6ff..5fa75b8fd5 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -33,6 +33,7 @@
   # Defines for default states.  These can be changed on the command line.

   # -D FLAG=VALUE

   #

+  DEFINE TTY_TERMINAL            = FALSE

   DEFINE SECURE_BOOT_ENABLE      = FALSE

   DEFINE NETWORK_IP6_ENABLE      = FALSE

   DEFINE HTTP_BOOT_ENABLE        = FALSE

@@ -115,6 +116,8 @@
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM

 !if $(TTY_TERMINAL) == TRUE

   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

+  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID

+  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}

 !else

   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1

 !endif

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 04850eb7a9..cfa7a5f870 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -96,9 +96,6 @@
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM

   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

 

-  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID

-  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}

-

   #

   # Make VariableRuntimeDxe work at emulated non-volatile variable mode.

   #