CorebootPayloadPkg: Fix GCC build issue on macro definition

[mirror_edk2.git] / CorebootPayloadPkg / CorebootPayloadPkg.fdf

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 481f3436730e89f79e1274dcade805bc83e0d6e2..34c8f7feacd9c7ee022ce14be99f0b69f7d0c1eb 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -52,7 +52,8 @@ INF CorebootModulePkg/SecCore/SecCore.inf
 \r
 INF MdeModulePkg/Core/Pei/PeiMain.inf\r
 INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
+INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf\r
+INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf\r
 INF CorebootModulePkg/CbSupportPei/CbSupportPei.inf\r
 INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
@@ -60,6 +61,7 @@ INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
 \r
 [FV.DXEFV]\r
 BlockSize          = 0x1000\r
+FvForceRebase      = FALSE\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -82,13 +84,18 @@ READ_LOCK_STATUS   = TRUE
 #\r
 INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
 INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf\r
+INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\r
+INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
 \r
 INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
 INF MdeModulePkg/Application/UiApp/UiApp.inf\r
+!if $(USE_HPET_TIMER) == TRUE\r
+INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf\r
+!else\r
 INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
+!endif\r
 INF MdeModulePkg/Universal/Metronome/Metronome.inf\r
 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
@@ -219,7 +226,7 @@ INF CorebootPayloadPkg/FbGop/FbGop.inf
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32   Align=32    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    PE32     PE32   Align=Auto    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional\r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
@@ -227,7 +234,7 @@ INF CorebootPayloadPkg/FbGop/FbGop.inf
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
      PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-     PE32      PE32   Align=32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+     PE32      PE32   Align=Auto           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional\r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r