1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-05 02:20:30 +00:00

arm/edk2-firmware: upgrade to 202105

Change-Id: I3ea527d820f410a774ff5494c9a02c434913f550
Signed-off-by: Ross Burton <ross.burton@arm.com>
This commit is contained in:
Ross Burton
2021-07-07 13:45:06 +01:00
committed by Jon Mason
parent 648571b113
commit f791c49103
6 changed files with 12 additions and 20 deletions
@@ -4043,16 +4043,16 @@ diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc b/Platform/ARM/N1Sdp/N1SdpPlat
index 1b46eb2734..b59a563806 100644
--- a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
+++ b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
@@ -22,6 +22,8 @@
BUILD_NUMBER = 1
@@ -23,6 +23,8 @@
!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
!include MdePkg/MdeLibs.dsc.inc
+!include DynamicTablesPkg/DynamicTables.dsc.inc
+!include Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManager.dsc.inc
[LibraryClasses.common]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
@@ -152,6 +154,9 @@
@@ -153,6 +155,9 @@
gArmPlatformTokenSpaceGuid.PcdCoreCount|2
gArmPlatformTokenSpaceGuid.PcdClusterCount|2
@@ -4062,7 +4062,7 @@ index 1b46eb2734..b59a563806 100644
# Runtime Variable storage
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE
@@ -211,6 +216,10 @@
@@ -212,6 +217,10 @@
BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
}
@@ -1,4 +0,0 @@
SRCREV_edk2 ?= "ef91b07388e1c0a50c604e5350eeda98428ccea6"
SRCREV_edk2-platforms ?= "2620e05c6fade20ef5e1ba69280d09f9e2b3eff6"
require edk2-firmware.inc
@@ -0,0 +1,4 @@
SRCREV_edk2 ?= "e1999b264f1f9d7230edf2448f757c73da567832"
SRCREV_edk2-platforms ?= "86984c17d562fc60a6dabbc3a479d79163656a0c"
require edk2-firmware.inc
+3 -11
View File
@@ -7,20 +7,12 @@ diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index c42bc9464a..ea21f07a31 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -20,6 +20,8 @@
SKUID_IDENTIFIER = DEFAULT
@@ -24,2 +24,4 @@
[LibraryClasses.common]
+ SbsaValLib|ShellPkg/Application/sbsa-acs/val/SbsaValLib.inf
+ SbsaPalLib|ShellPkg/Application/sbsa-acs/platform/pal_uefi/SbsaPalLib.inf
UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
@@ -83,6 +85,7 @@
# Build all the libraries when building this package.
# This helps developers test changes and how they affect the package.
@@ -88,2 +90,3 @@
#
+ ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf
+ ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf
ShellPkg/Library/UefiShellLib/UefiShellLib.inf
ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+1 -1
View File
@@ -1,4 +1,4 @@
require recipes-bsp/uefi/edk2-firmware_202102.bb
require recipes-bsp/uefi/edk2-firmware_202105.bb
PROVIDES:remove = "virtual/uefi-firmware"