OvmfPkg: always enable serial console redirection

Signed-off-by: Maciej Pijanowski <[email protected]>
Dasharo · Oct 11, 2023 · 55e735d · 55e735d
1 parent 115aa9e
commit 55e735d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/.github/scripts/build-qemu.sh b/.github/scripts/build-qemu.sh
@@ -15,5 +15,5 @@ $EDK2_PLATFORMS_PATH/Features/Intel/PowerManagement:\
 $EDK2_PLATFORMS_PATH/Features/Intel/SystemInformation:\
 $EDK2_PLATFORMS_PATH/Features/Intel/UserInterface"
 
-build -D SERIAL_REDIRECTION_DEFAULT=TRUE -a IA32 -a X64 -t GCC5 -b RELEASE -p OvmfPkg/OvmfPkgX64.dsc
-build -D SERIAL_REDIRECTION_DEFAULT=TRUE -a IA32 -a X64 -t GCC5 -b DEBUG -p OvmfPkg/OvmfPkgX64.dsc
+build -a IA32 -a X64 -t GCC5 -b RELEASE -p OvmfPkg/OvmfPkgX64.dsc
+build -a IA32 -a X64 -t GCC5 -b DEBUG -p OvmfPkg/OvmfPkgX64.dsc
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
@@ -41,8 +41,6 @@
   DEFINE DISABLE_MTRR_PROGRAMMING = TRUE
   DEFINE IOMMU_ENABLE            = FALSE
   DEFINE SETUP_PASSWORD_ENABLE   = TRUE
-  DEFINE SERIAL_TERMINAL         = TRUE
-  DEFINE SERIAL_REDIRECTION_DEFAULT = FALSE
 
   #
   # Network definition
@@ -575,7 +573,7 @@
   gDasharoSystemFeaturesTokenSpaceGuid.PcdDefaultNetworkBootEnable|FALSE
   gDasharoSystemFeaturesTokenSpaceGuid.PcdDasharoEnterprise|TRUE
   gDasharoSystemFeaturesTokenSpaceGuid.PcdShowIommuOptions|TRUE
-  gDasharoSystemFeaturesTokenSpaceGuid.PcdSerialRedirectionDefaultState|$(SERIAL_REDIRECTION_DEFAULT)
+  gDasharoSystemFeaturesTokenSpaceGuid.PcdSerialRedirectionDefaultState|TRUE
 
 ################################################################################
 #
@@ -794,7 +792,7 @@
 !endif
     <PcdsFixedAtBuild>
       gDasharoSystemFeaturesTokenSpaceGuid.PcdShowMenu|$(DASHARO_SYSTEM_FEATURES_ENABLE)
-      gDasharoSystemFeaturesTokenSpaceGuid.PcdShowSerialPortMenu|$(SERIAL_TERMINAL)
+      gDasharoSystemFeaturesTokenSpaceGuid.PcdShowSerialPortMenu|TRUE
   }
 
   MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf
@@ -821,9 +819,7 @@
     <LibraryClasses>
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
   }
-!if $(SERIAL_TERMINAL) == TRUE
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-!endif
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf {
     <LibraryClasses>
       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
@@ -257,9 +257,7 @@ INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
 INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
 INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
 INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-!if $(SERIAL_TERMINAL) == TRUE
 INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-!endif
 INF  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
 INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
 INF  MdeModulePkg/Application/UiApp/UiApp.inf