[edk2,edk2-platforms,1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes

Message ID 20190308153010.18486-1-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • [edk2,edk2-platforms,1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes
Related show

Commit Message

Ard Biesheuvel March 8, 2019, 3:30 p.m.
Bring SgiPkg in line with EDK2 core changes to StandaloneMmPkg:
- add a resolution for ExtractGuidedSectionLib
- remove reference to gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable
- update the resolution of StandaloneMmDriverEntryPoint

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.20.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ard Biesheuvel March 11, 2019, 11:56 a.m. | #1
On Fri, 8 Mar 2019 at 16:31, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>

> Bring SgiPkg in line with EDK2 core changes to StandaloneMmPkg:

> - add a resolution for ExtractGuidedSectionLib

> - remove reference to gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable

> - update the resolution of StandaloneMmDriverEntryPoint

>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Could I get an ack from the ARM folks please?

> ---

>  Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 ++++----

>  1 file changed, 4 insertions(+), 4 deletions(-)

>

> diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> index 65dd6ac82c4a..ef16bfa9a20e 100644

> --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> @@ -43,6 +43,7 @@

>    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

>    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

>    DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

> +  ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

>    FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf

>    HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf

>    IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

> @@ -56,7 +57,7 @@

>    #

>    # Entry point

>    #

> -  StandaloneMmDriverEntryPoint|StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf

> +  StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf

>

>    ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

>    StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf

> @@ -81,9 +82,6 @@

>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform

>  #

>  ################################################################################

> -[PcdsFeatureFlag]

> -  gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable|TRUE

> -

>  [PcdsFixedAtBuild]

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800000CF

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff

> @@ -93,6 +91,8 @@

>    gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF70000

>    gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

>

> +  gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2

> +

>  ###################################################################################################

>  #

>  # Components Section - list of the modules and components that will be processed by compilation

> --

> 2.20.1

>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Thomas Abraham March 11, 2019, 1:30 p.m. | #2
On Fri, Mar 8, 2019 at 9:01 PM Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>

> Bring SgiPkg in line with EDK2 core changes to StandaloneMmPkg:

> - add a resolution for ExtractGuidedSectionLib

> - remove reference to gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable

> - update the resolution of StandaloneMmDriverEntryPoint

>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---

>  Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 ++++----

>  1 file changed, 4 insertions(+), 4 deletions(-)

>

> diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> index 65dd6ac82c4a..ef16bfa9a20e 100644

> --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> @@ -43,6 +43,7 @@

>    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

>    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

>    DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

> +  ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf


The build fails with the following error

/home/thopan01/devel/sgi/sgi-dev/uefi/edk2/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c:37:
undefined reference to `memcpy'
/tmp/ccOj5Ie6.ltrans0.ltrans.o: In function
`ExtractGuidedSectionLibConstructor':
/home/thopan01/devel/sgi/sgi-dev/uefi/edk2/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c:233:
undefined reference to `memcpy'
collect2: error: ld returned 1 exit status

I will check further why the build fails here.

Thanks,
Thomas.


>    FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf

>    HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf

>    IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

> @@ -56,7 +57,7 @@

>    #

>    # Entry point

>    #

> -  StandaloneMmDriverEntryPoint|StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf

> +  StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf

>

>    ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

>    StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf

> @@ -81,9 +82,6 @@

>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform

>  #

>  ################################################################################

> -[PcdsFeatureFlag]

> -  gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable|TRUE

> -

>  [PcdsFixedAtBuild]

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800000CF

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff

> @@ -93,6 +91,8 @@

>    gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF70000

>    gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

>

> +  gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2

> +

>  ###################################################################################################

>  #

>  # Components Section - list of the modules and components that will be processed by compilation

> --

> 2.20.1

>

> _______________________________________________

> edk2-devel mailing list

> edk2-devel@lists.01.org

> https://lists.01.org/mailman/listinfo/edk2-devel

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel March 11, 2019, 1:38 p.m. | #3
On Mon, 11 Mar 2019 at 14:31, Thomas Abraham <thomas.abraham@arm.com> wrote:
>

> On Fri, Mar 8, 2019 at 9:01 PM Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:

> >

> > Bring SgiPkg in line with EDK2 core changes to StandaloneMmPkg:

> > - add a resolution for ExtractGuidedSectionLib

> > - remove reference to gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable

> > - update the resolution of StandaloneMmDriverEntryPoint

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> > ---

> >  Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 ++++----

> >  1 file changed, 4 insertions(+), 4 deletions(-)

> >

> > diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> > index 65dd6ac82c4a..ef16bfa9a20e 100644

> > --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> > +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> > @@ -43,6 +43,7 @@

> >    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

> >    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> >    DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

> > +  ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

>

> The build fails with the following error

>

> /home/thopan01/devel/sgi/sgi-dev/uefi/edk2/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c:37:

> undefined reference to `memcpy'

> /tmp/ccOj5Ie6.ltrans0.ltrans.o: In function

> `ExtractGuidedSectionLibConstructor':

> /home/thopan01/devel/sgi/sgi-dev/uefi/edk2/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c:233:

> undefined reference to `memcpy'

> collect2: error: ld returned 1 exit status

>

> I will check further why the build fails here.

>


We need to add this in the .dsc

  #
  # It is not possible to prevent the ARM compiler for generic
intrinsic functions.
  # This library provides the instrinsic functions generate by a given compiler.
  # And NULL mean link this library into all ARM images.
  #
  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Thomas Abraham March 11, 2019, 1:56 p.m. | #4
On Mon, Mar 11, 2019 at 7:09 PM Ard Biesheuvel
<ard.biesheuvel@linaro.org> wrote:
>

> On Mon, 11 Mar 2019 at 14:31, Thomas Abraham <thomas.abraham@arm.com> wrote:

> >

> > On Fri, Mar 8, 2019 at 9:01 PM Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:

> > >

> > > Bring SgiPkg in line with EDK2 core changes to StandaloneMmPkg:

> > > - add a resolution for ExtractGuidedSectionLib

> > > - remove reference to gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable

> > > - update the resolution of StandaloneMmDriverEntryPoint

> > >

> > > Contributed-under: TianoCore Contribution Agreement 1.1

> > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> > > ---

> > >  Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 ++++----

> > >  1 file changed, 4 insertions(+), 4 deletions(-)

> > >

> > > diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> > > index 65dd6ac82c4a..ef16bfa9a20e 100644

> > > --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> > > +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> > > @@ -43,6 +43,7 @@

> > >    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

> > >    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> > >    DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

> > > +  ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

> >

> > The build fails with the following error

> >

> > /home/thopan01/devel/sgi/sgi-dev/uefi/edk2/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c:37:

> > undefined reference to `memcpy'

> > /tmp/ccOj5Ie6.ltrans0.ltrans.o: In function

> > `ExtractGuidedSectionLibConstructor':

> > /home/thopan01/devel/sgi/sgi-dev/uefi/edk2/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c:233:

> > undefined reference to `memcpy'

> > collect2: error: ld returned 1 exit status

> >

> > I will check further why the build fails here.

> >

>

> We need to add this in the .dsc

>

>   #

>   # It is not possible to prevent the ARM compiler for generic

> intrinsic functions.

>   # This library provides the instrinsic functions generate by a given compiler.

>   # And NULL mean link this library into all ARM images.

>   #

>   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf


Thanks, it works with this change. So with this change rolled into this patch.
Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel March 11, 2019, 2:48 p.m. | #5
On Mon, 11 Mar 2019 at 14:56, Thomas Abraham <thomas.abraham@arm.com> wrote:
>

> On Mon, Mar 11, 2019 at 7:09 PM Ard Biesheuvel

> <ard.biesheuvel@linaro.org> wrote:

> >

> > On Mon, 11 Mar 2019 at 14:31, Thomas Abraham <thomas.abraham@arm.com> wrote:

> > >

> > > On Fri, Mar 8, 2019 at 9:01 PM Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:

> > > >

> > > > Bring SgiPkg in line with EDK2 core changes to StandaloneMmPkg:

> > > > - add a resolution for ExtractGuidedSectionLib

> > > > - remove reference to gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable

> > > > - update the resolution of StandaloneMmDriverEntryPoint

> > > >

> > > > Contributed-under: TianoCore Contribution Agreement 1.1

> > > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> > > > ---

> > > >  Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 ++++----

> > > >  1 file changed, 4 insertions(+), 4 deletions(-)

> > > >

> > > > diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> > > > index 65dd6ac82c4a..ef16bfa9a20e 100644

> > > > --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> > > > +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> > > > @@ -43,6 +43,7 @@

> > > >    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

> > > >    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

> > > >    DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

> > > > +  ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

> > >

> > > The build fails with the following error

> > >

> > > /home/thopan01/devel/sgi/sgi-dev/uefi/edk2/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c:37:

> > > undefined reference to `memcpy'

> > > /tmp/ccOj5Ie6.ltrans0.ltrans.o: In function

> > > `ExtractGuidedSectionLibConstructor':

> > > /home/thopan01/devel/sgi/sgi-dev/uefi/edk2/EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.c:233:

> > > undefined reference to `memcpy'

> > > collect2: error: ld returned 1 exit status

> > >

> > > I will check further why the build fails here.

> > >

> >

> > We need to add this in the .dsc

> >

> >   #

> >   # It is not possible to prevent the ARM compiler for generic

> > intrinsic functions.

> >   # This library provides the instrinsic functions generate by a given compiler.

> >   # And NULL mean link this library into all ARM images.

> >   #

> >   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf

>

> Thanks, it works with this change. So with this change rolled into this patch.

> Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>


Thanks Thomas

Pushed as c63c3f071271..68cc99303e38
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Leif Lindholm March 25, 2019, 5:12 p.m. | #6
On Fri, Mar 08, 2019 at 04:30:09PM +0100, Ard Biesheuvel wrote:
> Bring SgiPkg in line with EDK2 core changes to StandaloneMmPkg:

> - add a resolution for ExtractGuidedSectionLib

> - remove reference to gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable

> - update the resolution of StandaloneMmDriverEntryPoint

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


For series:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>


> ---

>  Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 8 ++++----

>  1 file changed, 4 insertions(+), 4 deletions(-)

> 

> diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> index 65dd6ac82c4a..ef16bfa9a20e 100644

> --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc

> @@ -43,6 +43,7 @@

>    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

>    DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

>    DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

> +  ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

>    FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf

>    HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf

>    IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

> @@ -56,7 +57,7 @@

>    #

>    # Entry point

>    #

> -  StandaloneMmDriverEntryPoint|StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf

> +  StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf

>  

>    ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

>    StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf

> @@ -81,9 +82,6 @@

>  # Pcd Section - list of all EDK II PCD Entries defined by this Platform

>  #

>  ################################################################################

> -[PcdsFeatureFlag]

> -  gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable|TRUE

> -

>  [PcdsFixedAtBuild]

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800000CF

>    gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff

> @@ -93,6 +91,8 @@

>    gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF70000

>    gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

>  

> +  gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2

> +

>  ###################################################################################################

>  #

>  # Components Section - list of the modules and components that will be processed by compilation

> -- 

> 2.20.1

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
index 65dd6ac82c4a..ef16bfa9a20e 100644
--- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
+++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc
@@ -43,6 +43,7 @@ 
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
+  ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
   FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf
   HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -56,7 +57,7 @@ 
   #
   # Entry point
   #
-  StandaloneMmDriverEntryPoint|StandaloneMmPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf
+  StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf
 
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
@@ -81,9 +82,6 @@ 
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform
 #
 ################################################################################
-[PcdsFeatureFlag]
-  gStandaloneMmPkgTokenSpaceGuid.PcdStandaloneMmEnable|TRUE
-
 [PcdsFixedAtBuild]
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800000CF
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff
@@ -93,6 +91,8 @@ 
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x7FF70000
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200
 
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2
+
 ###################################################################################################
 #
 # Components Section - list of the modules and components that will be processed by compilation