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 6ddc3ae..0de2ed7 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 fad072a..55f1bbe 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 4351222..b180e53 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 a0f49d2..c8c7b23 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 299da06..60e8a54 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 091b88b..e30404a 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 49b680a..20b2e13 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 071f320..c072d1b 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 909b37a..a7dbdff 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 995251d..1fea2f8 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 54b8313..c42012d 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 802dd5b..bfef7d7 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 858b401..18a8173 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 64ae861..5a9aac4 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 a920463..13f5f87 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 8914cb6..9cc60ce 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 8459d04..409ced7 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 0d26d19..0dd93b1 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 690a46b..51c8f50 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 9339b7f..7457491 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 279b374..9112ff4 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 4e9a8ad..1d1de26 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 967093e..becaa69 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 02ce6b2..8296d35 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 2f9a045..dc60cb2 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 ce3bd24..0b00dfd 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 2511644..a1e138a 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 b2c8768..161beb7 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 a1c6ba4..099f317 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 193ae20..22a3320 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 649031c..400fd75 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 f53f5b0..a020df9 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 8ce7185..72d75e3 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 de78afe..dcee859 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 2893adb..0c26b7c 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 3d1dad2..a000944 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 7407651..5c36b5f 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 1f69265..dd859ba 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 6191d1e..245c4a7 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 ef4e32a..e2cd0d3 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 5fe5627..4a99e30 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 5fe3ceb..064ee35 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 325c4cb..c1b35ca 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 9bff0fd..b5b3762 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 adf0716..5640a0a 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 5e7dc0e..69b0869 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 3a6b6d7..b25dd11 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 55027c8..a3fc9c7 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 0a8b0c8..0819edb 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 b1755b7..a95bce4 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 7d7ebde..8e6527e 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 807dfa6..7c1f8d6 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 9dbb666..3566ea8 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 aebb8d7..46f3c42 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 a85e031..1bd1645 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 15683ef..bd8bed3 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 dabd93e..629bfe7 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 7067407..a845cfe 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 811c456..2a4573b 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 b13a851..280d815 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 2a5d110..af04787 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 df0cddf..0d9a341 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 25516b4..b7527d0 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 ca780a0..e16a117 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 dc6e4c2..83abbcc 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 c46df50..e920e3f 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 a846d25..aef14b1 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 1e6d9dd..cda1044 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 af2d2a8..c8197c5 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 91eb3a4..a7ea221 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 5588b57..e7bda69 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 5187fba..4c37698 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 c186539..7eebf19 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 cffe2b1..ef4bcad 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 1987210..f44fd91 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 e423d9d..d0a187d 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 18a3557..af5b50f 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 2404724..71f9892 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 f241998..397d1fc 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 bae7cfe..2963200 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 8edee34..2572e69 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 c33cdc8..11d3e5e 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 21ed51c..89fc390 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 b0baa0f..c5eded9 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 c416e96..2a6ee83 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 b31790f..53bf962 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 b39268d..0fb4c0f 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 0000000..48edc4f
--- /dev/null
+++ b/EdkShellBinPkg/HotFix.diff
diff --git a/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi b/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi
index 974f380..b49e002 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 f2a27cd..e76fe6c 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 ee61fc1..0e7bb83 100644
--- a/EdkShellBinPkg/MinimumShell/X64/Shell.efi
+++ b/EdkShellBinPkg/MinimumShell/X64/Shell.efi
diff --git a/EdkShellBinPkg/ReadMe.txt b/EdkShellBinPkg/ReadMe.txt
index 75a2f60..23b98da 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 01a05c0..0000000
--- 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,