158 files changed, 320 insertions, 187 deletions
diff --git a/EdkShellBinPkg/FullShell/ia32/Shell_Full.efi b/EdkShellBinPkg/FullShell/ia32/Shell_Full.efi
index 7f2dbcb0d1..7d2d0965a5 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 2772db4274..5c32709b0f 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 8dcba43c32..5f23f3bbb6 100644
--- a/EdkShellBinPkg/FullShell/x64/Shell_full.efi
+++ b/EdkShellBinPkg/FullShell/x64/Shell_full.efi
diff --git a/EdkShellBinPkg/GenBin/Shell_HotFix.diff b/EdkShellBinPkg/GenBin/Shell_HotFix.diff
index c023a7759a..2bff57c191 100644
--- a/EdkShellBinPkg/GenBin/Shell_HotFix.diff
+++ b/EdkShellBinPkg/GenBin/Shell_HotFix.diff
@@ -1,189 +1,325 @@
-diff -urN Shell1.04\Shell/Library/DPath.c EdkCompatibilityPkg\Shell/Library/DPath.c
---- Shell1.04\Shell/Library/DPath.c	2007-11-15 14:38:52.000000000 +0800
-+++ EdkCompatibilityPkg\Shell/Library/DPath.c	2008-02-25 13:38:07.000000000 +0800
-@@ -1,6 +1,6 @@
- /*++
+diff -urN --binary -a -x CVS Oldv1.5/Application/Shell/Library/EfiShellLib.h Newv1.5/Application/Shell/Library/EfiShellLib.h
+--- Oldv1.5/Application/Shell/Library/EfiShellLib.h	2008-06-10 13:46:56.000000000 +0800
++++ Newv1.5/Application/Shell/Library/EfiShellLib.h	2008-07-09 11:45:28.026417300 +0800
+@@ -174,22 +174,23 @@
+ //
+ //  Environment variable name constants
+ //
+-#define VarLanguageCodes    L"LangCodes"
+-#define VarLanguage         L"Lang"
+-#define VarTimeout          L"Timeout"
+-#define VarConsoleIn        L"ConIn"
+-#define VarConsoleOut       L"ConOut"
+-#define VarErrorOut         L"ErrOut"
+-#define VarBootOption       L"Boot%04x"
+-#define VarBootOrder        L"BootOrder"
+-#define VarBootNext         L"BootNext"
+-#define VarBootCurrent      L"BootCurrent"
+-#define VarDriverOption     L"Driver%04x"
+-#define VarDriverOrder      L"DriverOrder"
+-#define VarConsoleInpDev    L"ConInDev"
+-#define VarConsoleOutDev    L"ConOutDev"
+-#define VarErrorOutDev      L"ErrOutDev"
+-#define LanguageCodeEnglish "eng"
++#define VarLanguageCodes            L"LangCodes"
++#define VarLanguage                 L"Lang"
++#define VarTimeout                  L"Timeout"
++#define VarConsoleIn                L"ConIn"
++#define VarConsoleOut               L"ConOut"
++#define VarErrorOut                 L"ErrOut"
++#define VarBootOption               L"Boot%04x"
++#define VarBootOrder                L"BootOrder"
++#define VarBootNext                 L"BootNext"
++#define VarBootCurrent              L"BootCurrent"
++#define VarDriverOption             L"Driver%04x"
++#define VarDriverOrder              L"DriverOrder"
++#define VarConsoleInpDev            L"ConInDev"
++#define VarConsoleOutDev            L"ConOutDev"
++#define VarErrorOutDev              L"ErrOutDev"
++#define LanguageCodeEnglish         "eng"
++#define PlatformLanguageCodeEnglish "en-US"
  
--Copyright (c) 2005 - 2007, Intel Corporation                                                         
-+Copyright (c) 2005 - 2008, Intel Corporation                                                         
- 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         
-@@ -1294,17 +1294,8 @@
-   ASSERT (Str != NULL);
-   ASSERT (DevPath != NULL);
+ #define ISO_639_2_ENTRY_SIZE  3
+ #define RFC_3066_ENTRY_SIZE   12
+@@ -333,4 +334,10 @@
+   IN CHAR8                           *LangCode
+   );
  
--  if (ST->Hdr.Revision > 0x00020000) {
--    FvPath = DevPath;
--    CatPrint (Str, L"Fv(%g)", &FvPath->NameGuid);
--  } else if (ST->Hdr.Revision < 0x00020000) {
--    //
--    // MEDIA_FV_FILEPATH_DP_EFI_1_10 == MEDIA_FV_DP == 0x06
--    //
--    _DevPathFvFilePath (Str, DevPath);    
--  } else {
--    _DevPathNodeUnknown (Str, DevPath);
--  }
-+  FvPath = DevPath;
-+  CatPrint (Str, L"Fv(%g)", &FvPath->NameGuid);
- }
++CHAR8 *
++ExtractSupportedLanguage (
++  IN CONST CHAR8   *SupportedLanguages,
++  IN CONST CHAR8   *Language
++  );
++
  #endif
+diff -urN --binary -a -x CVS Oldv1.5/Application/Shell/Library/Misc.c Newv1.5/Application/Shell/Library/Misc.c
+--- Oldv1.5/Application/Shell/Library/Misc.c	2008-06-10 13:46:56.000000000 +0800
++++ Newv1.5/Application/Shell/Library/Misc.c	2008-07-09 11:45:28.088917700 +0800
+@@ -2271,3 +2271,76 @@
+   }
+   return Lang;
+ }
++
++CHAR8 *
++ExtractSupportedLanguage (
++  IN CONST CHAR8   *SupportedLanguages,
++  IN CONST CHAR8   *Language
++  )
++/*++
++
++  Routine Description:
++
++    This function matches the major language code (first two characters) in the
++    SupportedLanguages. The first language code in the SupportedLanguages that
++    matches first two characters of the input Language is returned. If there is no
++    such match, then NULL is returned.
++
++  Arguments:
++
++    SupportedLanguages    -   A Null-terminated ASCII string that contains one
++                              or more supported language codes. 
++
++    LangCode              -   A pointer to a Null-terminated ASCII string
++                              array indicating the RFC 3066 language.
++
++  Returns:
++
++    The RFC3066 language code that matches the major language. 
++
++--*/
++{
++  CONST CHAR8      *CurrentLanguage;
++  CHAR8            *SupportedLanguage;
++  UINTN            LanguageLen;
++
++  CurrentLanguage = SupportedLanguages;
++
++  while (CurrentLanguage != '\0') {
++    //
++    // Search till the end of current language.
++    // 
++    LanguageLen = 0;
++    while (CurrentLanguage[LanguageLen] != ';' && CurrentLanguage[LanguageLen] != '\0') {
++      LanguageLen++;
++    }
++
++    //
++    // should use AsciiStrnCmp(CurrentLanguage, Language, 2) == 0
++    // 
++    if ((CurrentLanguage[0] == Language[0]) && (CurrentLanguage[1] == Language[1])) {
++      //
++      // Match the major language code, then return a new copy of
++      // NULL-terminated SupportedLanguage.
++      //
++      SupportedLanguage = AllocatePool (LanguageLen + 1);
++      CopyMem (SupportedLanguage, (VOID *) CurrentLanguage, LanguageLen);
++
++      SupportedLanguage[LanguageLen] = '\0';
++
++      return SupportedLanguage;
++    }
++    //
++    // Make CurrentLangue point to the next candiate language code.
++    // 
++    CurrentLanguage += LanguageLen;
++    if (*CurrentLanguage == ';') {
++      CurrentLanguage++;
++    }
++  }
++
++  return NULL;
++}
++
++
++
+diff -urN --binary -a -x CVS Oldv1.5/Application/Shell/SmbiosView/PrintInfo.c Newv1.5/Application/Shell/SmbiosView/PrintInfo.c
+--- Oldv1.5/Application/Shell/SmbiosView/PrintInfo.c	2007-11-26 14:01:00.000000000 +0800
++++ Newv1.5/Application/Shell/SmbiosView/PrintInfo.c	2008-07-09 12:36:07.646190700 +0800
+@@ -1779,7 +1779,7 @@
+   //
+   // MaxSize is determined by follow formula
+   //
+-  MaxSize = 1 << Size;
++  MaxSize = (UINTN) 1 << Size;
+   PrintToken (STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ONE_VAR_MB), HiiHandle, MaxSize);
  
-@@ -2006,16 +1997,11 @@
- #if (EFI_SPECIFICATION_VERSION > 0x00020000)
-   MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_EFI_2_00 *FvDevicePathNodeUefi_2_00;
-   
--  if (ST->Hdr.Revision > 0x00020000) {
-+  if (ST->Hdr.Revision != 0x00020000) {
-     if (DevicePathType (&FvDevicePathNode->Header) == MEDIA_DEVICE_PATH &&
-         DevicePathSubType (&FvDevicePathNode->Header) == MEDIA_FV_FILEPATH_DP) {
-       return &FvDevicePathNode->NameGuid;
-     }    
--  } else if (ST->Hdr.Revision < 0x00020000) {
--    if (DevicePathType (&FvDevicePathNode->Header) == MEDIA_DEVICE_PATH &&
--        DevicePathSubType (&FvDevicePathNode->Header) == MEDIA_FV_FILEPATH_DP_EFI_1_10) {
--      return &FvDevicePathNode->NameGuid;
--    }    
-   } else {
-     FvDevicePathNodeUefi_2_00 = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH_EFI_2_00 *)FvDevicePathNode;
-     if (DevicePathType (&FvDevicePathNodeUefi_2_00->Piwg.Header) == MEDIA_DEVICE_PATH &&
-diff -urN Shell1.04\Shell/Library/DPath.h EdkCompatibilityPkg\Shell/Library/DPath.h
---- Shell1.04\Shell/Library/DPath.h	2007-11-14 22:48:14.000000000 +0800
-+++ EdkCompatibilityPkg\Shell/Library/DPath.h	2008-02-25 13:38:07.000000000 +0800
-@@ -1,6 +1,6 @@
- /*++
+   if (Option >= SHOW_DETAIL) {
+diff -urN --binary -a -x CVS Oldv1.5/Application/Shell/SmbiosView/Smbios.h Newv1.5/Application/Shell/SmbiosView/Smbios.h
+--- Oldv1.5/Application/Shell/SmbiosView/Smbios.h	2006-03-07 16:20:46.000000000 +0800
++++ Newv1.5/Application/Shell/SmbiosView/Smbios.h	2008-07-09 10:29:41.548254500 +0800
+@@ -34,11 +34,6 @@
  
--Copyright (c) 2005 - 2007, Intel Corporation                                                         
-+Copyright (c) 2005 - 2008, Intel Corporation                                                         
- 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         
-@@ -161,11 +161,6 @@
+ extern EFI_HII_HANDLE HiiHandle;
  
- #if (EFI_SPECIFICATION_VERSION > 0x00020000)
- //
--// For EFI1.10 FV file device path
--//
--#define MEDIA_FV_FILEPATH_DP_EFI_1_10 0x06
--
--//
- // For UEFI2.0 FV file device path
- //
- typedef struct {
-diff -urN Shell1.04\Shell/Library/FileIO.c EdkCompatibilityPkg\Shell/Library/FileIO.c
---- Shell1.04\Shell/Library/FileIO.c	2006-03-15 11:54:44.000000000 +0800
-+++ EdkCompatibilityPkg\Shell/Library/FileIO.c	2008-03-24 13:44:52.000000000 +0800
-@@ -1,6 +1,6 @@
- /*++
+-#define EFI_SMBIOS_TABLE_GUID \
+-  { \
+-    0xeb9d2d31, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \
+-  }
  
--Copyright (c) 2005, Intel Corporation                                                         
-+Copyright (c) 2005 - 2008, Intel Corporation                                                         
- 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         
-@@ -253,14 +253,16 @@
+-extern EFI_GUID       gEfiSmbiosTableGuid;
  
- --*/
- {
--  EFI_STATUS            Status;
--  EFI_FILE_HANDLE       LastHandle;
--  FILEPATH_DEVICE_PATH  *FilePathNode;
-+  EFI_STATUS                Status;
-+  EFI_FILE_HANDLE           LastHandle;
-+  FILEPATH_DEVICE_PATH      *FilePathNode;
-+  EFI_DEVICE_PATH_PROTOCOL  *AlignedFilePath;
+ #endif
+diff -urN --binary -a -x CVS Oldv1.5/Application/Shell/drivers/drivers.c Newv1.5/Application/Shell/drivers/drivers.c
+--- Oldv1.5/Application/Shell/drivers/drivers.c	2008-05-26 13:22:52.000000000 +0800
++++ Newv1.5/Application/Shell/drivers/drivers.c	2008-07-09 12:36:16.552668700 +0800
+@@ -130,6 +130,7 @@
+   UINTN                        StringIndex;
+   UINTN                        Index;
+   CHAR8                        *Language;
++  CHAR8                        *PlatformLanguage;
+   UINTN                        DriverImageHandleCount;
+   EFI_HANDLE                   *DriverImageHandleBuffer;
+   UINTN                        HandleIndex;
+@@ -152,6 +153,7 @@
+   SHELL_VAR_CHECK_PACKAGE      ChkPck;
  
-   ASSERT (FilePath != NULL);
-   ASSERT (DeviceHandle != NULL);
-   ASSERT (FileHandle != NULL);
--  
-+
-+  AlignedFilePath = NULL;
-   //
-   // File the file system for this file path
-   //
-@@ -274,12 +276,26 @@
-   *FileHandle = LibOpenRoot (*DeviceHandle);
-   Status      = *FileHandle ? EFI_SUCCESS : EFI_UNSUPPORTED;
+   Language                = NULL;
++  PlatformLanguage        = NULL;
+   DriverImageHandleCount  = 0;
+   DriverImageHandleBuffer = NULL;
+   IsHelp                  = FALSE;
+@@ -241,7 +243,7 @@
+       goto Done;
+     }
  
-+  if (EFI_ERROR (Status)) {
-+    return Status;
-+  }
-+
-+  //
-+  // Duplicate FilePath to make sure it is aligned so that
-+  // FilePathNode->PathName below is 16-bit aligned.
-+  //
-+  AlignedFilePath = DuplicateDevicePath(*FilePath);
-+  if (AlignedFilePath == NULL) {
-+    (*FileHandle)->Close (*FileHandle);
-+    *FileHandle = NULL;
-+    return EFI_OUT_OF_RESOURCES;
-+  }
-+  FilePathNode = (FILEPATH_DEVICE_PATH *)AlignedFilePath;
-   //
-   // To access as a file system, the file path should only
-   // contain file path components.  Follow the file path nodes
-   // and find the target file
-   //
--  FilePathNode = (FILEPATH_DEVICE_PATH *) *FilePath;
-   while (!IsDevicePathEnd (&FilePathNode->Header)) {
-     //
-     // For file system access each node should be a file path component
-@@ -332,6 +348,7 @@
-   if (EFI_ERROR (Status)) {
-     *FileHandle = NULL;
-   }
-+  FreePool(AlignedFilePath);
+-    Language = LibGetVariableLang ();
++    Language = LibGetVariable (L"Lang", &gEfiGlobalVariableGuid);
+     if (Language == NULL) {
+       Language = (CHAR8 *)AllocateZeroPool(strlena(LanguageCodeEnglish) + 1);
+       if (Language == NULL) {
+@@ -250,6 +252,15 @@
+       strcpya(Language, LanguageCodeEnglish);
+     }
  
-   return Status;
- }
-diff -urN Shell1.04\Shell/shellenv/var.c EdkCompatibilityPkg\Shell/shellenv/var.c
---- Shell1.04\Shell/shellenv/var.c	2006-03-07 16:20:44.000000000 +0800
-+++ EdkCompatibilityPkg\Shell/shellenv/var.c	2008-02-25 13:38:08.000000000 +0800
-@@ -389,8 +389,15 @@
- {
-   UINTN       Size;
-   VARIABLE_ID *Var;
-+  UINTN       RoundUpValueSize;
++    PlatformLanguage = LibGetVariable (L"PlatformLang", &gEfiGlobalVariableGuid);
++    if (PlatformLanguage == NULL) {
++      PlatformLanguage = (CHAR8 *)AllocateZeroPool(strlena(PlatformLanguageCodeEnglish) + 1);
++      if (PlatformLanguage == NULL) {
++        return EFI_OUT_OF_RESOURCES;
++      }
++      strcpya(PlatformLanguage, PlatformLanguageCodeEnglish);
++    }
++
+     Item = LibCheckVarGetFlag (&ChkPck, L"-l");
+     if (Item) {
+       if (Language != NULL) {
+@@ -314,14 +325,6 @@
+                   EFI_OPEN_PROTOCOL_GET_PROTOCOL
+                   );
  
--  Size  = sizeof (VARIABLE_ID) + StrSize (Name) + ValueSize;
-+  //
-+  // Variable buffer layout: VARIABLE_ID + Value + Name
-+  // We need to round up the variable size to make sure Name is aligned (for IPF).
-+  //
-+  RoundUpValueSize = (ValueSize % 2) ? (ValueSize + 1) : ValueSize; 
-+
-+  Size  = sizeof (VARIABLE_ID) + StrSize (Name) + RoundUpValueSize;
-   Var   = AllocateZeroPool (Size);
-   if (Var == NULL) {
-     return NULL;
-@@ -398,7 +405,7 @@
+-    ComponentName  = NULL;
+-    ComponentName2 = NULL;
+-    Status = LibGetComponentNameProtocol (
+-               DriverImageHandleBuffer[Index],
+-               &ComponentName,
+-               &ComponentName2
+-               );
+-
+     DiagnosticsStatus = BS->OpenProtocol (
+                               DriverImageHandleBuffer[Index],
+                               &gEfiDriverDiagnostics2ProtocolGuid,
+@@ -418,37 +421,73 @@
+     } else {
+       PrintToken (STRING_TOKEN (STR_SHELLENV_PROTID_ONE_VAR_D), HiiHandle, NumberOfChildren);
+     }
+-
+-    Status     = EFI_SUCCESS;
++    
+     DriverName = L"<UNKNOWN>";
+-    SupportedLanguage = NULL;
+-    if (ComponentName != NULL) {
+-      if (ComponentName->GetDriverName != NULL) {
+-        SupportedLanguage = LibConvertSupportedLanguage (ComponentName->SupportedLanguages, Language);
++    Status = BS->OpenProtocol (
++                   DriverImageHandleBuffer[Index],
++                   &gEfiComponentName2ProtocolGuid,
++                   (VOID **) &ComponentName2,
++                   NULL,
++                   NULL,
++                   EFI_OPEN_PROTOCOL_GET_PROTOCOL
++                   );
++    if (!EFI_ERROR (Status)) {
++      //
++      // Driver has Component Name 2 Protocol is available, we get the
++      // driver name var RFC 3066 language code
++      // 
++      Status = ComponentName2->GetDriverName (
++                                 ComponentName2,
++                                 PlatformLanguage,
++                                 &DriverName
++                                 );
++      if (EFI_ERROR (Status)) {
++        //
++        // Current RFC3066 language code fails, we then extract the supported
++        // language from Component Name 2 protocol interface.
++        // 
++        SupportedLanguage =  ExtractSupportedLanguage(ComponentName2->SupportedLanguages, Language);
++        if (SupportedLanguage != NULL) {
++          Status = ComponentName2->GetDriverName (
++                                     ComponentName2,
++                                     SupportedLanguage,
++                                     &DriverName
++                                     );
++          FreePool(SupportedLanguage);
++        }
++      }
++    }
++    if (EFI_ERROR (Status)) {
++      //
++      // In case Component Name 2 protocol is not available or some error occurs
++      // when getting driver name from Component Name 2 protocol, we get driver
++      // name from Component Name protocol.
++      // 
++      Status = BS->OpenProtocol (
++                     DriverImageHandleBuffer[Index],
++                     &gEfiComponentNameProtocolGuid,
++                     (VOID **) &ComponentName,
++                     NULL,
++                     NULL,
++                     EFI_OPEN_PROTOCOL_GET_PROTOCOL
++                     );
++      if (!EFI_ERROR (Status)) {
+         Status = ComponentName->GetDriverName (
+                                   ComponentName,
+-                                  SupportedLanguage,
++                                  Language,
+                                   &DriverName
+                                   );
+       }
+-    } else if (ComponentName2 != NULL) {
+-      if (ComponentName2->GetDriverName != NULL) {
+-        SupportedLanguage = LibConvertSupportedLanguage (ComponentName2->SupportedLanguages, Language);
+-        Status = ComponentName2->GetDriverName (
+-                                   ComponentName2,
+-                                   SupportedLanguage,
+-                                   &DriverName
+-                                   );
+-      }
+     }
+-    if (SupportedLanguage != NULL) {
+-      FreePool (SupportedLanguage);
+-    }
+-
+     if (EFI_ERROR (Status)) {
++      //
++      // Fails to get driver name from either Component Name 2 & Component Name
++      // Protocol, we show "<UNKNOWN>" string as driver name.
++      // 
+       DriverName = L"<UNKNOWN>";
+     }
  
-   Var->Signature  = VARIABLE_SIGNATURE;
-   Var->u.Value    = ((UINT8 *) Var) + sizeof (VARIABLE_ID);
--  Var->Name       = (CHAR16 *) (Var->u.Value + ValueSize);
-+  Var->Name       = (CHAR16 *) (Var->u.Value + RoundUpValueSize);
-   Var->ValueSize  = ValueSize;
-   CopyMem (Var->u.Value, Value, ValueSize);
-   StrCpy (Var->Name, Name);
-diff -urN Shell1.04\Shell/ver/Ver.inf EdkCompatibilityPkg\Shell/ver/Ver.inf
---- Shell1.04\Shell/ver/Ver.inf	2007-03-04 23:30:48.000000000 +0800
-+++ EdkCompatibilityPkg\Shell/ver/Ver.inf	2008-03-03 13:36:05.000000000 +0800
-@@ -1,6 +1,6 @@
- #/*++
- #
--#  Copyright (c) 2005 - 2007, Intel Corporation                                                         
-+#  Copyright (c) 2005 - 2008, Intel Corporation                                                         
- #  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         
-@@ -45,7 +45,7 @@
-    Ver.c
-    Ver.h 
-    
--[sources.ia32|x64]
-+[sources.ia32,sources.x64]
-    ia32\ver32.c
++ 
+     for (StringIndex = 0; StringIndex < StrLen (DriverName) && StringIndex < 35; StringIndex++) {
+       FormattedDriverName[StringIndex] = DriverName[StringIndex];
+     }
+@@ -491,6 +530,10 @@
+     FreePool (Language);
+   }
  
- [sources.ipf]
++  if (PlatformLanguage != NULL) {
++    FreePool (PlatformLanguage);
++  }
++
+   ShellCloseHandleEnumerator ();
+   LibCheckVarFreeVarList (&ChkPck);
+   LibUnInitializeStrings ();
diff --git a/EdkShellBinPkg/MinimumShell/ia32/Shell.efi b/EdkShellBinPkg/MinimumShell/ia32/Shell.efi
index d550a0e462..11e7537315 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 12814e9940..c23b36f96e 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 3ae4afe9c3..9893e1e8a9 100644
--- a/EdkShellBinPkg/MinimumShell/x64/Shell.efi
+++ b/EdkShellBinPkg/MinimumShell/x64/Shell.efi
diff --git a/EdkShellBinPkg/ReadMe.txt b/EdkShellBinPkg/ReadMe.txt
index 6718a376d8..3d06154d01 100644
--- a/EdkShellBinPkg/ReadMe.txt
+++ b/EdkShellBinPkg/ReadMe.txt
@@ -1,23 +1,20 @@
-The binaries of EdkShellBinPkg are generated with EDK-Shell 1.04 release and build with Edk Compatibility & BaseTools Package
-(r4927)
+The binaries of EdkShellBinPkg are generated with EDK-Shell 1.05 release and build with Edk Compatibility & BaseTools Package
+(r5439)
 
 The following steps can help to re-generate these binaries for customization:
-1. Check out EdkCompatibilityPkg (r4927) to a directory EdkCompatibilityPkg in workspace (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkCompatibilityPkg). 
-2. Update to the newest BaseTools package. (r4927 or later)
-2. Download EfiShell 1.04.zip from EDK Shell official release https://efi-shell.tianocore.org/servlets/ProjectDocumentList?folderID=52&expandFolder=52&folderID=45
+1. Check out EdkCompatibilityPkg (r5439) to a directory EdkCompatibilityPkg in workspace (svn https://edk2.tianocore.org/svn/edk2/trunk/edk2/EdkCompatibilityPkg). 
+2. Update to the newest BaseTools package. (r5439 or later)
+2. Download EfiShell 1.05.zip from EDK Shell official release https://efi-shell.tianocore.org/servlets/ProjectDocumentList?folderID=52&expandFolder=52&folderID=45
 3. Unzip it to be a sub-directory in EdkCompatibilityPkg , i.e. c:\EdkII\EdkCompatibilityPkg\Shell
-4. Apply a hot fix Shell_HotFix.diff under EdkShellBinPkg\GenBin directory. This is mainly to fix the unaligned device path node access in shell binary and a rare INF format issue in ver.inf. This patch will be integrated into the later official release.
+4. Apply a hot fix Shell_HotFix.diff under EdkShellBinPkg\GenBin directory. This is mainly to fix the RFC 3066 language comaptiblity issues. This patch will be integrated into the later official release.
 5. Under workspace directory (i.e. c:\EdkII), execute:
-   build -a IA32 -a X64 -a IPF -p EdkShellBinPkg\GenBin\EdkShellPkg.dsc -t WINDDK3790x1830
-   The use of WINDDK instead of MYTOOLS is due to the fact that EDK shell source 1.04 is not
-   VS2005 clean.
-
+   build -a IA32 -a X64 -a IPF -p EdkShellBinPkg\GenBin\EdkShellPkg.dsc
 6. Copy the binaries from Build directory to this package. Typically the EFI binary
    of EdkCompatibility\Shell\$(INF_BASENAME).inf is generated at:
-   Build\EdkShellPkg\DEBUG_WINDDK3790x1830\$(ARCH)\EdkCompatibility\Shell\$(INF_BASENAME)\OUTPUT\$(BASENAME).efi
+   Build\EdkShellPkg\DEBUG_MYTOOLS\$(ARCH)\EdkCompatibility\Shell\$(INF_BASENAME)\OUTPUT\$(BASENAME).efi
    For example:
    The x64 EFI image of EdkCompatibility\Shell\ver\ver.inf is generated at:
-   Build\EdkShellPkg\DEBUG_WINDDK3790x1830\X64\EdkCompatibilityPkg\Shell\ver\Ver\OUTPUT\ver.efi
+   Build\EdkShellPkg\DEBUG_MYTOOLS\X64\EdkCompatibilityPkg\Shell\ver\Ver\OUTPUT\ver.efi
 
 Note: Other\Maintained\Application\Shell\Shell.inf corresponds to Minimum shell binaries.
       Other\Maintained\Application\Shell\ShellFull.inf corresponds to Full Shell binaries.
 \ No newline at end of file
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Attrib.efi b/EdkShellBinPkg/bin/ia32/Apps/Attrib.efi
index f66dfe7aa8..836c88d116 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Attrib.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Cls.efi b/EdkShellBinPkg/bin/ia32/Apps/Cls.efi
index 57acdf0172..7d8062148b 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Cls.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Cls.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Cp.efi b/EdkShellBinPkg/bin/ia32/Apps/Cp.efi
index 626de1444c..44a07bb7fc 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Cp.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Cp.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Date.efi b/EdkShellBinPkg/bin/ia32/Apps/Date.efi
index 4ce77adff9..8840b215c4 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Date.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Date.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Dblk.efi b/EdkShellBinPkg/bin/ia32/Apps/Dblk.efi
index c08eae3a87..43907334b3 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 6558dce27f..f24c8d1018 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 2e4a8bae16..fd33fcf252 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Devtree.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Drivers.efi b/EdkShellBinPkg/bin/ia32/Apps/Drivers.efi
index c772f0eab1..4522863fb3 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Drivers.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Drvcfg.efi b/EdkShellBinPkg/bin/ia32/Apps/Drvcfg.efi
index 54c6a15ebc..25cf7735d9 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Drvcfg.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Drvdiag.efi b/EdkShellBinPkg/bin/ia32/Apps/Drvdiag.efi
index 6c3324f270..a61664625a 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Drvdiag.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Guid.efi b/EdkShellBinPkg/bin/ia32/Apps/Guid.efi
index c44751d285..71d0002130 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 68dea1c24e..b8e6c9dc8e 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 921e129349..3e9f12c1ec 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/IpConfig.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Load.efi b/EdkShellBinPkg/bin/ia32/Apps/Load.efi
index 00d953d1bf..f974a48d07 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Load.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Load.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/LoadPciRom.efi b/EdkShellBinPkg/bin/ia32/Apps/LoadPciRom.efi
index 7a26380bc0..0c27c29a58 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/LoadPciRom.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Ls.efi b/EdkShellBinPkg/bin/ia32/Apps/Ls.efi
index 6dbe7efd76..2cffae8ced 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Ls.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Ls.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Mkdir.efi b/EdkShellBinPkg/bin/ia32/Apps/Mkdir.efi
index 45572c2b89..1df371595c 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Mkdir.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Mount.efi b/EdkShellBinPkg/bin/ia32/Apps/Mount.efi
index 2fd967e186..39f211a8e4 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Mount.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Mount.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Mv.efi b/EdkShellBinPkg/bin/ia32/Apps/Mv.efi
index b2c01e2398..c64d61e69c 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Mv.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Mv.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/NShell.efi b/EdkShellBinPkg/bin/ia32/Apps/NShell.efi
index 887439c38a..81e03229d9 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/NShell.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/NShell.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Openinfo.efi b/EdkShellBinPkg/bin/ia32/Apps/Openinfo.efi
index c217808fd8..3bb38a7d71 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 2ec324faa5..ef65cebf94 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Ping.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Ping.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Resets.efi b/EdkShellBinPkg/bin/ia32/Apps/Resets.efi
index 3fd0431f8a..8c72f151e2 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Resets.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Resets.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Rm.efi b/EdkShellBinPkg/bin/ia32/Apps/Rm.efi
index 7ba4b324ea..0d38f02696 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Rm.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Rm.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/SmbiosView.efi b/EdkShellBinPkg/bin/ia32/Apps/SmbiosView.efi
index e2f5a01ce0..5cfac9633c 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 465a89fa0e..dec25d3fd8 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/TelnetMgmt.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Time.efi b/EdkShellBinPkg/bin/ia32/Apps/Time.efi
index 13dcffd788..9a89ac4f40 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Time.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Time.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Touch.efi b/EdkShellBinPkg/bin/ia32/Apps/Touch.efi
index f960c239a4..8d06d7461d 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Touch.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Touch.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Type.efi b/EdkShellBinPkg/bin/ia32/Apps/Type.efi
index b1c4453577..3958f6193c 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Type.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Type.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Unload.efi b/EdkShellBinPkg/bin/ia32/Apps/Unload.efi
index 44eaab18e0..5f387c188d 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Unload.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Unload.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Ver.efi b/EdkShellBinPkg/bin/ia32/Apps/Ver.efi
index a1761bbd8b..ea313aa32b 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Ver.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Ver.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/Vol.efi b/EdkShellBinPkg/bin/ia32/Apps/Vol.efi
index 364bf1854e..563808a02c 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/Vol.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/Vol.efi
diff --git a/EdkShellBinPkg/bin/ia32/Apps/comp.efi b/EdkShellBinPkg/bin/ia32/Apps/comp.efi
index be94165720..33cb6deac8 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 01e69747ea..253b6eefbd 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 c6790b7bc4..c19d038c71 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 50f94f56b5..eb2f2b1030 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 14eb565f40..5d1c12e177 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 cc17762a20..3710171688 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 f5310d3534..27d5642c1b 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 73b7f965e9..38cc96124d 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 32cdfff5e0..f1a422acf4 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 df181734da..5ecfd273f4 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 b46c1c4efd..2b499b39eb 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 1825b20807..697e49606a 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 e8abc4f460..a08b89a400 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 6d4cf6f98f..de10abef50 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 07bf966aaf..9d22d89de1 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 0eb2800da8..b9859f5e1f 100644
--- a/EdkShellBinPkg/bin/ia32/Apps/timezone.efi
+++ b/EdkShellBinPkg/bin/ia32/Apps/timezone.efi
diff --git a/EdkShellBinPkg/bin/ia32/Shell.efi b/EdkShellBinPkg/bin/ia32/Shell.efi
index d550a0e462..11e7537315 100644
--- a/EdkShellBinPkg/bin/ia32/Shell.efi
+++ b/EdkShellBinPkg/bin/ia32/Shell.efi
diff --git a/EdkShellBinPkg/bin/ia32/Shell_Full.efi b/EdkShellBinPkg/bin/ia32/Shell_Full.efi
index 7f2dbcb0d1..7d2d0965a5 100644
--- a/EdkShellBinPkg/bin/ia32/Shell_Full.efi
+++ b/EdkShellBinPkg/bin/ia32/Shell_Full.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Attrib.efi b/EdkShellBinPkg/bin/ipf/Apps/Attrib.efi
index 810c03d455..8f82cc6615 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Attrib.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Cls.efi b/EdkShellBinPkg/bin/ipf/Apps/Cls.efi
index f7dbf3e7de..2bd2fd50b8 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Cls.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Cls.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Cp.efi b/EdkShellBinPkg/bin/ipf/Apps/Cp.efi
index 5b4b2a8341..db5534ce7f 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Cp.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Cp.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Date.efi b/EdkShellBinPkg/bin/ipf/Apps/Date.efi
index 4c456f6f28..ab46528eb9 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Date.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Date.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Dblk.efi b/EdkShellBinPkg/bin/ipf/Apps/Dblk.efi
index a55ee70d25..5b08973a81 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 60df6d67ef..64184fada0 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 fed8e686df..b043819a0e 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Devtree.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Drivers.efi b/EdkShellBinPkg/bin/ipf/Apps/Drivers.efi
index efd8042d8e..2cbbb567b2 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Drivers.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi b/EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi
index bef049503b..f42e617318 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi b/EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi
index 3c35d05360..63478782b4 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Guid.efi b/EdkShellBinPkg/bin/ipf/Apps/Guid.efi
index 41300dbc8d..42647a958e 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 18f80edc91..8e551f81dd 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 5af7e9af59..63aca35c9c 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/IpConfig.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Load.efi b/EdkShellBinPkg/bin/ipf/Apps/Load.efi
index 16c7b30ff3..06ba366239 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Load.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Load.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi b/EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi
index d16f36606e..6f45cdeb7f 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Ls.efi b/EdkShellBinPkg/bin/ipf/Apps/Ls.efi
index 049faae5b4..ad288bb663 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Ls.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Ls.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi b/EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi
index eefe73d9bd..bc39d14e86 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Mount.efi b/EdkShellBinPkg/bin/ipf/Apps/Mount.efi
index 5404faac2e..c81982f469 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Mount.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Mount.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Mv.efi b/EdkShellBinPkg/bin/ipf/Apps/Mv.efi
index 135e273a7d..46fdfd9dcb 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Mv.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Mv.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/NShell.efi b/EdkShellBinPkg/bin/ipf/Apps/NShell.efi
index aae9370be8..e4ae2f0ee3 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/NShell.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/NShell.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Openinfo.efi b/EdkShellBinPkg/bin/ipf/Apps/Openinfo.efi
index 1029942921..af823bc4f6 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 af2c71cd83..3be7fa96d9 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Ping.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Ping.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Resets.efi b/EdkShellBinPkg/bin/ipf/Apps/Resets.efi
index 0677172a7d..65ff00c73c 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Resets.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Resets.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Rm.efi b/EdkShellBinPkg/bin/ipf/Apps/Rm.efi
index 4c9b0833b4..4783a46ae9 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Rm.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Rm.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/SmbiosView.efi b/EdkShellBinPkg/bin/ipf/Apps/SmbiosView.efi
index eb35759a8c..0aeb3cf281 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 274b7f5d27..dea5604ad1 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/TelnetMgmt.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Time.efi b/EdkShellBinPkg/bin/ipf/Apps/Time.efi
index 9189c3f6a8..6ebb32e64a 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Time.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Time.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Touch.efi b/EdkShellBinPkg/bin/ipf/Apps/Touch.efi
index bee0d6f665..62f52419ac 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Touch.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Touch.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Type.efi b/EdkShellBinPkg/bin/ipf/Apps/Type.efi
index f3244bdb48..f74cf31b21 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Type.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Type.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Unload.efi b/EdkShellBinPkg/bin/ipf/Apps/Unload.efi
index f0e2052ac9..cbd63f1384 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Unload.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Unload.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Ver.efi b/EdkShellBinPkg/bin/ipf/Apps/Ver.efi
index b593853426..e1970606fa 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Ver.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Ver.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/Vol.efi b/EdkShellBinPkg/bin/ipf/Apps/Vol.efi
index 67815b094d..81efb82c29 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/Vol.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/Vol.efi
diff --git a/EdkShellBinPkg/bin/ipf/Apps/comp.efi b/EdkShellBinPkg/bin/ipf/Apps/comp.efi
index 4b12496647..9f5866442b 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 2dc4c18a30..8c02d54c53 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 5e36a6d90f..a34f927423 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 071ff19814..e86892827d 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 e6672db375..3ba378b62b 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 28074b0660..c4ab1b4ebc 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 d471cdb0b4..a91eb011cd 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 f86e0a6c29..d353ecbe99 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 85ddd42790..5f9b68ee23 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 2d2c0137da..bb9323e134 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 9d40ddf6cc..a6d4042b13 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 cb13b43479..b660b0e805 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 6f3435254e..4df060fb66 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 b01b07636f..d9266c6740 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 0d5ee0c99e..cd56b52236 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 a4e530ac6f..9bd70b2e3d 100644
--- a/EdkShellBinPkg/bin/ipf/Apps/timezone.efi
+++ b/EdkShellBinPkg/bin/ipf/Apps/timezone.efi
diff --git a/EdkShellBinPkg/bin/ipf/Shell.efi b/EdkShellBinPkg/bin/ipf/Shell.efi
index 12814e9940..c23b36f96e 100644
--- a/EdkShellBinPkg/bin/ipf/Shell.efi
+++ b/EdkShellBinPkg/bin/ipf/Shell.efi
diff --git a/EdkShellBinPkg/bin/ipf/Shell_Full.efi b/EdkShellBinPkg/bin/ipf/Shell_Full.efi
index 2772db4274..5c32709b0f 100644
--- a/EdkShellBinPkg/bin/ipf/Shell_Full.efi
+++ b/EdkShellBinPkg/bin/ipf/Shell_Full.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Attrib.efi b/EdkShellBinPkg/bin/x64/Apps/Attrib.efi
index da1244d3f9..d851dbbaf7 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Attrib.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Attrib.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Cls.efi b/EdkShellBinPkg/bin/x64/Apps/Cls.efi
index 87f80e48cd..076fcf2cc2 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Cls.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Cls.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Cp.efi b/EdkShellBinPkg/bin/x64/Apps/Cp.efi
index 7968557679..2d545f8f44 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Cp.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Cp.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Date.efi b/EdkShellBinPkg/bin/x64/Apps/Date.efi
index b65c1c6d9d..007f55ed65 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Date.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Date.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Dblk.efi b/EdkShellBinPkg/bin/x64/Apps/Dblk.efi
index 2f87d8b25c..934cc5a456 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 135c0e268e..b2db657854 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 f490b4d434..372d1066fc 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Devtree.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Devtree.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Drivers.efi b/EdkShellBinPkg/bin/x64/Apps/Drivers.efi
index 0513e4754b..3d497cd4b9 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Drivers.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Drivers.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi b/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi
index 20cce7867a..61e5db0622 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Drvcfg.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi b/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi
index fd11390b6b..d922525449 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Drvdiag.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Guid.efi b/EdkShellBinPkg/bin/x64/Apps/Guid.efi
index 001be9d885..b932975ae4 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 9478cb21d2..ece81006e6 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 08e3888df8..89de0b092a 100644
--- a/EdkShellBinPkg/bin/x64/Apps/IpConfig.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/IpConfig.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Load.efi b/EdkShellBinPkg/bin/x64/Apps/Load.efi
index fbdea69135..719870ca03 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Load.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Load.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi b/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi
index 6cb97f799d..1b6eb9cc5c 100644
--- a/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/LoadPciRom.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Ls.efi b/EdkShellBinPkg/bin/x64/Apps/Ls.efi
index ea962e4d50..e7ae15bd18 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Ls.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Ls.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi b/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi
index 1e474d9430..85a6b6a958 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Mkdir.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Mount.efi b/EdkShellBinPkg/bin/x64/Apps/Mount.efi
index 6b34019537..04dc63f607 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Mount.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Mount.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Mv.efi b/EdkShellBinPkg/bin/x64/Apps/Mv.efi
index 623a3944d8..0d8b5aae30 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Mv.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Mv.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/NShell.efi b/EdkShellBinPkg/bin/x64/Apps/NShell.efi
index d352c863a8..2a80b10bde 100644
--- a/EdkShellBinPkg/bin/x64/Apps/NShell.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/NShell.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Openinfo.efi b/EdkShellBinPkg/bin/x64/Apps/Openinfo.efi
index f949641b1e..85a07e1691 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 f009b8f44f..cce00636fc 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Ping.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Ping.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Resets.efi b/EdkShellBinPkg/bin/x64/Apps/Resets.efi
index 1f12c2f34c..0d36e1e3fd 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Resets.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Resets.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Rm.efi b/EdkShellBinPkg/bin/x64/Apps/Rm.efi
index b761821de3..9e879d5ff0 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Rm.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Rm.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/SmbiosView.efi b/EdkShellBinPkg/bin/x64/Apps/SmbiosView.efi
index 139ea98160..258b6424ef 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 2922e536d7..6d4e265001 100644
--- a/EdkShellBinPkg/bin/x64/Apps/TelnetMgmt.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/TelnetMgmt.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Time.efi b/EdkShellBinPkg/bin/x64/Apps/Time.efi
index 8f6b5feb97..5432454550 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Time.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Time.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Touch.efi b/EdkShellBinPkg/bin/x64/Apps/Touch.efi
index c3adf1aab3..aa5faa936c 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Touch.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Touch.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Type.efi b/EdkShellBinPkg/bin/x64/Apps/Type.efi
index 8d706ba03e..0509d1658f 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Type.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Type.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Unload.efi b/EdkShellBinPkg/bin/x64/Apps/Unload.efi
index 87c70629b2..a4e0a59178 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Unload.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Unload.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Ver.efi b/EdkShellBinPkg/bin/x64/Apps/Ver.efi
index a504d59b3e..fb40781a4c 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Ver.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Ver.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/Vol.efi b/EdkShellBinPkg/bin/x64/Apps/Vol.efi
index b5eb77a9c0..620c8f5d17 100644
--- a/EdkShellBinPkg/bin/x64/Apps/Vol.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/Vol.efi
diff --git a/EdkShellBinPkg/bin/x64/Apps/comp.efi b/EdkShellBinPkg/bin/x64/Apps/comp.efi
index dbeac5d570..94eb6e76fb 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 a4388d0177..60af4a4dd1 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 dc658fc083..7c2cbe3184 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 89ab56dd72..4e778fe463 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 955fc3f4d5..22a1b74917 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 6dbcb9e94b..6f8bafa9b0 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 feea5ef7c6..3972e41dfe 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 7700ac30e3..9067b3a16b 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 d6030ca367..4380766cda 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 51f4051b4c..cc331b7258 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 53cd43ee68..1e53027349 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 2c5beff9cd..b8f6b26fb3 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 f9ef0837f3..03ef26e550 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 f44248be84..a57b2f72ec 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 1c6de1a7c7..31a1573e58 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 a50a0229e7..12c52ff1a9 100644
--- a/EdkShellBinPkg/bin/x64/Apps/timezone.efi
+++ b/EdkShellBinPkg/bin/x64/Apps/timezone.efi
diff --git a/EdkShellBinPkg/bin/x64/Shell.efi b/EdkShellBinPkg/bin/x64/Shell.efi
index 3ae4afe9c3..9893e1e8a9 100644
--- a/EdkShellBinPkg/bin/x64/Shell.efi
+++ b/EdkShellBinPkg/bin/x64/Shell.efi
diff --git a/EdkShellBinPkg/bin/x64/Shell_full.efi b/EdkShellBinPkg/bin/x64/Shell_full.efi
index 8dcba43c32..5f23f3bbb6 100644
--- a/EdkShellBinPkg/bin/x64/Shell_full.efi
+++ b/EdkShellBinPkg/bin/x64/Shell_full.efi