[edk2-devel][edk2-platforms][PATCH V1 1/1] Features/Intel: Prepare for edk2-platforms CI

["Isaac Oram" <isaac.w.oram@intel.com>]

Fix some build issues with GCC5 targets
Add a Readme.md for AdvancedFeaturePkg
Add VS2019, CLANGPDB, and GCC5 build targets to Readme.md
for each feature

Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
 .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc |  6 ++-
 Features/Intel/AdvancedFeaturePkg/Readme.md   | 38 +++++++++++++++++++
 .../AcpiDebugFeaturePkg.dsc                   |  3 ++
 .../Debugging/AcpiDebugFeaturePkg/Readme.md   |  9 ++---
 .../Debugging/BeepDebugFeaturePkg/Readme.md   |  6 +++
 .../PostCodeDebugFeaturePkg/Readme.md         |  5 ++-
 .../Debugging/Usb3DebugFeaturePkg/Readme.md   |  9 ++---
 .../Intel/Network/NetworkFeaturePkg/Readme.md |  9 ++---
 .../AsfFeaturePkg/Readme.md                   |  5 ++-
 .../GenericIpmi/Common/IpmiHooks.c            |  2 +
 .../GenericIpmi/Common/IpmiHooks.h            |  2 +
 .../GenericIpmi/Dxe/GenericIpmi.c             |  2 +-
 .../Library/IpmiBaseLib/IpmiBaseLib.c         |  2 +-
 .../IpmiFeaturePkg/Readme.md                  |  9 ++---
 .../SpcrFeaturePkg/Readme.md                  |  5 ++-
 .../Library/PcdInitLib/PcdInitLib.c           |  2 +-
 .../PowerManagement/S3FeaturePkg/Readme.md    |  9 ++---
 .../SmbiosFeaturePkg/Readme.md                |  9 ++---
 Features/Intel/TemplateFeaturePkg/Readme.md   |  9 ++++-
 .../UserInterface/LogoFeaturePkg/Readme.md    |  6 ++-
 .../UserAuthFeaturePkg/Readme.md              |  9 ++---
 .../VirtualKeyboardFeaturePkg/Readme.md       |  5 ++-
 .../VirtualKeyboardFeaturePkg.dsc             |  4 ++
 23 files changed, 119 insertions(+), 46 deletions(-)
 create mode 100644 Features/Intel/AdvancedFeaturePkg/Readme.md

diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
index 18929589c5..226d41522d 100644
--- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
+++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
@@ -25,7 +25,7 @@
   DSC_SPECIFICATION                   = 0x00010005
   OUTPUT_DIRECTORY                    = Build/AdvancedFeaturePkg
   SUPPORTED_ARCHITECTURES             = IA32|X64
-  BUILD_TARGETS                       = DEBUG|RELEASE
+  BUILD_TARGETS                       = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER                    = DEFAULT
   PEI_ARCH                            = IA32
   DXE_ARCH                            = X64
@@ -95,6 +95,10 @@
 [PcdsFixedAtBuild]
   gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1
 
+[PcdsDynamicExDefault.X64]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow
+
 #
 # MinPlatform common include for required feature PCD
 # These PCD must be set before the core include files, CoreCommonLib,
diff --git a/Features/Intel/AdvancedFeaturePkg/Readme.md b/Features/Intel/AdvancedFeaturePkg/Readme.md
new file mode 100644
index 0000000000..ba50560328
--- /dev/null
+++ b/Features/Intel/AdvancedFeaturePkg/Readme.md
@@ -0,0 +1,38 @@
+# Overview
+Build all advanced features for testing build and integration.
+
+Please refer to individual feature packages for details on intended uses.
+
+# High-Level Theory of Operation
+Enable all features and build a reasonable default configuration.  This is not expected to produce binaries that are directly usable in a product as features may require board or silicon specific configuration and libraries.
+
+## Firmware Volumes
+Produces:
+* FvAdvancedPreMemory
+* FvAdvancedUncompressed
+* FvAdvanced
+
+## Build
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
+
+## Windows Example:
+With current working directory at O:\
+
+git clone https://github.com/tianocore/edk2.git
+
+git clone https://github.com/tianocore/edk2-platforms.git
+
+set workspace=O:\
+
+set EDK_TOOLS_PATH=O:\Edk2\BaseTools
+
+set packages_path=O:\edk2;O:\edk2-non-osi;O:\edk2-platforms\Platform\Intel;O:\edk2-platforms\Silicon\Intel;O:\edk2-platforms\Platform\Qemu;O:\edk2-platforms\Silicon\Qemu;O:\edk2-platforms\Features\Intel;O:\edk2-platforms\Features\Intel\Debugging;O:\edk2-platforms\Features\Intel\Network;O:\edk2-platforms\Features\Intel\OutOfBandManagement;O:\edk2-platforms\Features\Intel\PowerManagement;O:\edk2-platforms\Features\Intel\SystemInformation;O:\edk2-platforms\Features\Intel\UserInterface
+
+cd \edk2
+
+edksetup.bat Rebuild
+
+build -a IA32 -a X64 -t CLANGPDB -b NOOPT -p AdvancedFeaturePkg\AdvancedFeaturePkg.dsc
diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc
index 306d8bce16..ffe8c427ff 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc
@@ -34,6 +34,9 @@
 #
 !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
 
+[PcdsFeatureFlag.X64]
+  gAcpiDebugFeaturePkgTokenSpaceGuid.PcdUseSmmVersion                       |FALSE
+
 #
 # Include common libraries
 #
diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Readme.md b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Readme.md
index 9868d6d816..b6cb054efa 100644
--- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Readme.md
+++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Readme.md
@@ -91,11 +91,10 @@ Architecturally defined data structures and flows for the feature.
 Key control flows for the feature.
 
 ## Build Flows
-*_TODO_*
-Any special build flows should be described in this section.
-
-This is particularly useful for features that use custom build tools or require non-standard tool configuration. If the
-standard flow in the feature package template is used, this section may be empty.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 *_TODO_*
diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Readme.md b/Features/Intel/Debugging/BeepDebugFeaturePkg/Readme.md
index 6626c9b764..143699dbb3 100644
--- a/Features/Intel/Debugging/BeepDebugFeaturePkg/Readme.md
+++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Readme.md
@@ -120,11 +120,17 @@ Status Code (ReportStatusCode) -> Beep Value (GetBeepValueFromStatusCode).
 ReportStatusCode () -> BeepStatusCodeReportWorker () -> GetBeepValueFromStatusCode () -> Beep ()
 
 ## Build Flows
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
+
 Standalone build
 * build -a IA32 -a X64 -p Debugging\BeepDebugFeaturePkg\BeepDebugFeaturePkg.dsc
 
 AdvanceFeaturePkg build
 * build -a IA32 -a X64 -p AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
+
 ## Test Point Results
 None
 
diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Readme.md b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Readme.md
index 3fc52f1c00..d0d8d36fd7 100644
--- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Readme.md
+++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Readme.md
@@ -111,7 +111,10 @@ Status Code (ReportStatusCode) -> Post Code (GetPostCodeFromStatusCode).
 ReportStatusCode () -> PostCodeStatusCodeReportWorker () -> GetPostCodeFromStatusCode () -> PostCode ()
 
 ## Build Flows
-There are not special build flows.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 There are no test points defined.
diff --git a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Readme.md b/Features/Intel/Debugging/Usb3DebugFeaturePkg/Readme.md
index c8afcf9fd2..740bfb6db0 100644
--- a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Readme.md
+++ b/Features/Intel/Debugging/Usb3DebugFeaturePkg/Readme.md
@@ -72,11 +72,10 @@ Architecturally defined data structures and flows for the feature.
 Key control flows for the feature.
 
 ## Build Flows
-*_TODO_*
-Any special build flows should be described in this section.
-
-This is particularly useful for features that use custom build tools or require non-standard tool configuration. If the
-standard flow in the feature package template is used, this section may be empty.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 No test points implemented
diff --git a/Features/Intel/Network/NetworkFeaturePkg/Readme.md b/Features/Intel/Network/NetworkFeaturePkg/Readme.md
index af59fc427a..e953bbcbda 100644
--- a/Features/Intel/Network/NetworkFeaturePkg/Readme.md
+++ b/Features/Intel/Network/NetworkFeaturePkg/Readme.md
@@ -69,11 +69,10 @@ Architecturally defined data structures and flows for the feature.
 Key control flows for the feature.
 
 ## Build Flows
-*_TODO_*
-Any special build flows should be described in this section.
-
-This is particularly useful for features that use custom build tools or require non-standard tool configuration. If the
-standard flow in the feature package template is used, this section may be empty.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 *_TODO_*
diff --git a/Features/Intel/OutOfBandManagement/AsfFeaturePkg/Readme.md b/Features/Intel/OutOfBandManagement/AsfFeaturePkg/Readme.md
index f18b1bfb07..35f5fc202d 100644
--- a/Features/Intel/OutOfBandManagement/AsfFeaturePkg/Readme.md
+++ b/Features/Intel/OutOfBandManagement/AsfFeaturePkg/Readme.md
@@ -44,7 +44,10 @@ AsfPushEvent() -> through SmBus -> NIC -> Remote management consoles
 N/A now.
 
 ## Build Flows
-There is not special build flow.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 There are not test points implemented.
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/IpmiHooks.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/IpmiHooks.c
index 86ff7c0fdf..b2788e5a4c 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/IpmiHooks.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/IpmiHooks.c
@@ -9,6 +9,7 @@
 #include "IpmiHooks.h"
 
 EFI_STATUS
+EFIAPI
 IpmiSendCommand (
   IN      IPMI_TRANSPORT               *This,
   IN      UINT8                        NetFunction,
@@ -64,6 +65,7 @@ Returns:
 } // IpmiSendCommand()
 
 EFI_STATUS
+EFIAPI
 IpmiGetBmcStatus (
   IN IPMI_TRANSPORT                *This,
   OUT BMC_STATUS                   *BmcStatus,
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/IpmiHooks.h b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/IpmiHooks.h
index 083c9e70b0..823cc08c61 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/IpmiHooks.h
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Common/IpmiHooks.h
@@ -15,6 +15,7 @@
 // Internal(hook) function list
 //
 EFI_STATUS
+EFIAPI
 IpmiSendCommand (
   IN      IPMI_TRANSPORT               *This,
   IN      UINT8                        NetFunction,
@@ -54,6 +55,7 @@ Returns:
 ;
 
 EFI_STATUS
+EFIAPI
 IpmiGetBmcStatus (
   IN IPMI_TRANSPORT                                    *This,
   OUT BMC_STATUS                                       *BmcStatus,
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.c
index 957a9c8e6e..d973db3680 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.c
@@ -28,6 +28,7 @@
  @retval EFI_UNSUPPORTED  IPMI is not available.
 **/
 EFI_STATUS
+EFIAPI
 LocateIpmiInterface (
   IN EFI_HANDLE             ImageHandle,
   IN EFI_SYSTEM_TABLE       *SystemTable
@@ -43,4 +44,3 @@ LocateIpmiInterface (
 
   return Status;
 } // LocateIpmiInterface()
-
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.c
index 6b2e0a9e1e..5df9d861c6 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.c
@@ -132,6 +132,7 @@ IpmiSubmitCommand (
 
 **/
 EFI_STATUS
+EFIAPI
 IpmiGetBmcStatus (
   OUT BMC_STATUS                         *BmcStatus,
   OUT SM_COM_ADDRESS                     *ComAddress
@@ -152,4 +153,3 @@ IpmiGetBmcStatus (
                              );
   return Status;
 }
-
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Readme.md b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Readme.md
index d383150e3f..7551fcc64f 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Readme.md
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Readme.md
@@ -58,11 +58,10 @@ Architecturally defined data structures and flows for the feature.
 Key control flows for the feature.
 
 ## Build Flows
-*_TODO_*
-Any special build flows should be described in this section.
-
-This is particularly useful for features that use custom build tools or require non-standard tool configuration. If the
-standard flow in the feature package template is used, this section may be empty.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 *_TODO_*
diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Readme.md b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Readme.md
index 66138ee0f6..173fb3e491 100644
--- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Readme.md
+++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Readme.md
@@ -46,7 +46,10 @@ GetSpcrDevice() -> serial port device path -> get PCI info and serial port info
 GetSpcrDevice () in SpcrDeviceLib -> SpcrAcpiDxe.
 
 ## Build Flows
-There is not special build flow.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 There are not test points implemented.
diff --git a/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.c b/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.c
index 4ea89582f3..e3d305d01f 100644
--- a/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.c
+++ b/Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.c
@@ -21,6 +21,7 @@
 
 **/
 EFI_STATUS
+EFIAPI
 PcdInitConstructor (
   VOID
   )
@@ -86,4 +87,3 @@ PcdInitConstructor (
 
   return EFI_SUCCESS;
 }
-
diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Readme.md b/Features/Intel/PowerManagement/S3FeaturePkg/Readme.md
index 95ce2ddc15..8f96d29ce1 100644
--- a/Features/Intel/PowerManagement/S3FeaturePkg/Readme.md
+++ b/Features/Intel/PowerManagement/S3FeaturePkg/Readme.md
@@ -63,11 +63,10 @@ Architecturally defined data structures and flows for the feature.
 Key control flows for the feature.
 
 ## Build Flows
-*_TODO_*
-Any special build flows should be described in this section.
-
-This is particularly useful for features that use custom build tools or require non-standard tool configuration. If the
-standard flow in the feature package template is used, this section may be empty.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 *_TODO_*
diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Readme.md b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Readme.md
index 6ecca8af4b..46d1744414 100644
--- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Readme.md
+++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Readme.md
@@ -65,11 +65,10 @@ Architecturally defined data structures and flows for the feature.
 Key control flows for the feature.
 
 ## Build Flows
-*_TODO_*
-Any special build flows should be described in this section.
-
-This is particularly useful for features that use custom build tools or require non-standard tool configuration. If the
-standard flow in the feature package template is used, this section may be empty.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 *_TODO_*
diff --git a/Features/Intel/TemplateFeaturePkg/Readme.md b/Features/Intel/TemplateFeaturePkg/Readme.md
index fc77340684..a777eccc29 100644
--- a/Features/Intel/TemplateFeaturePkg/Readme.md
+++ b/Features/Intel/TemplateFeaturePkg/Readme.md
@@ -45,11 +45,18 @@ Architecturally defined data structures and flows for the feature.
 Key control flows for the feature.
 
 ## Build Flows
-Any special build flows should be described in this section.
+Standard and special build flows should be described in this section.
 
 This is particularly useful for features that use custom build tools or require non-standard tool configuration. If the
 standard flow in the feature package template is used, this section may be empty.
 
+Example:
+
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
+
 ## Test Point Results
 The test(s) that can verify porting is complete for the feature.
 
diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/Readme.md b/Features/Intel/UserInterface/LogoFeaturePkg/Readme.md
index bf1a61ba95..33f2ffe410 100644
--- a/Features/Intel/UserInterface/LogoFeaturePkg/Readme.md
+++ b/Features/Intel/UserInterface/LogoFeaturePkg/Readme.md
@@ -78,8 +78,10 @@ Architecturally defined data structures and flows for the feature.
 Consumer gets image from the logo driver via EDKII_PLATFORM_LOGO_PROTOCOL.
 
 ## Build Flows
-
-No any special build flows is needed.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 
diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Readme.md b/Features/Intel/UserInterface/UserAuthFeaturePkg/Readme.md
index b236d2ad30..a5c1d3cb96 100644
--- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Readme.md
+++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Readme.md
@@ -59,11 +59,10 @@ Architecturally defined data structures and flows for the feature.
 Key control flows for the feature.
 
 ## Build Flows
-*_TODO_*
-Any special build flows should be described in this section.
-
-This is particularly useful for features that use custom build tools or require non-standard tool configuration. If the
-standard flow in the feature package template is used, this section may be empty.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 *_TODO_*
diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Readme.md b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Readme.md
index ae7f778748..5e750cd923 100644
--- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Readme.md
+++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Readme.md
@@ -43,7 +43,10 @@ User touch the touch panel -> absolute pointer and status -> virtual keyboard ev
 This driver use AbsolutePointer protocol to get the info of user input, and use GraphicsOutput protocol to show the picture.
 
 ## Build Flows
-There is not special build flow.
+Supported build targets
+* VS2019
+* CLANGPDB
+* GCC5
 
 ## Test Point Results
 Test this driver in a device with touch panel and the BIOS support touch panel driver.
diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc
index d13bd673d3..a025cc755d 100644
--- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc
+++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dsc
@@ -34,6 +34,10 @@
 #
 !include MinPlatformPkg/Include/Dsc/MinPlatformFeaturesPcd.dsc.inc
 
+[PcdsDynamicExDefault.X64]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow
+
 #
 # Include common libraries
 #
-- 
2.39.0.windows.1