]> git.proxmox.com Git - mirror_edk2.git/commitdiff
UefiPayloadPkg: Fix the build issue for coreboot
authorGuo Dong <guo.dong@intel.com>
Fri, 15 Oct 2021 00:18:43 +0000 (17:18 -0700)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Fri, 15 Oct 2021 14:21:45 +0000 (14:21 +0000)
V2: Fix GCC build issue.
There is typo in previous change caused coreboot build failure.
This patch fixed the build issue.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
UefiPayloadPkg/Library/CbParseLib/CbParseLib.c
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c

index f81aa0f301d88b461246b0ca710833a20e15aba0..4be5d66ba5e86b83aaab179938381fcae783575e 100644 (file)
@@ -194,8 +194,8 @@ GetParameterBase (
     return NULL;\r
   }\r
 \r
-  PcdSet64S (PcdBootloaderParameter, (UINTN)CbTablePtr);\r
-  ASSERT_EFI_STATUS (Status);\r
+  Status = PcdSet64S (PcdBootloaderParameter, (UINTN)CbTablePtr);\r
+  ASSERT_EFI_ERROR (Status);\r
 \r
   return CbTablePtr;\r
 }\r
index 5a1e5786687a7ef15285dcc834d8a1f40391c70d..0e6dcf10f9ffb74d403fe38acf2bd69814b242be 100644 (file)
@@ -406,7 +406,9 @@ _ModuleEntryPoint (
   SERIAL_PORT_INFO              SerialPortInfo;\r
   UNIVERSAL_PAYLOAD_SERIAL_PORT_INFO  *UniversalSerialPort;\r
 \r
-  PcdSet64S (PcdBootloaderParameter, BootloaderParameter);\r
+  Status = PcdSet64S (PcdBootloaderParameter, BootloaderParameter);\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
   // Initialize floating point operating environment to be compliant with UEFI spec.\r
   InitializeFloatingPointUnits ();\r
 \r