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>

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 1f8da7feb7da8a33c026e2101987ae9e63834725..c97edfb84f915d7423761e20822e479e8a4409df 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -15,7 +15,6 @@
 \r
 [Defines]\r
   DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F\r
 \r
 [Defines]\r
   DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F\r

-  DEFINE TTY_TERMINAL            = FALSE\r

 \r
 [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
 \r
 [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r


@@ -357,11 +356,6 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy|0x04\r
 !endif\r
 \r
   gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy|0x04\r
 !endif\r
 \r

-!if $(TTY_TERMINAL) == TRUE\r
-  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID\r
-  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}\r
-!endif\r
-\r

   #\r
   # Enable strict image permissions for all images. (This applies\r
   # only to images that were built with >= 4 KB section alignment.)\r
   #\r
   # Enable strict image permissions for all images. (This applies\r
   # only to images that were built with >= 4 KB section alignment.)\r

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 170821e5ace69fad6636c1d0a1e61f29ef927472..f4aac11ee4efdb45742f88948c56b56ee834e450 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -33,6 +33,7 @@
   # Defines for default states.  These can be changed on the command line.\r
   # -D FLAG=VALUE\r
   #\r
   # Defines for default states.  These can be changed on the command line.\r
   # -D FLAG=VALUE\r
   #\r

+  DEFINE TTY_TERMINAL            = FALSE\r

   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
   DEFINE NETWORK_IP6_ENABLE      = FALSE\r
   DEFINE HTTP_BOOT_ENABLE        = FALSE\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
   DEFINE NETWORK_IP6_ENABLE      = FALSE\r
   DEFINE HTTP_BOOT_ENABLE        = FALSE\r


@@ -110,6 +111,8 @@
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
 !if $(TTY_TERMINAL) == TRUE\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
 !if $(TTY_TERMINAL) == TRUE\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r

+  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID\r
+  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}\r

 !else\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1\r
 !endif\r
 !else\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1\r
 !endif\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index d5328ed6ff20e6e1e8dcfa59e1a240f5a1e2acbd..5fa75b8fd5e32cec87262561f00c463c3438ad5f 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -33,6 +33,7 @@
   # Defines for default states.  These can be changed on the command line.\r
   # -D FLAG=VALUE\r
   #\r
   # Defines for default states.  These can be changed on the command line.\r
   # -D FLAG=VALUE\r
   #\r

+  DEFINE TTY_TERMINAL            = FALSE\r

   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
   DEFINE NETWORK_IP6_ENABLE      = FALSE\r
   DEFINE HTTP_BOOT_ENABLE        = FALSE\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
   DEFINE NETWORK_IP6_ENABLE      = FALSE\r
   DEFINE HTTP_BOOT_ENABLE        = FALSE\r


@@ -115,6 +116,8 @@
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
 !if $(TTY_TERMINAL) == TRUE\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
 !if $(TTY_TERMINAL) == TRUE\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r

+  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID\r
+  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}\r

 !else\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1\r
 !endif\r
 !else\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1\r
 !endif\r

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 04850eb7a9dd6fb6e9a8b7805e5bc4cbac03bdd4..cfa7a5f870a490dea15c7e16a318e1a8cb075c27 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -96,9 +96,6 @@
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r
 \r
   ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r
 \r

-  # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID\r
-  gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}\r
-\r

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