151 files changed, 226 insertions, 0 deletions

diff --git a/EdkShellBinPkg/EdkShellBinPkg.spd b/EdkShellBinPkg/EdkShellBinPkg.spd
index 7d0131ddc2..2729c4876d 100644
--- a/EdkShellBinPkg/EdkShellBinPkg.spd
+++ b/EdkShellBinPkg/EdkShellBinPkg.spd
@@ -31,5 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </PackageDefinitions>

   <MsaFiles>

     <Filename>bin/Shell.msa</Filename>

+    <Filename>FullShell/FullShell.msa</Filename>

+    <Filename>MinimumShell/MinimumShell.msa</Filename>

   </MsaFiles>

 </PackageSurfaceArea>
\ No newline at end of file
diff --git a/EdkShellBinPkg/FullShell/FullShell.msa b/EdkShellBinPkg/FullShell/FullShell.msa
new file mode 100644
index 0000000000..dcd8e083ee
--- /dev/null
+++ b/EdkShellBinPkg/FullShell/FullShell.msa
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+  <MsaHeader>

+    <ModuleName>FullShell</ModuleName>

+    <ModuleType>UEFI_APPLICATION</ModuleType>

+    <GuidValue>c57ad6b7-0515-40a8-9d21-551652854e37</GuidValue>

+    <Version>1.1</Version>

+    <Abstract>Component description file for EFI Shell module.</Abstract>

+    <Description>

+      This is a binary module containing multiple binary shell applications.

+      All .efi file tagged with "ToolCode="DUMMY"" in following file list are raw EFI application

+      file, and they are can be run in shell environment.

+    </Description>

+    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>

+    <License>All rights reserved. This program and the accompanying materials

+      are licensed and made available under the terms and conditions of the BSD License

+      which accompanies this distribution.  The full text of the license may be found at

+      http://opensource.org/licenses/bsd-license.php

+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

+  </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>

+    <BinaryModule>true</BinaryModule>

+    <OutputFileBasename>FullShell</OutputFileBasename>

+  </ModuleDefinitions>

+  <SourceFiles>

+    <Filename SupArchList="IA32">ia32/Shell_Full.efi</Filename>

+    <Filename SupArchList="IPF">ipf/Shell_Full.efi</Filename>

+    <Filename SupArchList="X64">x64/Shell_Full.efi</Filename>

+  </SourceFiles>

+  <PackageDependencies>

+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+  </PackageDependencies>

+  <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

+  </Externs>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkShellBinPkg/FullShell/ia32/Shell_Full.efi b/EdkShellBinPkg/FullShell/ia32/Shell_Full.efi
new file mode 100644
index 0000000000..b90893717e
--- /dev/null
+++ b/EdkShellBinPkg/FullShell/ia32/Shell_Full.efi
diff --git a/EdkShellBinPkg/FullShell/ipf/Shell_Full.efi b/EdkShellBinPkg/FullShell/ipf/Shell_Full.efi
new file mode 100644
index 0000000000..b4b6cc6dff
--- /dev/null
+++ b/EdkShellBinPkg/FullShell/ipf/Shell_Full.efi
diff --git a/EdkShellBinPkg/FullShell/x64/Shell_full.efi b/EdkShellBinPkg/FullShell/x64/Shell_full.efi
new file mode 100644
index 0000000000..c6b0a61068
--- /dev/null
+++ b/EdkShellBinPkg/FullShell/x64/Shell_full.efi
diff --git a/EdkShellBinPkg/MinimumShell/MinimumShell.msa b/EdkShellBinPkg/MinimumShell/MinimumShell.msa
new file mode 100644
index 0000000000..03ba68cd88
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/MinimumShell.msa
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+  <MsaHeader>

+    <ModuleName>MinimumShell</ModuleName>

+    <ModuleType>UEFI_APPLICATION</ModuleType>

+    <GuidValue>c57ad6b7-0515-40a8-9d21-551652854e37</GuidValue>

+    <Version>1.2</Version>

+    <Abstract>Component description file for EFI Shell module.</Abstract>

+    <Description>

+      This is a binary module containing multiple binary shell applications.

+      All .efi file tagged with "ToolCode="DUMMY"" in following file list are raw EFI application

+      file, and they are can be run in shell environment.

+    </Description>

+    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>

+    <License>All rights reserved. This program and the accompanying materials

+      are licensed and made available under the terms and conditions of the BSD License

+      which accompanies this distribution.  The full text of the license may be found at

+      http://opensource.org/licenses/bsd-license.php

+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

+  </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>

+    <BinaryModule>true</BinaryModule>

+    <OutputFileBasename>MinimumShell</OutputFileBasename>

+  </ModuleDefinitions>

+  <SourceFiles>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Attrib.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Cls.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Cp.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Date.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Dblk.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Devices.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Devtree.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Drivers.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Drvcfg.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Drvdiag.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Guid.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/IpConfig.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Load.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/LoadPciRom.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Ls.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Mkdir.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Mount.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Mv.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/NShell.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Openinfo.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Resets.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Rm.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/SmbiosView.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/TelnetMgmt.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Time.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Touch.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Type.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Unload.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Ver.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/Vol.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/comp.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/dmem.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/dmpstore.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/edit.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/eficompress.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/efidecompress.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/err.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/hexedit.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/legacyboot.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/loadfv.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/mem.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/memmap.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/mm.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/mode.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/pci.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/sermode.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/stall.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IA32">ia32/Apps/timezone.efi</Filename>

+    <Filename SupArchList="IA32">ia32/Shell.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Attrib.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Cls.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Cp.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Date.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Dblk.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Devices.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Devtree.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Drivers.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Drvcfg.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Drvdiag.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Guid.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/IpConfig.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Load.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/LoadPciRom.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Ls.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Mkdir.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Mount.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Mv.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/NShell.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Openinfo.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Resets.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Rm.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/SmbiosView.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/TelnetMgmt.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Time.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Touch.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Type.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Unload.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Ver.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/Vol.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/comp.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/dmem.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/dmpstore.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/edit.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/eficompress.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/efidecompress.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/err.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/hexedit.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/legacyboot.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/loadfv.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/mem.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/memmap.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/mm.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/mode.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/pci.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/sermode.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/stall.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/timezone.efi</Filename>

+    <Filename SupArchList="IPF">ipf/Shell.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Attrib.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Cls.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Cp.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Date.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Dblk.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Devices.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Devtree.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Drivers.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Drvcfg.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Drvdiag.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Guid.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/IpConfig.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Load.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/LoadPciRom.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Ls.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Mkdir.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Mount.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Mv.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/NShell.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Openinfo.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Resets.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Rm.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/SmbiosView.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/TelnetMgmt.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Time.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Touch.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Type.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Unload.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Ver.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Vol.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/comp.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/dmem.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/dmpstore.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/edit.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/eficompress.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/efidecompress.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/err.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/hexedit.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/legacyboot.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/loadfv.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mem.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/memmap.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mm.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mode.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/pci.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/sermode.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/stall.efi</Filename>

+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/timezone.efi</Filename>

+    <Filename SupArchList="X64">x64/Shell.efi</Filename>

+  </SourceFiles>

+  <PackageDependencies>

+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+  </PackageDependencies>

+  <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

+  </Externs>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Attrib.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Attrib.efi
new file mode 100644
index 0000000000..c3a45f2874
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Cls.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Cls.efi
new file mode 100644
index 0000000000..489a67866b
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Cls.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Cp.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Cp.efi
new file mode 100644
index 0000000000..af8be91b1f
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Cp.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Date.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Date.efi
new file mode 100644
index 0000000000..ea0a8028e6
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Date.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Dblk.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Dblk.efi
new file mode 100644
index 0000000000..055dedf231
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Devices.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Devices.efi
new file mode 100644
index 0000000000..40af8f25c1
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Devices.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Devtree.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Devtree.efi
new file mode 100644
index 0000000000..7ec5ad34fa
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Drivers.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Drivers.efi
new file mode 100644
index 0000000000..5523691ffd
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Drvcfg.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Drvcfg.efi
new file mode 100644
index 0000000000..c3fba1f320
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Drvdiag.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Drvdiag.efi
new file mode 100644
index 0000000000..7ec7aeb9b6
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Guid.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Guid.efi
new file mode 100644
index 0000000000..00ec9a077e
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Guid.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/IpConfig.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/IpConfig.efi
new file mode 100644
index 0000000000..d121b0a028
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Load.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Load.efi
new file mode 100644
index 0000000000..0c1459fa96
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Load.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/LoadPciRom.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/LoadPciRom.efi
new file mode 100644
index 0000000000..0a14c710b8
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Ls.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Ls.efi
new file mode 100644
index 0000000000..606099bac1
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Ls.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Mkdir.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Mkdir.efi
new file mode 100644
index 0000000000..79ddd6dd48
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Mount.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Mount.efi
new file mode 100644
index 0000000000..43e4c22220
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Mount.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Mv.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Mv.efi
new file mode 100644
index 0000000000..fa4b309801
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Mv.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/NShell.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/NShell.efi
new file mode 100644
index 0000000000..9d1b2d12a8
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/NShell.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Openinfo.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Openinfo.efi
new file mode 100644
index 0000000000..b73b3e6c70
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Resets.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Resets.efi
new file mode 100644
index 0000000000..ec6a92a449
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Resets.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Rm.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Rm.efi
new file mode 100644
index 0000000000..17fe4be8e8
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Rm.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/SmbiosView.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/SmbiosView.efi
new file mode 100644
index 0000000000..b571eeee4e
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/TelnetMgmt.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/TelnetMgmt.efi
new file mode 100644
index 0000000000..9183f3b931
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Time.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Time.efi
new file mode 100644
index 0000000000..2266815a09
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Time.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Touch.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Touch.efi
new file mode 100644
index 0000000000..af485b323c
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Touch.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Type.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Type.efi
new file mode 100644
index 0000000000..1c73377258
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Type.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Unload.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Unload.efi
new file mode 100644
index 0000000000..68173480d6
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Unload.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Ver.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Ver.efi
new file mode 100644
index 0000000000..c4f6bef838
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Ver.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/Vol.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/Vol.efi
new file mode 100644
index 0000000000..ed1272c013
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/Vol.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/comp.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/comp.efi
new file mode 100644
index 0000000000..a07d009422
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/comp.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/dmem.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/dmem.efi
new file mode 100644
index 0000000000..21fd2bd98a
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/dmem.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/dmpstore.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/dmpstore.efi
new file mode 100644
index 0000000000..ff5d478efb
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/edit.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/edit.efi
new file mode 100644
index 0000000000..d3bc52aaad
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/edit.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/eficompress.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/eficompress.efi
new file mode 100644
index 0000000000..17dc9b38b6
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/efidecompress.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/efidecompress.efi
new file mode 100644
index 0000000000..8b5102190d
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/err.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/err.efi
new file mode 100644
index 0000000000..ffc65b6d96
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/err.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/hexedit.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/hexedit.efi
new file mode 100644
index 0000000000..ca7d54df6a
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/legacyboot.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/legacyboot.efi
new file mode 100644
index 0000000000..98e49c3389
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/legacyboot.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/loadfv.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/loadfv.efi
new file mode 100644
index 0000000000..9c24b10347
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/loadfv.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/mem.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/mem.efi
new file mode 100644
index 0000000000..551ea79046
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/mem.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/memmap.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/memmap.efi
new file mode 100644
index 0000000000..e7ac7d5c16
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/memmap.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/mm.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/mm.efi
new file mode 100644
index 0000000000..564ed828ff
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/mm.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/mode.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/mode.efi
new file mode 100644
index 0000000000..004e0f47a1
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/mode.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/pci.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/pci.efi
new file mode 100644
index 0000000000..e10e432e94
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/pci.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/sermode.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/sermode.efi
new file mode 100644
index 0000000000..a2f66b46c7
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/sermode.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/stall.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/stall.efi
new file mode 100644
index 0000000000..5884e51d0f
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/stall.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Apps/timezone.efi b/EdkShellBinPkg/MinimumShell/ia32/Apps/timezone.efi
new file mode 100644
index 0000000000..625b4fc7f2
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Apps/timezone.efi
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Shell.efi b/EdkShellBinPkg/MinimumShell/ia32/Shell.efi
new file mode 100644
index 0000000000..a1aa70945f
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ia32/Shell.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Attrib.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Attrib.efi
new file mode 100644
index 0000000000..589c2d84df
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Cls.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Cls.efi
new file mode 100644
index 0000000000..84f34015e0
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Cls.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Cp.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Cp.efi
new file mode 100644
index 0000000000..3137ac65fa
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Cp.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Date.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Date.efi
new file mode 100644
index 0000000000..77631c6caa
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Date.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Dblk.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Dblk.efi
new file mode 100644
index 0000000000..553fce54fe
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Devices.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Devices.efi
new file mode 100644
index 0000000000..840ab76584
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Devices.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Devtree.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Devtree.efi
new file mode 100644
index 0000000000..09e9d2bf63
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Drivers.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Drivers.efi
new file mode 100644
index 0000000000..7b41202ef6
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Drvcfg.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Drvcfg.efi
new file mode 100644
index 0000000000..b50987f9e2
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Drvdiag.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Drvdiag.efi
new file mode 100644
index 0000000000..8ab4ee01c9
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Guid.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Guid.efi
new file mode 100644
index 0000000000..cd720233da
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Guid.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/IpConfig.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/IpConfig.efi
new file mode 100644
index 0000000000..b42161066f
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Load.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Load.efi
new file mode 100644
index 0000000000..ee5b2f9031
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Load.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/LoadPciRom.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/LoadPciRom.efi
new file mode 100644
index 0000000000..892787fd13
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Ls.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Ls.efi
new file mode 100644
index 0000000000..2c051942aa
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Ls.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Mkdir.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Mkdir.efi
new file mode 100644
index 0000000000..f738570ca5
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Mount.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Mount.efi
new file mode 100644
index 0000000000..a26a5cd200
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Mount.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Mv.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Mv.efi
new file mode 100644
index 0000000000..8410dca2a3
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Mv.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/NShell.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/NShell.efi
new file mode 100644
index 0000000000..a14252cc3e
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/NShell.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Openinfo.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Openinfo.efi
new file mode 100644
index 0000000000..3b4484737f
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Resets.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Resets.efi
new file mode 100644
index 0000000000..b2cd1542f3
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Resets.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Rm.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Rm.efi
new file mode 100644
index 0000000000..bba6bbcd26
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Rm.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/SmbiosView.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/SmbiosView.efi
new file mode 100644
index 0000000000..95c7d9fb5d
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/TelnetMgmt.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/TelnetMgmt.efi
new file mode 100644
index 0000000000..4c0158c3d1
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Time.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Time.efi
new file mode 100644
index 0000000000..1944c91103
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Time.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Touch.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Touch.efi
new file mode 100644
index 0000000000..ed652a583b
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Touch.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Type.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Type.efi
new file mode 100644
index 0000000000..c7ad4ab8bc
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Type.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Unload.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Unload.efi
new file mode 100644
index 0000000000..03f637a4e7
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Unload.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Ver.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Ver.efi
new file mode 100644
index 0000000000..846421f28b
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Ver.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/Vol.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/Vol.efi
new file mode 100644
index 0000000000..dfc321953a
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/Vol.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/comp.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/comp.efi
new file mode 100644
index 0000000000..49ef20e1d5
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/comp.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/dmem.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/dmem.efi
new file mode 100644
index 0000000000..1ec5813868
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/dmem.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/dmpstore.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/dmpstore.efi
new file mode 100644
index 0000000000..79ed4c4d9a
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/edit.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/edit.efi
new file mode 100644
index 0000000000..dd21c6699d
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/edit.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/eficompress.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/eficompress.efi
new file mode 100644
index 0000000000..89328be0be
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/efidecompress.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/efidecompress.efi
new file mode 100644
index 0000000000..565ccccc9f
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/err.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/err.efi
new file mode 100644
index 0000000000..1b59ba67b2
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/err.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/hexedit.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/hexedit.efi
new file mode 100644
index 0000000000..d8001e3ff9
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/mem.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/mem.efi
new file mode 100644
index 0000000000..5a3cc910d3
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/mem.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/memmap.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/memmap.efi
new file mode 100644
index 0000000000..61fbe7e7e2
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/memmap.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/mm.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/mm.efi
new file mode 100644
index 0000000000..f0e06b6091
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/mm.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/mode.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/mode.efi
new file mode 100644
index 0000000000..3ba30ca2f4
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/mode.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/pci.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/pci.efi
new file mode 100644
index 0000000000..9fe76ef0b6
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/pci.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/sermode.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/sermode.efi
new file mode 100644
index 0000000000..8e33a0d1dd
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/sermode.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/stall.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/stall.efi
new file mode 100644
index 0000000000..8a4202e31e
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/stall.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Apps/timezone.efi b/EdkShellBinPkg/MinimumShell/ipf/Apps/timezone.efi
new file mode 100644
index 0000000000..d1cc96e80b
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Apps/timezone.efi
diff --git a/EdkShellBinPkg/MinimumShell/ipf/Shell.efi b/EdkShellBinPkg/MinimumShell/ipf/Shell.efi
new file mode 100644
index 0000000000..eb5c58423c
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/ipf/Shell.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Attrib.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Attrib.efi
new file mode 100644
index 0000000000..0b18fb904c
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Cls.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Cls.efi
new file mode 100644
index 0000000000..272966ea15
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Cls.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Cp.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Cp.efi
new file mode 100644
index 0000000000..e088201561
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Cp.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Date.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Date.efi
new file mode 100644
index 0000000000..d83d5cb480
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Date.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Dblk.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Dblk.efi
new file mode 100644
index 0000000000..34888e4bf7
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Devices.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Devices.efi
new file mode 100644
index 0000000000..12f09cfc72
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Devices.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Devtree.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Devtree.efi
new file mode 100644
index 0000000000..28f27b007b
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Drivers.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Drivers.efi
new file mode 100644
index 0000000000..3a0a36859e
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Drvcfg.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Drvcfg.efi
new file mode 100644
index 0000000000..d4fa453ec1
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Drvdiag.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Drvdiag.efi
new file mode 100644
index 0000000000..2a4ce4b3e9
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Guid.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Guid.efi
new file mode 100644
index 0000000000..74686803ae
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Guid.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/IpConfig.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/IpConfig.efi
new file mode 100644
index 0000000000..45e8306f12
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/LegacyBoot.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/LegacyBoot.efi
new file mode 100644
index 0000000000..51080862eb
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/LegacyBoot.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Load.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Load.efi
new file mode 100644
index 0000000000..754b3c4530
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Load.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/LoadFv.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/LoadFv.efi
new file mode 100644
index 0000000000..41c6c84d3c
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/LoadFv.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/LoadPciRom.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/LoadPciRom.efi
new file mode 100644
index 0000000000..b9ff503ce8
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Ls.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Ls.efi
new file mode 100644
index 0000000000..0d636b204a
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Ls.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Mkdir.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Mkdir.efi
new file mode 100644
index 0000000000..e064c44ffc
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Mount.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Mount.efi
new file mode 100644
index 0000000000..ff2bd234a7
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Mount.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Mv.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Mv.efi
new file mode 100644
index 0000000000..5fb1a4529a
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Mv.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/NShell.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/NShell.efi
new file mode 100644
index 0000000000..0cbab52076
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/NShell.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Openinfo.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Openinfo.efi
new file mode 100644
index 0000000000..eb128c76f0
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Resets.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Resets.efi
new file mode 100644
index 0000000000..16f1e1b3ca
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Resets.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Rm.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Rm.efi
new file mode 100644
index 0000000000..0b6030857c
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Rm.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/SmbiosView.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/SmbiosView.efi
new file mode 100644
index 0000000000..da53ffd1fc
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/TelnetMgmt.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/TelnetMgmt.efi
new file mode 100644
index 0000000000..600a07602f
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Time.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Time.efi
new file mode 100644
index 0000000000..a6d0ef8295
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Time.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Touch.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Touch.efi
new file mode 100644
index 0000000000..410056db28
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Touch.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Type.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Type.efi
new file mode 100644
index 0000000000..7bcc99d161
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Type.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Unload.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Unload.efi
new file mode 100644
index 0000000000..1e2f3a0855
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Unload.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Ver.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Ver.efi
new file mode 100644
index 0000000000..29dc2c63ad
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Ver.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/Vol.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/Vol.efi
new file mode 100644
index 0000000000..4d2e8dfc21
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/Vol.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/comp.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/comp.efi
new file mode 100644
index 0000000000..98d977f1ec
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/comp.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/dmem.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/dmem.efi
new file mode 100644
index 0000000000..66106faebe
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/dmem.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/dmpstore.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/dmpstore.efi
new file mode 100644
index 0000000000..b5e5c7ac89
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/edit.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/edit.efi
new file mode 100644
index 0000000000..084b85b5bb
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/edit.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/eficompress.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/eficompress.efi
new file mode 100644
index 0000000000..bd436f6fcf
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/efidecompress.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/efidecompress.efi
new file mode 100644
index 0000000000..da3d991a28
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/err.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/err.efi
new file mode 100644
index 0000000000..6688db3eed
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/err.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/hexedit.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/hexedit.efi
new file mode 100644
index 0000000000..93899cc5de
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/mem.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/mem.efi
new file mode 100644
index 0000000000..97c551c901
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/mem.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/memmap.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/memmap.efi
new file mode 100644
index 0000000000..7446cea7ff
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/memmap.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/mm.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/mm.efi
new file mode 100644
index 0000000000..b684a45aca
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/mm.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/mode.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/mode.efi
new file mode 100644
index 0000000000..bc01f61584
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/mode.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/pci.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/pci.efi
new file mode 100644
index 0000000000..88951d4867
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/pci.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/sermode.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/sermode.efi
new file mode 100644
index 0000000000..876d256b6a
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/sermode.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/stall.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/stall.efi
new file mode 100644
index 0000000000..477b6896cd
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/stall.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Apps/timezone.efi b/EdkShellBinPkg/MinimumShell/x64/Apps/timezone.efi
new file mode 100644
index 0000000000..5452fdd028
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Apps/timezone.efi
diff --git a/EdkShellBinPkg/MinimumShell/x64/Shell.efi b/EdkShellBinPkg/MinimumShell/x64/Shell.efi
new file mode 100644
index 0000000000..ec05fba1c0
--- /dev/null
+++ b/EdkShellBinPkg/MinimumShell/x64/Shell.efi