Update shell binaries to use release build target and integrate the following hot fixes:

1. Security hole in LoadImage() when EFI_SECURITY_VIOLATION status is returned.
2. Load.efi to load 32bit driver in 64bit platform causing system hang.
3. Fix for PCI multi-segment support.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10278 6f19259b-4bc3-4df7-8a09-765794883524

93 files changed, 12 insertions, 25 deletions

diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi
index 6ddc3ae13..0de2ed7bd 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi
index fad072a05..55f1bbe16 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Devices.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi
index 43512226a..b180e53f7 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi
index a0f49d27a..c8c7b2347 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Guid.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi
index 299da06b5..60e8a540e 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/IfConfig.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi
index 091b88b5a..e30404ac6 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi
index 49b680a9a..20b2e13f4 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi
index 071f320f9..c072d1b7c 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Mount.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi
index 909b37a63..a7dbdff5a 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi b/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi
index 995251d37..1fea2f8bf 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/Ping.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi
index 54b8313b6..c42012d5f 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi
index 802dd5be5..bfef7d7ec 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi b/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi
index 858b40197..18a81731f 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/comp.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi b/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi
index 64ae8614b..5a9aac442 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/dmem.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi
index a9204632b..13f5f87c5 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi b/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi
index 8914cb6c5..9cc60ce34 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/edit.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi b/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi
index 8459d0482..409ced7d5 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi
index 0d26d1982..0dd93b18c 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/err.efi b/EdkShellBinPkg/Bin/Ia32/Apps/err.efi
index 690a46ba4..51c8f504f 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/err.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/err.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi b/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi
index 9339b7f92..74574917a 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi
index 279b374b3..9112ff439 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/mem.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi b/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi
index 4e9a8ad48..1d1de2664 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/memmap.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi
index 967093e7a..becaa69f1 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/mm.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi b/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi
index 02ce6b23b..8296d3596 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/mode.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi b/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi
index 2f9a0452a..dc60cb2fd 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/pci.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi b/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi
index ce3bd2477..0b00dfdca 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/sermode.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi b/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi
index 2511644e0..a1e138a7f 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/stall.efi
diff --git a/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi b/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi
index b2c87688c..161beb705 100644
--- a/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi
+++ b/EdkShellBinPkg/Bin/Ia32/Apps/timezone.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi
index a1c6ba455..099f317d1 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi
index 193ae20ac..22a33202f 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Devices.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi
index 649031ca9..400fd75e5 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi
index f53f5b0c2..a020df96b 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Guid.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi
index 8ce71854c..72d75e3e6 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/IfConfig.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi
index de78afeb4..dcee85977 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi
index 2893adb49..0c26b7c0a 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi
index 3d1dad21a..a00094425 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Mount.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi
index 74076518c..5c36b5f75 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi b/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi
index 1f69265a3..dd859ba21 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/Ping.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi
index 6191d1e88..245c4a7b3 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi
index ef4e32a37..e2cd0d3db 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi b/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi
index 5fe5627d9..4a99e300a 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/comp.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi b/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi
index 5fe3ceba6..064ee3503 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/dmem.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi
index 325c4cb36..c1b35ca8a 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi b/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi
index 9bff0fd17..b5b3762de 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/edit.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi b/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi
index adf071617..5640a0a41 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi
index 5e7dc0e5c..69b0869aa 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/err.efi b/EdkShellBinPkg/Bin/Ipf/Apps/err.efi
index 3a6b6d713..b25dd11ad 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/err.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/err.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi b/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi
index 55027c8cf..a3fc9c7ab 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi
index 0a8b0c86e..0819edb02 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/mem.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi b/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi
index b1755b7e0..a95bce46c 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/memmap.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi
index 7d7ebde72..8e6527e6c 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/mm.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi b/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi
index 807dfa650..7c1f8d655 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/mode.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi b/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi
index 9dbb66698..3566ea831 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/pci.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi b/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi
index aebb8d798..46f3c4262 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/sermode.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi b/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi
index a85e0310f..1bd1645d3 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/stall.efi
diff --git a/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi b/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi
index 15683ef3b..bd8bed344 100644
--- a/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi
+++ b/EdkShellBinPkg/Bin/Ipf/Apps/timezone.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi b/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi
index dabd93e6d..629bfe71e 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/Dblk.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Devices.efi b/EdkShellBinPkg/Bin/X64/Apps/Devices.efi
index 7067407f6..a845cfe93 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/Devices.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/Devices.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi b/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi
index 811c45609..2a4573bb7 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Guid.efi b/EdkShellBinPkg/Bin/X64/Apps/Guid.efi
index b13a851d0..280d815dd 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/Guid.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/Guid.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi b/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi
index 2a5d11084..af04787a5 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/IfConfig.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi b/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi
index df0cddfb6..0d9a34179 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi b/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi
index 25516b4f8..b7527d080 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Mount.efi b/EdkShellBinPkg/Bin/X64/Apps/Mount.efi
index ca780a04c..e16a117c6 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/Mount.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/Mount.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi b/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi
index dc6e4c250..83abbcc3e 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/Openinfo.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/Ping.efi b/EdkShellBinPkg/Bin/X64/Apps/Ping.efi
index c46df50cf..e920e3fca 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/Ping.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/Ping.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi b/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi
index a846d2569..aef14b1d5 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/SmbiosView.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi b/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi
index 1e6d9dd75..cda1044ad 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/comp.efi b/EdkShellBinPkg/Bin/X64/Apps/comp.efi
index af2d2a8ad..c8197c51b 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/comp.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/comp.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/dmem.efi b/EdkShellBinPkg/Bin/X64/Apps/dmem.efi
index 91eb3a4e0..a7ea22119 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/dmem.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/dmem.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi b/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi
index 5588b5707..e7bda6910 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/dmpstore.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/edit.efi b/EdkShellBinPkg/Bin/X64/Apps/edit.efi
index 5187fba1c..4c37698cf 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/edit.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/edit.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi b/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi
index c18653907..7eebf191d 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/eficompress.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi b/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi
index cffe2b147..ef4bcad2d 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/efidecompress.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/err.efi b/EdkShellBinPkg/Bin/X64/Apps/err.efi
index 19872103a..f44fd911d 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/err.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/err.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi b/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi
index e423d9dfc..d0a187d2a 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/hexedit.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/mem.efi b/EdkShellBinPkg/Bin/X64/Apps/mem.efi
index 18a3557f6..af5b50f7e 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/mem.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/mem.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/memmap.efi b/EdkShellBinPkg/Bin/X64/Apps/memmap.efi
index 240472408..71f9892ce 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/memmap.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/memmap.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/mm.efi b/EdkShellBinPkg/Bin/X64/Apps/mm.efi
index f24199856..397d1fcc4 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/mm.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/mm.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/mode.efi b/EdkShellBinPkg/Bin/X64/Apps/mode.efi
index bae7cfec4..29632000a 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/mode.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/mode.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/pci.efi b/EdkShellBinPkg/Bin/X64/Apps/pci.efi
index 8edee34ab..2572e69c2 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/pci.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/pci.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/sermode.efi b/EdkShellBinPkg/Bin/X64/Apps/sermode.efi
index c33cdc8a9..11d3e5e67 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/sermode.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/sermode.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/stall.efi b/EdkShellBinPkg/Bin/X64/Apps/stall.efi
index 21ed51c36..89fc390e3 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/stall.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/stall.efi
diff --git a/EdkShellBinPkg/Bin/X64/Apps/timezone.efi b/EdkShellBinPkg/Bin/X64/Apps/timezone.efi
index b0baa0fa9..c5eded90f 100644
--- a/EdkShellBinPkg/Bin/X64/Apps/timezone.efi
+++ b/EdkShellBinPkg/Bin/X64/Apps/timezone.efi
diff --git a/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi b/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
index c416e9688..2a6ee83a2 100644
--- a/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
+++ b/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
diff --git a/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi b/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi
index b31790f4f..53bf962f5 100644
--- a/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi
+++ b/EdkShellBinPkg/FullShell/Ipf/Shell_Full.efi
diff --git a/EdkShellBinPkg/FullShell/X64/Shell_full.efi b/EdkShellBinPkg/FullShell/X64/Shell_full.efi
index b39268dd5..0fb4c0f71 100644
--- a/EdkShellBinPkg/FullShell/X64/Shell_full.efi
+++ b/EdkShellBinPkg/FullShell/X64/Shell_full.efi
diff --git a/EdkShellBinPkg/HotFix.diff b/EdkShellBinPkg/HotFix.diff
new file mode 100644
index 000000000..48edc4f3f
--- /dev/null
+++ b/EdkShellBinPkg/HotFix.diff
diff --git a/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi b/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi
index 974f3802b..b49e0025e 100644
--- a/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi
+++ b/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi
diff --git a/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi b/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi
index f2a27cda8..e76fe6c47 100644
--- a/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi
+++ b/EdkShellBinPkg/MinimumShell/Ipf/Shell.efi
diff --git a/EdkShellBinPkg/MinimumShell/X64/Shell.efi b/EdkShellBinPkg/MinimumShell/X64/Shell.efi
index ee61fc195..0e7bb83e0 100644
--- a/EdkShellBinPkg/MinimumShell/X64/Shell.efi
+++ b/EdkShellBinPkg/MinimumShell/X64/Shell.efi
diff --git a/EdkShellBinPkg/ReadMe.txt b/EdkShellBinPkg/ReadMe.txt
index 75a2f60cd..23b98dacb 100644
--- a/EdkShellBinPkg/ReadMe.txt
+++ b/EdkShellBinPkg/ReadMe.txt
@@ -1,14 +1,16 @@
-The binaries of EdkShellBinPkg are generated with Efi-Shell-Dev-Snapshot-20091214.zip (plus a security hot-fix see EdkShellbinPkg\SecurityPatch.diff) and build with Edk Compatibility & BaseTools Package

-(r9623)

+The binaries of EdkShellBinPkg are generated with Efi-Shell-Dev-Snapshot-20091214.zip (plus a hot-fix see EdkShellbinPkg\HotFix.diff) and build with Edk Compatibility & BaseTools Package (r9623). The binaries are built with no debug information by building with "RELEASE" target.

 

 The following steps can help to re-generate these binaries for customization:

-1. Check out EdkCompatibilityPkg (r9623) to $(WORKSPACE)\EdkCompatibilityPkg (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkCompatibilityPkg).

-2. Check out EdkShellPkg(r9623) to $(WORKSPACE)\EdkShellPkg (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkShellPkg).

-3a.Check out Edk Shell project source (r36) to $(WORKSPACE) (svn https://efi-shell.tianocore.org/svn/efi-shell/trunk/Shell).  It is read-only and current revison (r36) is identical to Efi-Shell-Dev-Snapshot-20091214.zip. 

-3b.Apply the security hot fix in EdkShellBinPkg\SecurityPatch.diff to patch in Shell\shellenv\exec.c

-4. Update to the newest BaseTools package. (r9623 or later)

+1. Check out EdkCompatibilityPkg (r9623) to $(WORKSPACE)\EdkCompatibilityPkg (svn http://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkCompatibilityPkg).

+2. Check out EdkShellPkg(r9623) to $(WORKSPACE)\EdkShellPkg (svn http://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellPkg).

+3a.Check out Edk Shell project source (r36) to $(WORKSPACE) (svn http://efi-shell.svn.sourceforge.net/svnroot/efi-shell/trunk/Shell).  It is read-only and current revison (r36) is identical to Efi-Shell-Dev-Snapshot-20091214.zip. 

+3b.Apply the hot fix in EdkShellBinPkg\HotFix.diff to fix the following issues:

+   Security hole in LoadImage() when EFI_SECURITY_VIOLATION status is returned.

+   Load.efi to load 32bit driver in 64bit platform causing system hang.

+   Fix for PCI multi-segment support.

+4. Update to the newest BaseTools package (r9623) to $(WORKSPACE) (svn http://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/BaseTools).

 5. Under workspace directory (i.e. c:\EdkII), 

-   To generate Minimum Shell, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Shell\Shell.inf" 

-   To generate Full Shell, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Shell\ShellFull.inf" 

+   To generate Minimum Shell, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Shell\Shell.inf -b RELEASE" 

+   To generate Full Shell, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Shell\ShellFull.inf -b RELEASE" 

 6. In EdkShellBinPkg\Bin, we only provides the binary files of those applications which haven't been contained in Minmum Shell but in Full Shell.

-   To generate them, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Xxx\Xxx.inf". Xxx means the corresponding module name.
\ No newline at end of file
+   To generate them, execute: "build -a IA32 -a X64 -a IPF -p EdkShellPkg\EdkShellPkg.dsc -m EdkShellPkg\Xxx\Xxx.inf -b RELEASE". Xxx means the corresponding module name.
\ No newline at end of file
diff --git a/EdkShellBinPkg/SecurityPatch.diff b/EdkShellBinPkg/SecurityPatch.diff
deleted file mode 100644
index 01a05c065..000000000
--- a/EdkShellBinPkg/SecurityPatch.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: shellenv/exec.c

-===================================================================

---- shellenv/exec.c	(revision 36)

-+++ shellenv/exec.c	(working copy)

-@@ -2079,6 +2079,10 @@

-         if (!EFI_ERROR (Status)) {
-           goto Done;
-         } else {
-+          //
-+          // Set ImageHandle to NULL if any error status is returned.
-+          //
-+          ImageHandle = NULL;
-           Status = LibGetImageHeader (
-                      DevicePath,
-                      &DosHeader,