Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Platform/ARM/Juno: Use RngDxeLib #202

Merged
merged 3 commits into from
Sep 16, 2024
Merged

Platform/ARM/Juno: Use RngDxeLib #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9097b35
Platform/ARM: Place MdeLibs.dsc.inc as the first include
pierregondois Sep 3, 2024
3892eb5
Platform/ARM: Move PcdEnforceSecureRngAlgorithms to MdePkg
pierregondois Sep 3, 2024
f27e204
Platform/ARM/Juno: Use DxeRngLib.inf as default RngLib implementation
pierregondois Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions Platform/ARM/JunoPkg/ArmJuno.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Platform/ARM/JunoPkg/ArmJuno.fdf

!include MdePkg/MdeLibs.dsc.inc

# On RTSM, most peripherals are VExpress Motherboard peripherals
!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
!include MdePkg/MdeLibs.dsc.inc

!ifdef DYNAMIC_TABLES_FRAMEWORK
!include DynamicTablesPkg/DynamicTables.dsc.inc
Expand All @@ -44,6 +45,8 @@
# Trng Supports.
ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf
ArmTrngLib|ArmPkg/Library/ArmTrngLib/ArmTrngLib.inf
# Rng
RngLib|MdePkg/Library/DxeRngLib/DxeRngLib.inf

NorFlashDeviceLib|Platform/ARM/Library/P30NorFlashDeviceLib/P30NorFlashDeviceLib.inf
NorFlashPlatformLib|Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
Expand Down Expand Up @@ -218,7 +221,7 @@
#
# Juno Support Trng. Override PcdEnforceSecureRngAlgorithms.
#
gEfiNetworkPkgTokenSpaceGuid.PcdEnforceSecureRngAlgorithms|TRUE
gEfiMdePkgTokenSpaceGuid.PcdEnforceSecureRngAlgorithms|TRUE

[PcdsPatchableInModule]
# Console Resolution (Full HD)
Expand Down Expand Up @@ -406,6 +409,18 @@
# SCMI Driver
ArmPkg/Drivers/ArmScmiDxe/ArmScmiDxe.inf

#
# Rng
#
SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf {
<LibraryClasses>
!if $(ENABLE_UNSAFE_RNGLIB) == TRUE
RngLib|MdeModulePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
!else
RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf
!endif
}

[Components.AARCH64]
#
# EBC
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/Morello/MorelloPlatformFvp.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
# Network definition
DEFINE NETWORK_ISCSI_ENABLE = FALSE

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

!include Platform/ARM/Morello/MorelloPlatform.dsc.inc
!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
!include DynamicTablesPkg/DynamicTables.dsc.inc
!include Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

[LibraryClasses.common]
# Virtio Support
VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
Expand Down
2 changes: 1 addition & 1 deletion Platform/ARM/N1Sdp/N1SdpPlatform.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
FLASH_DEFINITION = Platform/ARM/N1Sdp/N1SdpPlatform.fdf
BUILD_NUMBER = 1

!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
!include MdePkg/MdeLibs.dsc.inc
!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc

!include DynamicTablesPkg/DynamicTables.dsc.inc

Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

DEFINE PCIE_ENABLE = TRUE

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

DEFINE PCIE_ENABLE = TRUE

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

DEFINE PCIE_ENABLE = TRUE

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdN2/RdN2.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc
BUILD_NUMBER = 1

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc
BUILD_NUMBER = 1

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdN2Cfg2/RdN2Cfg2.fdf.inc
BUILD_NUMBER = 1

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdN2Cfg3/RdN2Cfg3.fdf.inc
BUILD_NUMBER = 1

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdV1/RdV1.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

DEFINE PCIE_ENABLE = TRUE

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

DEFINE PCIE_ENABLE = TRUE

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/RdV3/RdV3.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdV3/RdV3.fdf.inc
BUILD_NUMBER = 1

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap3.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
6 changes: 3 additions & 3 deletions Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

DEFINE PCIE_ENABLE = TRUE

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

# include common definitions from SgiPlatform.dsc
!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc

# include common/basic libraries from MdePkg.
!include MdePkg/MdeLibs.dsc.inc

################################################################################
#
# Pcd Section - list of all EDK II PCD Entries defined by this Platform
Expand Down
2 changes: 1 addition & 1 deletion Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@

DT_SUPPORT = FALSE

!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
!include MdePkg/MdeLibs.dsc.inc
!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
!include DynamicTablesPkg/DynamicTables.dsc.inc

[LibraryClasses.common]
Expand Down
2 changes: 1 addition & 1 deletion Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@
#

!if $(ENABLE_UNSAFE_RNGLIB) == TRUE
gEfiNetworkPkgTokenSpaceGuid.PcdEnforceSecureRngAlgorithms|FALSE
gEfiMdePkgTokenSpaceGuid.PcdEnforceSecureRngAlgorithms|FALSE
!endif

[PcdsDynamicHii.common.DEFAULT]
Expand Down
Loading