diff mbox series

[edk2] MdeModulePkg/MdeModulePkg.dsc: ignore standalone MM modules for EBC or XCODE5

Message ID 20190125081205.2967-1-ard.biesheuvel@linaro.org
State Accepted
Commit 945c1d55c9333437896613540fcd458c32997b1c
Headers show
Series [edk2] MdeModulePkg/MdeModulePkg.dsc: ignore standalone MM modules for EBC or XCODE5 | expand

Commit Message

Ard Biesheuvel Jan. 25, 2019, 8:12 a.m. UTC 
The newly added standalone MM versions of the FTW and variable runtime
drivers were included in MdeModulePkg.dsc to get test coverage when
building the package from its own .dsc, but the resulting modules are
non-functional since they incorporate some dummy libraries.

Dandan reports that these modules don't build cleanly when using the
EBC or XCODE5 compilers, so given the above, let's just ignore them
in this case.

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

---
 MdeModulePkg/MdeModulePkg.dsc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

-- 
2.17.1

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

Comments

Gao, Liming Jan. 25, 2019, 9:26 a.m. UTC | #1 
Reviewed-by: Liming Gao <liming.gao@intel.com>


>-----Original Message-----

>From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]

>Sent: Friday, January 25, 2019 4:12 PM

>To: edk2-devel@lists.01.org

>Cc: Gao, Liming <liming.gao@intel.com>; Bi, Dandan <dandan.bi@intel.com>;

>Wang, Jian J <jian.j.wang@intel.com>; Ard Biesheuvel

><ard.biesheuvel@linaro.org>

>Subject: [PATCH] MdeModulePkg/MdeModulePkg.dsc: ignore standalone

>MM modules for EBC or XCODE5

>

>The newly added standalone MM versions of the FTW and variable runtime

>drivers were included in MdeModulePkg.dsc to get test coverage when

>building the package from its own .dsc, but the resulting modules are

>non-functional since they incorporate some dummy libraries.

>

>Dandan reports that these modules don't build cleanly when using the

>EBC or XCODE5 compilers, so given the above, let's just ignore them

>in this case.

>

>Contributed-under: TianoCore Contribution Agreement 1.1

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

>---

> MdeModulePkg/MdeModulePkg.dsc | 8 +++++---

> 1 file changed, 5 insertions(+), 3 deletions(-)

>

>diff --git a/MdeModulePkg/MdeModulePkg.dsc

>b/MdeModulePkg/MdeModulePkg.dsc

>index 93eaf4b404a1..55eca4d74c04 100644

>--- a/MdeModulePkg/MdeModulePkg.dsc

>+++ b/MdeModulePkg/MdeModulePkg.dsc

>@@ -426,9 +426,6 @@ [Components]

>   MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf

>   MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf

>

>-

>MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandal

>oneMm.inf

>-

>MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf

>-

> [Components.IA32, Components.X64, Components.AARCH64]

>   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

>   MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf

>@@ -442,6 +439,11 @@ [Components.IA32, Components.X64,

>Components.ARM, Components.AARCH64]

>

>NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32G

>uidedSectionExtractLib.inf

>   }

>

>+!if $(TOOL_CHAIN_TAG) != "XCODE5"

>+

>MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandal

>oneMm.inf

>+

>MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf

>+!endif

>+

> [Components.IA32, Components.X64, Components.Ebc]

>

>MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeD

>xe.inf

>

>--

>2.17.1


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Bi, Dandan Jan. 28, 2019, 1:56 a.m. UTC | #2 
Reviewed-by: Bi Dandan <dandan.bi@intel.com>



Thanks,
Dandan

> -----Original Message-----

> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of

> Ard Biesheuvel

> Sent: Friday, January 25, 2019 4:12 PM

> To: edk2-devel@lists.01.org

> Cc: Bi, Dandan <dandan.bi@intel.com>; Gao, Liming <liming.gao@intel.com>

> Subject: [edk2] [PATCH] MdeModulePkg/MdeModulePkg.dsc: ignore

> standalone MM modules for EBC or XCODE5

> 

> The newly added standalone MM versions of the FTW and variable runtime

> drivers were included in MdeModulePkg.dsc to get test coverage when

> building the package from its own .dsc, but the resulting modules are non-

> functional since they incorporate some dummy libraries.

> 

> Dandan reports that these modules don't build cleanly when using the EBC or

> XCODE5 compilers, so given the above, let's just ignore them in this case.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

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

> ---

>  MdeModulePkg/MdeModulePkg.dsc | 8 +++++---

>  1 file changed, 5 insertions(+), 3 deletions(-)

> 

> diff --git a/MdeModulePkg/MdeModulePkg.dsc

> b/MdeModulePkg/MdeModulePkg.dsc index 93eaf4b404a1..55eca4d74c04

> 100644

> --- a/MdeModulePkg/MdeModulePkg.dsc

> +++ b/MdeModulePkg/MdeModulePkg.dsc

> @@ -426,9 +426,6 @@ [Components]

>    MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf

>    MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf

> 

> -

> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStanda

> loneMm.inf

> -

> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf

> -

>  [Components.IA32, Components.X64, Components.AARCH64]

>    MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

>    MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf

> @@ -442,6 +439,11 @@ [Components.IA32, Components.X64,

> Components.ARM, Components.AARCH64]

> 

> NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32G

> uidedSectionExtractLib.inf

>    }

> 

> +!if $(TOOL_CHAIN_TAG) != "XCODE5"

> +

> +MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStan

> dalo

> +neMm.inf

> +

> MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf

> +!endif

> +

>  [Components.IA32, Components.X64, Components.Ebc]

> 

> MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntime

> Dxe.inf

> 

> --

> 2.17.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 Jan. 28, 2019, 10:25 a.m. UTC | #3 
On Mon, 28 Jan 2019 at 02:56, Bi, Dandan <dandan.bi@intel.com> wrote:
>

> Reviewed-by: Bi Dandan <dandan.bi@intel.com>

>


Thanks all

Pushed as 12a0a80b4aee..945c1d55c933


> > -----Original Message-----

> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of

> > Ard Biesheuvel

> > Sent: Friday, January 25, 2019 4:12 PM

> > To: edk2-devel@lists.01.org

> > Cc: Bi, Dandan <dandan.bi@intel.com>; Gao, Liming <liming.gao@intel.com>

> > Subject: [edk2] [PATCH] MdeModulePkg/MdeModulePkg.dsc: ignore

> > standalone MM modules for EBC or XCODE5

> >

> > The newly added standalone MM versions of the FTW and variable runtime

> > drivers were included in MdeModulePkg.dsc to get test coverage when

> > building the package from its own .dsc, but the resulting modules are non-

> > functional since they incorporate some dummy libraries.

> >

> > Dandan reports that these modules don't build cleanly when using the EBC or

> > XCODE5 compilers, so given the above, let's just ignore them in this case.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

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

> > ---

> >  MdeModulePkg/MdeModulePkg.dsc | 8 +++++---

> >  1 file changed, 5 insertions(+), 3 deletions(-)

> >

> > diff --git a/MdeModulePkg/MdeModulePkg.dsc

> > b/MdeModulePkg/MdeModulePkg.dsc index 93eaf4b404a1..55eca4d74c04

> > 100644

> > --- a/MdeModulePkg/MdeModulePkg.dsc

> > +++ b/MdeModulePkg/MdeModulePkg.dsc

> > @@ -426,9 +426,6 @@ [Components]

> >    MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf

> >    MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf

> >

> > -

> > MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStanda

> > loneMm.inf

> > -

> > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf

> > -

> >  [Components.IA32, Components.X64, Components.AARCH64]

> >    MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

> >    MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf

> > @@ -442,6 +439,11 @@ [Components.IA32, Components.X64,

> > Components.ARM, Components.AARCH64]

> >

> > NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32G

> > uidedSectionExtractLib.inf

> >    }

> >

> > +!if $(TOOL_CHAIN_TAG) != "XCODE5"

> > +

> > +MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStan

> > dalo

> > +neMm.inf

> > +

> > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf

> > +!endif

> > +

> >  [Components.IA32, Components.X64, Components.Ebc]

> >

> > MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntime

> > Dxe.inf

> >

> > --

> > 2.17.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
diff mbox series

Patch

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 93eaf4b404a1..55eca4d74c04 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -426,9 +426,6 @@  [Components]
   MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
   MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
 
-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf
-
 [Components.IA32, Components.X64, Components.AARCH64]
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
   MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf
@@ -442,6 +439,11 @@  [Components.IA32, Components.X64, Components.ARM, Components.AARCH64]
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
   }
 
+!if $(TOOL_CHAIN_TAG) != "XCODE5"
+  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf
+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf
+!endif
+
 [Components.IA32, Components.X64, Components.Ebc]
   MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf