From 2bc42373ed7b3a36397274db719dd682338215aa Mon Sep 17 00:00:00 2001 From: mattp Date: Tue, 8 Jul 2025 19:02:01 -0400 Subject: [PATCH 25/29] Late May --- .../RPi5/Library/PlatformLib/PlatformLib.inf | 1 - Platform/RaspberryPi/RPi5/RPi5.dsc | 11 +++++++---- Platform/RaspberryPi/RPi5/RPi5.fdf | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Platform/RaspberryPi/RPi5/Library/PlatformLib/PlatformLib.inf b/Platform/RaspberryPi/RPi5/Library/PlatformLib/PlatformLib.inf index 24ef8368..42fa84bf 100644 --- a/Platform/RaspberryPi/RPi5/Library/PlatformLib/PlatformLib.inf +++ b/Platform/RaspberryPi/RPi5/Library/PlatformLib/PlatformLib.inf @@ -28,7 +28,6 @@ [LibraryClasses] ArmLib - FdtLib IoLib MemoryAllocationLib PcdLib diff --git a/Platform/RaspberryPi/RPi5/RPi5.dsc b/Platform/RaspberryPi/RPi5/RPi5.dsc index fae154bc..e7eed390 100644 --- a/Platform/RaspberryPi/RPi5/RPi5.dsc +++ b/Platform/RaspberryPi/RPi5/RPi5.dsc @@ -126,7 +126,7 @@ CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf DmaLib|EmbeddedPkg/Library/NonCoherentDmaLib/NonCoherentDmaLib.inf TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf - ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf + ArmSmcLib|MdePkg/Library/ArmSmcLib/ArmSmcLib.inf ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf # Dual serial port library @@ -155,7 +155,7 @@ DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf # Flattened Device Tree (FDT) access library - FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf + FdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf # USB Libraries UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf @@ -385,7 +385,6 @@ [PcdsFixedAtBuild.common] gArmPlatformTokenSpaceGuid.PcdCoreCount|4 - gArmTokenSpaceGuid.PcdVFPEnabled|1 gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 @@ -548,6 +547,7 @@ !else MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf !endif + SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf @@ -570,7 +570,10 @@ ArmPkg/Drivers/ArmGicDxe/ArmGicV2Dxe.inf Platform/RaspberryPi/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf Platform/RaspberryPi/RPi5/Drivers/RpiPlatformDxe/RpiPlatformDxe.inf - Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf + Platform/RaspberryPi/Drivers/FdtDxe/FdtDxe.inf { + + FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf # Map to deprecated library for this module only + } ArmPkg/Drivers/TimerDxe/TimerDxe.inf MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf MdeModulePkg/Universal/EbcDxe/EbcDxe.inf diff --git a/Platform/RaspberryPi/RPi5/RPi5.fdf b/Platform/RaspberryPi/RPi5/RPi5.fdf index 23c37e26..917f5aab 100644 --- a/Platform/RaspberryPi/RPi5/RPi5.fdf +++ b/Platform/RaspberryPi/RPi5/RPi5.fdf @@ -194,6 +194,7 @@ READ_LOCK_STATUS = TRUE INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf INF SecurityPkg/VariableAuthenticated/SecureBootDefaultKeysDxe/SecureBootDefaultKeysDxe.inf !endif + INF SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf -- 2.51.2