[PATCH edk2-platforms v1 0/3] Fix build breaks for SynQuacerEvalBoard

[PATCH edk2-platforms v1 0/3] Fix build breaks for SynQuacerEvalBoard

[Sami Mujawar]

This patch series fixes the build breaks in SynQuacerEvalBoard.
Note: I have only tested that the build is fixed. I don't have
a board to test the functionality.

The changes can be seen at:
https://github.com/samimujawar/edk2-platforms/tree/2015_fix_arm_plat_build_break_v1

Sami Mujawar (3):
  Platform/Socionext: Fix build break for SynQuacerEvalBoard
  Platform/Socionext/SynQuacerEvalBoard: Add missing ArmSoftFloatLib
  Platform/Socionext/SynQuacerEvalBoard: Disable EbcDxe for AArch32
    builds

 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 11 +++++++++--
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf |  8 +++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 1/3] Platform/Socionext: Fix build break for SynQuacerEvalBoard

[Sami Mujawar]

BdsDxe depends on VariablePolicyHelperLib, so move it out from
VariableRuntimeDxe.inf and add it to LibraryClasses.DXE_DRIVER and
LibraryClasses.DXE_RUNTIME_DRIVER.

This is required to fix the build break in SynQuacerEvalBoard.dsc

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index e5315897624bf1b3d897204525387cbf61e9b0ea..142d808ae69f1ec261003ab3a1b64db258c46016 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -182,6 +182,8 @@ [LibraryClasses.common.DXE_DRIVER]
   PciHostBridgeLib|Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf
   NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
 
+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
+
 [LibraryClasses.common.UEFI_APPLICATION]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
@@ -208,6 +210,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
 
 ################################################################################
 #
@@ -500,7 +503,6 @@ [Components.common]
       TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
       VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
       VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
-      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
 
   #
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 2/3] Platform/Socionext/SynQuacerEvalBoard: Add missing ArmSoftFloatLib

[Sami Mujawar]

ArmSoftFloatLib is required for the AARCH32 build of the firmware
for SynQuacerEvalBoard.

Therefore, add the missing ArmSoftFloatLib to SynQuacerEvalBoard.dsc

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 142d808ae69f1ec261003ab3a1b64db258c46016..0c88b4e03b9c430e8827c58ebe27870808e07606 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -212,6 +212,9 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !endif
   VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
 
+[LibraryClasses.ARM]
+  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
+
 ################################################################################
 #
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v1 3/3] Platform/Socionext/SynQuacerEvalBoard: Disable EbcDxe for AArch32 builds

[Sami Mujawar]

EbcDxe is not supported for AArch32 builds of the firmware.

Therefore, move EbcDxe so that it is included only for AArch64
builds of the firmware.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 4 +++-
 Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
index 0c88b4e03b9c430e8827c58ebe27870808e07606..fd4cfa82330dfa3b7e4bd83573acdd3afa117d75 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc
@@ -561,7 +561,6 @@ [Components.common]
   }
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
-  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 
   #
@@ -633,3 +632,6 @@ [Components.common]
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
 
 !include Silicon/Socionext/SynQuacer/Acpi.dsc.inc
+
+[Components.AARCH64]
+  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
index b1e0a53e6191a9adad068695e000f1285e2c5acb..91771895245decfdabf5add4c41240ba5ecb59a3 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -140,9 +140,15 @@ [FV.FvMain]
   INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
   INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
   INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
-  INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
   INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 
+!if $(ARCH) == AARCH64
+  #
+  # EBC
+  #
+  INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+!endif
+
   #
   # eMMC support
   #
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

Re: [PATCH edk2-platforms v1 0/3] Fix build breaks for SynQuacerEvalBoard

[Ard Biesheuvel]

On Fri, 17 Dec 2021 at 14:46, Sami Mujawar <sami.mujawar@arm.com> wrote:
>
> This patch series fixes the build breaks in SynQuacerEvalBoard.
> Note: I have only tested that the build is fixed. I don't have
> a board to test the functionality.
>
> The changes can be seen at:
> https://github.com/samimujawar/edk2-platforms/tree/2015_fix_arm_plat_build_break_v1
>
> Sami Mujawar (3):
>   Platform/Socionext: Fix build break for SynQuacerEvalBoard
>   Platform/Socionext/SynQuacerEvalBoard: Add missing ArmSoftFloatLib
>   Platform/Socionext/SynQuacerEvalBoard: Disable EbcDxe for AArch32
>     builds
>

Thanks for fixing this.

Pushed as d57f763b4cbd..818e8b7beb51