UefiPayloadPkg: define some PCD as DynamicEX PCD

Define some PCDs as DynamicEX PCD to be used as global variable.
Because PcdUartDefaultBaudRate is defined as DynamicEX, remove the code
to set it in platformlib. That code was actually redundant.

Reviewed-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>

Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>

5 files changed, 18 insertions, 21 deletions

diff --git a/UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c b/UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
index 72a17dc..d8453e5 100644
--- a/UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
+++ b/UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c
@@ -75,11 +75,6 @@ PlatformHookSerialPortInitialize (
     return Status;

   }

 

-  Status = PcdSet64S (PcdUartDefaultBaudRate, SerialPortInfo.Baud);

-  if (RETURN_ERROR (Status)) {

-    return Status;

-  }

-

   Status = PcdSet32S (PcdSerialClockRate, SerialPortInfo.InputHertz);

   if (RETURN_ERROR (Status)) {

     return Status;

diff --git a/UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf b/UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
index 2415d99..3eeb94d 100644
--- a/UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
+++ b/UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
@@ -35,5 +35,4 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate        ## PRODUCES

   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride  ## PRODUCES

   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate       ## PRODUCES

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate         ## PRODUCES

   gEfiMdeModulePkgTokenSpaceGuid.PcdPciSerialParameters   ## PRODUCES

diff --git a/UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.c b/UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.c
index 6705f29..bd433bd 100644
--- a/UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.c
+++ b/UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.c
@@ -70,10 +70,6 @@ PlatformHookSerialPortInitialize (
     if (RETURN_ERROR (Status)) {

       return Status;

     }

-    Status = PcdSet64S (PcdUartDefaultBaudRate, SerialPortInfo->BaudRate);

-    if (RETURN_ERROR (Status)) {

-      return Status;

-    }

 

     return RETURN_SUCCESS;

   }

diff --git a/UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.inf b/UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.inf
index 41e05dd..2dfd8b1 100644
--- a/UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.inf
+++ b/UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.inf
@@ -38,4 +38,3 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase    ## PRODUCES

   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate        ## PRODUCES

   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride  ## PRODUCES

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate         ## PRODUCES

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index ba54f20..d293211 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -308,11 +308,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE

 

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0

-!if $(TARGET) == DEBUG

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE

-!else

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE

-!endif

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE

 

@@ -352,11 +347,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialFifoControl|$(SERIAL_FIFO_CONTROL)

   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialExtendedTxFifoSize|$(SERIAL_EXTENDED_TX_FIFO_SIZE)

 

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|$(UART_DEFAULT_BAUD_RATE)

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|$(UART_DEFAULT_DATA_BITS)

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|$(UART_DEFAULT_PARITY)

-  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|$(UART_DEFAULT_STOP_BITS)

-  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|$(DEFAULT_TERMINAL_TYPE)

   gEfiMdeModulePkgTokenSpaceGuid.PcdPciSerialParameters|$(PCI_SERIAL_PARAMETERS)

 

   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|$(MAX_LOGICAL_PROCESSORS)

@@ -369,6 +359,24 @@
 ################################################################################

 

 [PcdsDynamicExDefault]

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|$(UART_DEFAULT_BAUD_RATE)

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|$(UART_DEFAULT_DATA_BITS)

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|$(UART_DEFAULT_PARITY)

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|$(UART_DEFAULT_STOP_BITS)

+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|$(DEFAULT_TERMINAL_TYPE)

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMrIovSupport

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSystemPageSize

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress

+  gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize

+!if $(TARGET) == DEBUG

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE

+!else

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE

+!endif

   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0