* [PATCH edk2-platforms 2/2] Platform/Socionext/DeveloperBox: align with upstream StandaloneMmPkg changes
2019-03-08 15:30 [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes Ard Biesheuvel
@ 2019-03-08 15:30 ` Ard Biesheuvel
2019-03-29 7:32 ` Ard Biesheuvel
2019-03-11 11:56 ` [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: " Ard Biesheuvel
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: Ard Biesheuvel @ 2019-03-08 15:30 UTC (permalink / raw)
To: edk2-devel
Bring DeveloperBox in line with EDK2 core changes to StandaloneMmPkg:
- switch from BaseExtractGuidedSectionLib to PrePiExtractGuidedSectionLib
- include a NULL library class resolution for VariableMmDependency
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 5 ++++-
Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc | 7 +++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index 31afc4aac3c4..39077ab5ee79 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -293,7 +293,10 @@
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
}
!else
- ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
+ ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf {
+ <LibraryClasses>
+ NULL|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
+ }
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
!endif
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
index 55c5fbb7350d..141b175047b2 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
@@ -68,9 +68,6 @@
[PcdsFixedAtBuild]
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x51040000
-[PcdsPatchableInModule]
- gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|0x0
-
################################################################################
#
# Components Section - list of all EDK II Modules needed by this Platform
@@ -82,8 +79,10 @@
#
StandaloneMmPkg/Core/StandaloneMmCore.inf {
<LibraryClasses>
- ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
+ ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+ <PcdsFixedAtBuild>
+ gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2
}
StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf
--
2.20.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH edk2-platforms 2/2] Platform/Socionext/DeveloperBox: align with upstream StandaloneMmPkg changes
2019-03-08 15:30 ` [PATCH edk2-platforms 2/2] Platform/Socionext/DeveloperBox: " Ard Biesheuvel
@ 2019-03-29 7:32 ` Ard Biesheuvel
2019-03-29 8:56 ` Leif Lindholm
0 siblings, 1 reply; 11+ messages in thread
From: Ard Biesheuvel @ 2019-03-29 7:32 UTC (permalink / raw)
To: edk2-devel@lists.01.org
On Fri, 8 Mar 2019 at 16:31, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>
> Bring DeveloperBox in line with EDK2 core changes to StandaloneMmPkg:
> - switch from BaseExtractGuidedSectionLib to PrePiExtractGuidedSectionLib
> - include a NULL library class resolution for VariableMmDependency
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Leif,
I'd like to merge this today if you don't have any objections.
> ---
> Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 5 ++++-
> Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc | 7 +++----
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> index 31afc4aac3c4..39077ab5ee79 100644
> --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> @@ -293,7 +293,10 @@
> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
> }
> !else
> - ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
> + ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf {
> + <LibraryClasses>
> + NULL|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
> + }
> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
> !endif
> diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
> index 55c5fbb7350d..141b175047b2 100644
> --- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
> +++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
> @@ -68,9 +68,6 @@
> [PcdsFixedAtBuild]
> gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x51040000
>
> -[PcdsPatchableInModule]
> - gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|0x0
> -
> ################################################################################
> #
> # Components Section - list of all EDK II Modules needed by this Platform
> @@ -82,8 +79,10 @@
> #
> StandaloneMmPkg/Core/StandaloneMmCore.inf {
> <LibraryClasses>
> - ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
> + ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
> NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> + <PcdsFixedAtBuild>
> + gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2
> }
>
> StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH edk2-platforms 2/2] Platform/Socionext/DeveloperBox: align with upstream StandaloneMmPkg changes
2019-03-29 7:32 ` Ard Biesheuvel
@ 2019-03-29 8:56 ` Leif Lindholm
2019-03-29 9:52 ` Ard Biesheuvel
0 siblings, 1 reply; 11+ messages in thread
From: Leif Lindholm @ 2019-03-29 8:56 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org
On Fri, Mar 29, 2019 at 08:32:31AM +0100, Ard Biesheuvel wrote:
> On Fri, 8 Mar 2019 at 16:31, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> >
> > Bring DeveloperBox in line with EDK2 core changes to StandaloneMmPkg:
> > - switch from BaseExtractGuidedSectionLib to PrePiExtractGuidedSectionLib
> > - include a NULL library class resolution for VariableMmDependency
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> Leif,
>
> I'd like to merge this today if you don't have any objections.
None - that was implied in
https://lists.01.org/pipermail/edk2-devel/2019-March/038167.html
(There wasn't a 0/2 to put a "for series" on.)
/
Leif
> > ---
> > Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 5 ++++-
> > Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc | 7 +++----
> > 2 files changed, 7 insertions(+), 5 deletions(-)
> >
> > diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> > index 31afc4aac3c4..39077ab5ee79 100644
> > --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> > +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> > @@ -293,7 +293,10 @@
> > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
> > }
> > !else
> > - ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf
> > + ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf {
> > + <LibraryClasses>
> > + NULL|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
> > + }
> > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
> > SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
> > !endif
> > diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
> > index 55c5fbb7350d..141b175047b2 100644
> > --- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
> > +++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc
> > @@ -68,9 +68,6 @@
> > [PcdsFixedAtBuild]
> > gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x51040000
> >
> > -[PcdsPatchableInModule]
> > - gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|0x0
> > -
> > ################################################################################
> > #
> > # Components Section - list of all EDK II Modules needed by this Platform
> > @@ -82,8 +79,10 @@
> > #
> > StandaloneMmPkg/Core/StandaloneMmCore.inf {
> > <LibraryClasses>
> > - ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
> > + ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
> > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> > + <PcdsFixedAtBuild>
> > + gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2
> > }
> >
> > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf
> > --
> > 2.20.1
> >
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH edk2-platforms 2/2] Platform/Socionext/DeveloperBox: align with upstream StandaloneMmPkg changes
2019-03-29 8:56 ` Leif Lindholm
@ 2019-03-29 9:52 ` Ard Biesheuvel
0 siblings, 0 replies; 11+ messages in thread
From: Ard Biesheuvel @ 2019-03-29 9:52 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org
On Fri, 29 Mar 2019 at 09:56, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Fri, Mar 29, 2019 at 08:32:31AM +0100, Ard Biesheuvel wrote:
> > On Fri, 8 Mar 2019 at 16:31, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> > >
> > > Bring DeveloperBox in line with EDK2 core changes to StandaloneMmPkg:
> > > - switch from BaseExtractGuidedSectionLib to PrePiExtractGuidedSectionLib
> > > - include a NULL library class resolution for VariableMmDependency
> > >
> > > Contributed-under: TianoCore Contribution Agreement 1.1
> > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >
> > Leif,
> >
> > I'd like to merge this today if you don't have any objections.
>
> None - that was implied in
> https://lists.01.org/pipermail/edk2-devel/2019-March/038167.html
>
> (There wasn't a 0/2 to put a "for series" on.)
>
Ah, my bad
Pushed as 05fdad573966..0a32c15d2172
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes
2019-03-08 15:30 [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes Ard Biesheuvel
2019-03-08 15:30 ` [PATCH edk2-platforms 2/2] Platform/Socionext/DeveloperBox: " Ard Biesheuvel
@ 2019-03-11 11:56 ` Ard Biesheuvel
2019-03-11 13:30 ` Thomas Abraham
2019-03-25 17:12 ` Leif Lindholm
3 siblings, 0 replies; 11+ messages in thread
From: Ard Biesheuvel @ 2019-03-11 11:56 UTC (permalink / raw)
To: edk2-devel@lists.01.org
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
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes
2019-03-08 15:30 [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes Ard Biesheuvel
2019-03-08 15:30 ` [PATCH edk2-platforms 2/2] Platform/Socionext/DeveloperBox: " Ard Biesheuvel
2019-03-11 11:56 ` [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: " Ard Biesheuvel
@ 2019-03-11 13:30 ` Thomas Abraham
2019-03-11 13:38 ` Ard Biesheuvel
2019-03-25 17:12 ` Leif Lindholm
3 siblings, 1 reply; 11+ messages in thread
From: Thomas Abraham @ 2019-03-11 13:30 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes
2019-03-11 13:30 ` Thomas Abraham
@ 2019-03-11 13:38 ` Ard Biesheuvel
2019-03-11 13:56 ` Thomas Abraham
0 siblings, 1 reply; 11+ messages in thread
From: Ard Biesheuvel @ 2019-03-11 13:38 UTC (permalink / raw)
To: Thomas Abraham; +Cc: edk2-devel@lists.01.org
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes
2019-03-11 13:38 ` Ard Biesheuvel
@ 2019-03-11 13:56 ` Thomas Abraham
2019-03-11 14:48 ` Ard Biesheuvel
0 siblings, 1 reply; 11+ messages in thread
From: Thomas Abraham @ 2019-03-11 13:56 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org
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>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes
2019-03-11 13:56 ` Thomas Abraham
@ 2019-03-11 14:48 ` Ard Biesheuvel
0 siblings, 0 replies; 11+ messages in thread
From: Ard Biesheuvel @ 2019-03-11 14:48 UTC (permalink / raw)
To: Thomas Abraham; +Cc: edk2-devel@lists.01.org
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes
2019-03-08 15:30 [PATCH edk2-platforms 1/2] Platform/ARM/SgiPkg: align with upstream StandaloneMmPkg changes Ard Biesheuvel
` (2 preceding siblings ...)
2019-03-11 13:30 ` Thomas Abraham
@ 2019-03-25 17:12 ` Leif Lindholm
3 siblings, 0 replies; 11+ messages in thread
From: Leif Lindholm @ 2019-03-25 17:12 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: edk2-devel, achin.gupta, jagadeesh.ujja, sami.mujawar,
thomas.abraham, daniil.egranov
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
>
^ permalink raw reply [flat|nested] 11+ messages in thread