Topics

[edk2-platforms][PATCH 1/1] RaspberryPi: get RPi4 and RPi3 building again.


Andrei Warkentin
 

Add VariablePolicyLib and its dependency.

Testing: Pi 4 boot.

Signed-off-by: Andrei Warkentin <andrey.warkentin@...>
---
Platform/RaspberryPi/RPi3/RPi3.dsc | 3 +++
Platform/RaspberryPi/RPi4/RPi4.dsc | 3 +++
2 files changed, 6 insertions(+)

diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 325d7bdb..9408138d 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -169,6 +169,8 @@
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
+ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf

[LibraryClasses.common.SEC]
@@ -218,6 +220,7 @@
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf

!if $(SECURE_BOOT_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc
index c994f56d..4e5a36ed 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc
+++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
@@ -169,6 +169,8 @@
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
+ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf

#
@@ -226,6 +228,7 @@
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf

!if $(SECURE_BOOT_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
--
2.20.1


Pete Batard
 

For reference, this breakage was introduced with edk2 commit https://github.com/tianocore/edk2/commit/b6490426e3208de7d6cbd756276a02e4329cd85a (MdeModulePkg: Connect VariablePolicy business logic to VariableServices).

It'll probably be worth adding a reference to it in the commit message during integration.

With this:

On 2020.11.19 00:01, Andrei Warkentin wrote:
Add VariablePolicyLib and its dependency.
Testing: Pi 4 boot.
Signed-off-by: Andrei Warkentin <andrey.warkentin@...>
---
Platform/RaspberryPi/RPi3/RPi3.dsc | 3 +++
Platform/RaspberryPi/RPi4/RPi4.dsc | 3 +++
2 files changed, 6 insertions(+)
diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 325d7bdb..9408138d 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -169,6 +169,8 @@
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
+ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
[LibraryClasses.common.SEC]
@@ -218,6 +220,7 @@
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc
index c994f56d..4e5a36ed 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc
+++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
@@ -169,6 +169,8 @@
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
+ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
#
@@ -226,6 +228,7 @@
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
Reviewed-by: Pete Batard <@pbatard>


Philippe Mathieu-Daudé
 

On 11/19/20 6:14 PM, Pete Batard wrote:
For reference, this breakage was introduced with edk2 commit
https://github.com/tianocore/edk2/commit/b6490426e3208de7d6cbd756276a02e4329cd85a
(MdeModulePkg: Connect VariablePolicy business logic to VariableServices).
It is better if Andrei Cc the developers involved (Cc'ed them now).


It'll probably be worth adding a reference to it in the commit message
during integration.
This can be added before the S-o-b:

Fixes: b6490426e320 ("MdeModulePkg: Connect VariablePolicy business
logic to VariableServices")


With this:

On 2020.11.19 00:01, Andrei Warkentin wrote:
Add VariablePolicyLib and its dependency.

Testing: Pi 4 boot.

Signed-off-by: Andrei Warkentin <andrey.warkentin@...>
---
  Platform/RaspberryPi/RPi3/RPi3.dsc | 3 +++
  Platform/RaspberryPi/RPi4/RPi4.dsc | 3 +++
  2 files changed, 6 insertions(+)

diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc
b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 325d7bdb..9408138d 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -169,6 +169,8 @@
   
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

  !endif
    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf


VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf

    GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
    [LibraryClasses.common.SEC]
@@ -218,6 +220,7 @@
   
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
    EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
    ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf

    !if $(SECURE_BOOT_ENABLE) == TRUE
    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc
b/Platform/RaspberryPi/RPi4/RPi4.dsc
index c994f56d..4e5a36ed 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc
+++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
@@ -169,6 +169,8 @@
   
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

  !endif
    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf


VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf

    GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
      #
@@ -226,6 +228,7 @@
   
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
    EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
    ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf

    !if $(SECURE_BOOT_ENABLE) == TRUE
    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
Reviewed-by: Pete Batard <@pbatard>


Pete Batard
 

Hi Philippe,

On 2020.11.19 17:28, Philippe Mathieu-Daudé wrote:
On 11/19/20 6:14 PM, Pete Batard wrote:
For reference, this breakage was introduced with edk2 commit
https://github.com/tianocore/edk2/commit/b6490426e3208de7d6cbd756276a02e4329cd85a
(MdeModulePkg: Connect VariablePolicy business logic to VariableServices).
It is better if Andrei Cc the developers involved (Cc'ed them now).
Good point.



It'll probably be worth adding a reference to it in the commit message
during integration.
This can be added before the S-o-b:
Fixes: b6490426e320 ("MdeModulePkg: Connect VariablePolicy business
logic to VariableServices")
Just going to nitpick that since we're patching in edk2-platforms and referencing an edk2 commit, we'll want:

Fixes: tianocore/edk2@b6490426e320 ("MdeModulePkg: Connect VariablePolicy business logic to VariableServices")

For GitHub to produce a clickable link.

Regards,

/Pete



With this:

On 2020.11.19 00:01, Andrei Warkentin wrote:
Add VariablePolicyLib and its dependency.

Testing: Pi 4 boot.

Signed-off-by: Andrei Warkentin <andrey.warkentin@...>
---
  Platform/RaspberryPi/RPi3/RPi3.dsc | 3 +++
  Platform/RaspberryPi/RPi4/RPi4.dsc | 3 +++
  2 files changed, 6 insertions(+)

diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc
b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 325d7bdb..9408138d 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -169,6 +169,8 @@
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

  !endif
    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+
VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf

+
VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf

    GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
    [LibraryClasses.common.SEC]
@@ -218,6 +220,7 @@
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
    EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
    ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+
VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf

    !if $(SECURE_BOOT_ENABLE) == TRUE
    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc
b/Platform/RaspberryPi/RPi4/RPi4.dsc
index c994f56d..4e5a36ed 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc
+++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
@@ -169,6 +169,8 @@
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

  !endif
    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+
VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf

+
VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf

    GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
      #
@@ -226,6 +228,7 @@
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
    EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
    ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+
VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf

    !if $(SECURE_BOOT_ENABLE) == TRUE
    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
Reviewed-by: Pete Batard <@pbatard>


Andrei Warkentin
 

Sorry, folks, is there anything actionable for me here to do?

It does appear that all the other edk2-platforms are broken/affected as well.

A


From: devel@edk2.groups.io <devel@edk2.groups.io> on behalf of Pete Batard via groups.io <pete@...>
Sent: Thursday, November 19, 2020 11:33 AM
To: Philippe Mathieu-Daudé <philmd@...>; Andrei Warkentin <andrey.warkentin@...>; devel@edk2.groups.io <devel@edk2.groups.io>; Bret Barkelew <brbarkel@...>; Dandan Bi <dandan.bi@...>; Jian J Wang <jian.j.wang@...>
Cc: ard.biesheuvel@... <ard.biesheuvel@...>; leif@... <leif@...>; Liming Gao <gaoliming@...>
Subject: Re: [edk2-devel] [edk2-platforms][PATCH 1/1] RaspberryPi: get RPi4 and RPi3 building again.
 
Hi Philippe,

On 2020.11.19 17:28, Philippe Mathieu-Daudé wrote:
> On 11/19/20 6:14 PM, Pete Batard wrote:
>> For reference, this breakage was introduced with edk2 commit
>> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Ftianocore%2Fedk2%2Fcommit%2Fb6490426e3208de7d6cbd756276a02e4329cd85a&amp;data=04%7C01%7Cawarkentin%40vmware.com%7C912c541f65924d5c6a6108d88cb139b8%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637414040092341605%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=K%2Fe45o3ZvD29UaHNFzCKLBMil8lJ1adSB2mRiC0uVy0%3D&amp;reserved=0
>> (MdeModulePkg: Connect VariablePolicy business logic to VariableServices).
>
> It is better if Andrei Cc the developers involved (Cc'ed them now).

Good point.

>
>>
>> It'll probably be worth adding a reference to it in the commit message
>> during integration.
>
> This can be added before the S-o-b:
>
> Fixes: b6490426e320 ("MdeModulePkg: Connect VariablePolicy business
> logic to VariableServices")

Just going to nitpick that since we're patching in edk2-platforms and
referencing an edk2 commit, we'll want:

Fixes: tianocore/edk2@b6490426e320 ("MdeModulePkg: Connect
VariablePolicy business logic to VariableServices")

For GitHub to produce a clickable link.

Regards,

/Pete

>
>>
>> With this:
>>
>> On 2020.11.19 00:01, Andrei Warkentin wrote:
>>> Add VariablePolicyLib and its dependency.
>>>
>>> Testing: Pi 4 boot.
>>>
>>> Signed-off-by: Andrei Warkentin <andrey.warkentin@...>
>>> ---
>>>    Platform/RaspberryPi/RPi3/RPi3.dsc | 3 +++
>>>    Platform/RaspberryPi/RPi4/RPi4.dsc | 3 +++
>>>    2 files changed, 6 insertions(+)
>>>
>>> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc
>>> b/Platform/RaspberryPi/RPi3/RPi3.dsc
>>> index 325d7bdb..9408138d 100644
>>> --- a/Platform/RaspberryPi/RPi3/RPi3.dsc
>>> +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
>>> @@ -169,6 +169,8 @@
>>>    
>>> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
>>>
>>>    !endif
>>>      VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>>> +
>>> VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
>>>
>>> +
>>> VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
>>>
>>>      GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
>>>      [LibraryClasses.common.SEC]
>>> @@ -218,6 +220,7 @@
>>>    
>>> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
>>>      EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
>>>      ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
>>> +
>>> VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
>>>
>>>      !if $(SECURE_BOOT_ENABLE) == TRUE
>>>      BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
>>> diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc
>>> b/Platform/RaspberryPi/RPi4/RPi4.dsc
>>> index c994f56d..4e5a36ed 100644
>>> --- a/Platform/RaspberryPi/RPi4/RPi4.dsc
>>> +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
>>> @@ -169,6 +169,8 @@
>>>    
>>> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
>>>
>>>    !endif
>>>      VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>>> +
>>> VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
>>>
>>> +
>>> VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
>>>
>>>      GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
>>>        #
>>> @@ -226,6 +228,7 @@
>>>    
>>> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
>>>      EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
>>>      ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
>>> +
>>> VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
>>>
>>>      !if $(SECURE_BOOT_ENABLE) == TRUE
>>>      BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
>>>
>>
>> Reviewed-by: Pete Batard <pete@...>
>>
>







Ard Biesheuvel
 

On 11/19/20 1:01 AM, Andrei Warkentin wrote:
Add VariablePolicyLib and its dependency.
Testing: Pi 4 boot.
Signed-off-by: Andrei Warkentin <andrey.warkentin@...>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@...>

Pushed as 879f483ce455..663c3108f730

Thanks all,

---
Platform/RaspberryPi/RPi3/RPi3.dsc | 3 +++
Platform/RaspberryPi/RPi4/RPi4.dsc | 3 +++
2 files changed, 6 insertions(+)
diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 325d7bdb..9408138d 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -169,6 +169,8 @@
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
+ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
[LibraryClasses.common.SEC]
@@ -218,6 +220,7 @@
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc
index c994f56d..4e5a36ed 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc
+++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
@@ -169,6 +169,8 @@
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
+ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
GpioLib|Silicon/Broadcom/Bcm283x/Library/GpioLib/GpioLib.inf
#
@@ -226,6 +228,7 @@
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
EfiResetSystemLib|Platform/RaspberryPi/Library/ResetLib/ResetLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+ VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf