[Patch v2 0/2] ShellPkg: Fix IA32 build failure in acpiview

[Patch v2 0/2] ShellPkg: Fix IA32 build failure in acpiview

[Michael D Kinney]

Avoid 64-bit multiply operations to prevent intrinsics being added on IA32
builds.  Add acpiview to a version of the Shell that is build with ShellPkg.dsc
to catch this type of issue in ShellPkg builds.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>

Michael D Kinney (2):
  ShellPkg/AcpiView: Fix IA32 link error
  ShellPkg: Add shell with all commands integrated

 .../Parsers/Slit/SlitParser.c                 |  9 ++++++--
 ShellPkg/ShellPkg.dsc                         | 22 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

-- 
2.21.0.windows.1

[Patch v2 1/2] ShellPkg/AcpiView: Fix IA32 link error

[Michael D Kinney]

https://bugzilla.tianocore.org/show_bug.cgi?id=1970

Update local variable in ParseAcpiSlot() to be UINT32
instead of UINT64 to avoid 64-bit multiply operation
in the SLIT_ELEMENT() macro.

If LocalityCount is >= MAX_UINT32 and then skip the
validation check and print an INFO message instead.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../Parsers/Slit/SlitParser.c                            | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
index 1f9dac66ee..6913ad8b31 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
@@ -57,8 +57,8 @@ ParseAcpiSlit (
   )
 {
   UINT32 Offset;
-  UINT64 Count;
-  UINT64 Index;
+  UINT32 Count;
+  UINT32 Index;
   UINT64 LocalityCount;
   UINT8* LocalityPtr;
   CHAR16 Buffer[80];  // Used for AsciiName param of ParseAcpi
@@ -105,6 +105,11 @@ ParseAcpiSlit (
     }
   }
 
+  if  (LocalityCount >= MAX_UINT32) {
+    Print (L"INFO: Skipping validation of System Localities as locality count is >= MAX_UINT32\n");
+    return;
+  }
+
   // Validate
   for (Count = 0; Count < LocalityCount; Count++) {
     for (Index = 0; Index < LocalityCount; Index++) {
-- 
2.21.0.windows.1

[Patch v2 2/2] ShellPkg: Add shell with all commands integrated

[Michael D Kinney]

https://bugzilla.tianocore.org/show_bug.cgi?id=1970

Update ShellPkg DSC file to build an extra version of
the Shell with all commands integrated.  This verifies
that the shell can build in this max configuration.

Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 ShellPkg/ShellPkg.dsc | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 6a139b3b91..b2065dc028 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -1,7 +1,7 @@
 ##  @file
 # Shell Package
 #
-# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2018, Arm Limited. All rights reserved.<BR>
 #
 #    SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -115,6 +115,26 @@ [Components]
 !endif #$(NO_SHELL_PROFILES)
   }
 
+  #
+  # Build a second version of the shell with all commands integrated
+  #
+  ShellPkg/Application/Shell/Shell.inf {
+   <Defines>
+      FILE_GUID = EA4BB293-2D7F-4456-A681-1F22F42CD0BC
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+    <LibraryClasses>
+      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
+      NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
+  }
+
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-- 
2.21.0.windows.1

Re: [Patch v2 0/2] ShellPkg: Fix IA32 build failure in acpiview

[Carsey, Jaben]

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

Thanks
-Jaben


> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, August 01, 2019 1:56 PM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Gao, Zhichao <zhichao.gao@intel.com>; Sami Mujawar
> <sami.mujawar@arm.com>
> Subject: [Patch v2 0/2] ShellPkg: Fix IA32 build failure in acpiview
> 
> Avoid 64-bit multiply operations to prevent intrinsics being added on IA32
> builds.  Add acpiview to a version of the Shell that is build with ShellPkg.dsc
> to catch this type of issue in ShellPkg builds.
> 
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> 
> Michael D Kinney (2):
>   ShellPkg/AcpiView: Fix IA32 link error
>   ShellPkg: Add shell with all commands integrated
> 
>  .../Parsers/Slit/SlitParser.c                 |  9 ++++++--
>  ShellPkg/ShellPkg.dsc                         | 22 ++++++++++++++++++-
>  2 files changed, 28 insertions(+), 3 deletions(-)
> 
> --
> 2.21.0.windows.1

Re: [edk2-devel] [Patch v2 1/2] ShellPkg/AcpiView: Fix IA32 link error

[Gao, Zhichao]

Hi Mike,

Sorry for late update. I missed the v1 version.
I found there is a API named MultU64x64 may fix this issue. Can we use it in SLIT_ELEMENT() macro? 

Thanks,
Zhichao

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Michael D Kinney
> Sent: Friday, August 2, 2019 4:56 AM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Gao, Zhichao <zhichao.gao@intel.com>; Sami Mujawar
> <sami.mujawar@arm.com>
> Subject: [edk2-devel] [Patch v2 1/2] ShellPkg/AcpiView: Fix IA32 link error
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=1970
> 
> Update local variable in ParseAcpiSlot() to be UINT32 instead of UINT64 to
> avoid 64-bit multiply operation in the SLIT_ELEMENT() macro.
> 
> If LocalityCount is >= MAX_UINT32 and then skip the validation check and
> print an INFO message instead.
> 
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .../Parsers/Slit/SlitParser.c                            | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
> index 1f9dac66ee..6913ad8b31 100644
> ---
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
> +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitPars
> +++ er.c
> @@ -57,8 +57,8 @@ ParseAcpiSlit (
>    )
>  {
>    UINT32 Offset;
> -  UINT64 Count;
> -  UINT64 Index;
> +  UINT32 Count;
> +  UINT32 Index;
>    UINT64 LocalityCount;
>    UINT8* LocalityPtr;
>    CHAR16 Buffer[80];  // Used for AsciiName param of ParseAcpi @@ -105,6
> +105,11 @@ ParseAcpiSlit (
>      }
>    }
> 
> +  if  (LocalityCount >= MAX_UINT32) {
> +    Print (L"INFO: Skipping validation of System Localities as locality count
> is >= MAX_UINT32\n");
> +    return;
> +  }
> +
>    // Validate
>    for (Count = 0; Count < LocalityCount; Count++) {
>      for (Index = 0; Index < LocalityCount; Index++) {
> --
> 2.21.0.windows.1
> 
> 
> 

Re: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands integrated

[Gao, Zhichao]

I used to use the shellpkg.dsc to build a shell.efi binary release.
Full configuration of shell is fine. But the acpiview is under developing and the shell spec doesn't contain 'acpiview' yet.
Is it OK to add an additional cmd that the spec isn't mentioned?

Thanks,
Zhichao

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Michael D Kinney
> Sent: Friday, August 2, 2019 4:56 AM
> To: devel@edk2.groups.io
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Gao, Zhichao <zhichao.gao@intel.com>; Sami Mujawar
> <sami.mujawar@arm.com>
> Subject: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands
> integrated
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=1970
> 
> Update ShellPkg DSC file to build an extra version of the Shell with all
> commands integrated.  This verifies that the shell can build in this max
> configuration.
> 
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  ShellPkg/ShellPkg.dsc | 22 +++++++++++++++++++++-
>  1 file changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index
> 6a139b3b91..b2065dc028 100644
> --- a/ShellPkg/ShellPkg.dsc
> +++ b/ShellPkg/ShellPkg.dsc
> @@ -1,7 +1,7 @@
>  ##  @file
>  # Shell Package
>  #
> -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2007 - 2019, Intel Corporation. All rights
> +reserved.<BR>
>  # Copyright (c) 2018, Arm Limited. All rights reserved.<BR>  #
>  #    SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -115,6 +115,26 @@ [Components]
>  !endif #$(NO_SHELL_PROFILES)
>    }
> 
> +  #
> +  # Build a second version of the shell with all commands integrated  #
> + ShellPkg/Application/Shell/Shell.inf {
> +   <Defines>
> +      FILE_GUID = EA4BB293-2D7F-4456-A681-1F22F42CD0BC
> +    <PcdsFixedAtBuild>
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +    <LibraryClasses>
> +
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comma
> ndsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Comma
> ndsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comma
> ndsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Com
> mandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com
> mandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
> mandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
> CommandsLib.inf
> +
> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2
> CommandsLib.inf
> +
> +
> NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCo
> m
> + mandLib.inf
> +  }
> +
> 
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> inf {
>      <PcdsFixedAtBuild>
>        gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> --
> 2.21.0.windows.1
> 
> 
> 

Re: [edk2-devel] [Patch v2 1/2] ShellPkg/AcpiView: Fix IA32 link error

[Michael D Kinney]

Zhichao,

Yes.  I think that idea could work as well.  I will try it out.

Mike

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Thursday, August 1, 2019 10:28 PM
> To: devel@edk2.groups.io; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> <ray.ni@intel.com>; Sami Mujawar <sami.mujawar@arm.com>
> Subject: RE: [edk2-devel] [Patch v2 1/2]
> ShellPkg/AcpiView: Fix IA32 link error
> 
> Hi Mike,
> 
> Sorry for late update. I missed the v1 version.
> I found there is a API named MultU64x64 may fix this
> issue. Can we use it in SLIT_ELEMENT() macro?
> 
> Thanks,
> Zhichao
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of
> > Michael D Kinney
> > Sent: Friday, August 2, 2019 4:56 AM
> > To: devel@edk2.groups.io
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> > <ray.ni@intel.com>; Gao, Zhichao
> <zhichao.gao@intel.com>; Sami Mujawar
> > <sami.mujawar@arm.com>
> > Subject: [edk2-devel] [Patch v2 1/2]
> ShellPkg/AcpiView: Fix IA32 link
> > error
> >
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1970
> >
> > Update local variable in ParseAcpiSlot() to be UINT32
> instead of
> > UINT64 to avoid 64-bit multiply operation in the
> SLIT_ELEMENT() macro.
> >
> > If LocalityCount is >= MAX_UINT32 and then skip the
> validation check
> > and print an INFO message instead.
> >
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Zhichao Gao <zhichao.gao@intel.com>
> > Cc: Sami Mujawar <sami.mujawar@arm.com>
> > Signed-off-by: Michael D Kinney
> <michael.d.kinney@intel.com>
> > ---
> >  .../Parsers/Slit/SlitParser.c
> | 9 +++++++--
> >  1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git
> >
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/
> Slit/SlitParser
> > .c
> >
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/
> Slit/SlitParser
> > .c
> > index 1f9dac66ee..6913ad8b31 100644
> > ---
> >
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/
> Slit/SlitParser
> > .c
> > +++
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/
> Slit/SlitPa
> > +++ rs
> > +++ er.c
> > @@ -57,8 +57,8 @@ ParseAcpiSlit (
> >    )
> >  {
> >    UINT32 Offset;
> > -  UINT64 Count;
> > -  UINT64 Index;
> > +  UINT32 Count;
> > +  UINT32 Index;
> >    UINT64 LocalityCount;
> >    UINT8* LocalityPtr;
> >    CHAR16 Buffer[80];  // Used for AsciiName param of
> ParseAcpi @@
> > -105,6
> > +105,11 @@ ParseAcpiSlit (
> >      }
> >    }
> >
> > +  if  (LocalityCount >= MAX_UINT32) {
> > +    Print (L"INFO: Skipping validation of System
> Localities as
> > + locality count
> > is >= MAX_UINT32\n");
> > +    return;
> > +  }
> > +
> >    // Validate
> >    for (Count = 0; Count < LocalityCount; Count++) {
> >      for (Index = 0; Index < LocalityCount; Index++)
> {
> > --
> > 2.21.0.windows.1
> >
> >
> > 

Re: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands integrated

[Carsey, Jaben]

I thought with this change the DSC would build 2 images. The second image would have the acpiview command and you could ignore that image for your purpose.

-Jaben

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Thursday, August 1, 2019 10:36 PM
> To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Sami Mujawar <sami.mujawar@arm.com>
> Subject: RE: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all
> commands integrated
> 
> I used to use the shellpkg.dsc to build a shell.efi binary release.
> Full configuration of shell is fine. But the acpiview is under developing and
> the shell spec doesn't contain 'acpiview' yet.
> Is it OK to add an additional cmd that the spec isn't mentioned?
> 
> Thanks,
> Zhichao
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > Michael D Kinney
> > Sent: Friday, August 2, 2019 4:56 AM
> > To: devel@edk2.groups.io
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> > <ray.ni@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>; Sami
> Mujawar
> > <sami.mujawar@arm.com>
> > Subject: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all
> > commands integrated
> >
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1970
> >
> > Update ShellPkg DSC file to build an extra version of the Shell with
> > all commands integrated.  This verifies that the shell can build in
> > this max configuration.
> >
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Zhichao Gao <zhichao.gao@intel.com>
> > Cc: Sami Mujawar <sami.mujawar@arm.com>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >  ShellPkg/ShellPkg.dsc | 22 +++++++++++++++++++++-
> >  1 file changed, 21 insertions(+), 1 deletion(-)
> >
> > diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index
> > 6a139b3b91..b2065dc028 100644
> > --- a/ShellPkg/ShellPkg.dsc
> > +++ b/ShellPkg/ShellPkg.dsc
> > @@ -1,7 +1,7 @@
> >  ##  @file
> >  # Shell Package
> >  #
> > -# Copyright (c) 2007 - 2018, Intel Corporation. All rights
> > reserved.<BR>
> > +# Copyright (c) 2007 - 2019, Intel Corporation. All rights
> > +reserved.<BR>
> >  # Copyright (c) 2018, Arm Limited. All rights reserved.<BR>  #
> >  #    SPDX-License-Identifier: BSD-2-Clause-Patent
> > @@ -115,6 +115,26 @@ [Components]
> >  !endif #$(NO_SHELL_PROFILES)
> >    }
> >
> > +  #
> > +  # Build a second version of the shell with all commands integrated
> > + # ShellPkg/Application/Shell/Shell.inf {
> > +   <Defines>
> > +      FILE_GUID = EA4BB293-2D7F-4456-A681-1F22F42CD0BC
> > +    <PcdsFixedAtBuild>
> > +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > +    <LibraryClasses>
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comma
> > ndsLib.inf
> > +
> > NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Com
> > mandsLib.inf
> > +
> > NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Co
> > NULL|m
> > mandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
> > mandsLib.inf
> > +
> > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
> > CommandsLib.inf
> > +
> > NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2
> > CommandsLib.inf
> > +
> > +
> >
> NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCo
> > m
> > + mandLib.inf
> > +  }
> > +
> >
> >
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> > inf {
> >      <PcdsFixedAtBuild>
> >        gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > --
> > 2.21.0.windows.1
> >
> >
> > 

Re: [edk2-devel] [Patch v2 2/2] ShellPkg: Add shell with all commands integrated

[Michael D Kinney]

Zhichao,

I did not modify the build of the standard Shell.  It
does not include the acpiview.

The patch builds a 2nd version of the shell with a different
FILE_GUID for build testing purposes.  I think it is very
important for the ShellPkg to have build tests for all the
content in the ShellPkg to prevent the build failure I 
saw when I simply wanted to use the acpiview command on
an IA32 system.

Thanks,

Mike

> -----Original Message-----
> From: Gao, Zhichao
> Sent: Thursday, August 1, 2019 10:36 PM
> To: devel@edk2.groups.io; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> <ray.ni@intel.com>; Sami Mujawar <sami.mujawar@arm.com>
> Subject: RE: [edk2-devel] [Patch v2 2/2] ShellPkg: Add
> shell with all commands integrated
> 
> I used to use the shellpkg.dsc to build a shell.efi
> binary release.
> Full configuration of shell is fine. But the acpiview
> is under developing and the shell spec doesn't contain
> 'acpiview' yet.
> Is it OK to add an additional cmd that the spec isn't
> mentioned?
> 
> Thanks,
> Zhichao
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of
> > Michael D Kinney
> > Sent: Friday, August 2, 2019 4:56 AM
> > To: devel@edk2.groups.io
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ray
> > <ray.ni@intel.com>; Gao, Zhichao
> <zhichao.gao@intel.com>; Sami Mujawar
> > <sami.mujawar@arm.com>
> > Subject: [edk2-devel] [Patch v2 2/2] ShellPkg: Add
> shell with all
> > commands integrated
> >
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1970
> >
> > Update ShellPkg DSC file to build an extra version of
> the Shell with
> > all commands integrated.  This verifies that the
> shell can build in
> > this max configuration.
> >
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Zhichao Gao <zhichao.gao@intel.com>
> > Cc: Sami Mujawar <sami.mujawar@arm.com>
> > Signed-off-by: Michael D Kinney
> <michael.d.kinney@intel.com>
> > ---
> >  ShellPkg/ShellPkg.dsc | 22 +++++++++++++++++++++-
> >  1 file changed, 21 insertions(+), 1 deletion(-)
> >
> > diff --git a/ShellPkg/ShellPkg.dsc
> b/ShellPkg/ShellPkg.dsc index
> > 6a139b3b91..b2065dc028 100644
> > --- a/ShellPkg/ShellPkg.dsc
> > +++ b/ShellPkg/ShellPkg.dsc
> > @@ -1,7 +1,7 @@
> >  ##  @file
> >  # Shell Package
> >  #
> > -# Copyright (c) 2007 - 2018, Intel Corporation. All
> rights
> > reserved.<BR>
> > +# Copyright (c) 2007 - 2019, Intel Corporation. All
> rights
> > +reserved.<BR>
> >  # Copyright (c) 2018, Arm Limited. All rights
> reserved.<BR>  #
> >  #    SPDX-License-Identifier: BSD-2-Clause-Patent
> > @@ -115,6 +115,26 @@ [Components]
> >  !endif #$(NO_SHELL_PROFILES)
> >    }
> >
> > +  #
> > +  # Build a second version of the shell with all
> commands integrated
> > + # ShellPkg/Application/Shell/Shell.inf {
> > +   <Defines>
> > +      FILE_GUID = EA4BB293-2D7F-4456-A681-
> 1F22F42CD0BC
> > +    <PcdsFixedAtBuild>
> > +
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FA
> LSE
> > +    <LibraryClasses>
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiSh
> ellLevel2Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiSh
> ellLevel1Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiSh
> ellLevel3Comma
> > ndsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiS
> hellDriver1Com
> > mandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/Uefi
> ShellInstall1Co
> > NULL|m
> > mandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiSh
> ellDebug1Com
> > mandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/Uefi
> ShellNetwork1
> > CommandsLib.inf
> > +
> >
> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/Uefi
> ShellNetwork2
> > CommandsLib.inf
> > +
> > +
> >
> NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiS
> hellAcpiViewCo
> > m
> > + mandLib.inf
> > +  }
> > +
> >
> >
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicC
> ommand.
> > inf {
> >      <PcdsFixedAtBuild>
> >
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FA
> LSE
> > --
> > 2.21.0.windows.1
> >
> >
> >