X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ArmPlatformPkg%2FBds%2FBootMenu.c;h=591e7e683b8382759be6b92c3cda25686857d060;hp=b18a58bd8c77a3869b8e5b6fcf0a464cdc4fc7d1;hb=74b961324c1cc3ae3f97523e085fb169ec63b608;hpb=656416bc2ee1409492343cde3f27ce717e90fdf7

diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c
index b18a58bd8c..591e7e683b 100644
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -116,8 +116,7 @@ BootMenuAddBootOption (
   EFI_STATUS               Status;
   BDS_SUPPORTED_DEVICE*    SupportedBootDevice;
   BDS_LOADER_ARGUMENTS     BootArguments;
-  CHAR8                    AsciiBootDescription[BOOT_DEVICE_DESCRIPTION_MAX];
-  CHAR16                   *BootDescription;
+  CHAR16                    BootDescription[BOOT_DEVICE_DESCRIPTION_MAX];
   UINT32                   Attributes;
   BDS_LOADER_TYPE          BootType;
   BDS_LOAD_OPTION          *BdsLoadOption;
@@ -171,24 +170,18 @@ BootMenuAddBootOption (
   }
 
   Print(L"Description for this new Entry: ");
-  Status = GetHIInputAscii (AsciiBootDescription,BOOT_DEVICE_DESCRIPTION_MAX);
+  Status = GetHIInputStr (BootDescription, BOOT_DEVICE_DESCRIPTION_MAX);
   if (EFI_ERROR(Status)) {
     Status = EFI_ABORTED;
     goto FREE_DEVICE_PATH;
   }
 
-  // Convert Ascii into Unicode
-  BootDescription = (CHAR16*)AllocatePool(AsciiStrSize(AsciiBootDescription) * sizeof(CHAR16));
-  AsciiStrToUnicodeStr (AsciiBootDescription, BootDescription);
-
   // Create new entry
   Status = BootOptionCreate (Attributes, BootDescription, DevicePath, BootType, &BootArguments, &BdsLoadOption);
   if (!EFI_ERROR(Status)) {
     InsertTailList (BootOptionsList,&BdsLoadOption->Link);
   }
 
-  FreePool (BootDescription);
-
 FREE_DEVICE_PATH:
   FreePool (DevicePath);
 
@@ -303,8 +296,7 @@ BootMenuUpdateBootOption (
   BDS_LOAD_OPTION           *BootOption;
   BDS_LOAD_OPTION_SUPPORT   *DeviceSupport;
   BDS_LOADER_ARGUMENTS      BootArguments;
-  CHAR8                     AsciiBootDescription[BOOT_DEVICE_DESCRIPTION_MAX];
-  CHAR16                    *BootDescription;
+  CHAR16                        BootDescription[BOOT_DEVICE_DESCRIPTION_MAX];
   EFI_DEVICE_PATH*          DevicePath;
   BDS_LOADER_TYPE           BootType;
 
@@ -365,22 +357,15 @@ BootMenuUpdateBootOption (
   }
 
   Print(L"Description for this new Entry: ");
-  UnicodeStrToAsciiStr (BootOption->Description, AsciiBootDescription);
-  Status = EditHIInputAscii (AsciiBootDescription, BOOT_DEVICE_DESCRIPTION_MAX);
+  Status = EditHIInputStr (BootDescription, BOOT_DEVICE_DESCRIPTION_MAX);
   if (EFI_ERROR(Status)) {
     Status = EFI_ABORTED;
     goto FREE_DEVICE_PATH;
   }
 
-  // Convert Ascii into Unicode
-  BootDescription = (CHAR16*)AllocatePool(AsciiStrSize(AsciiBootDescription) * sizeof(CHAR16));
-  AsciiStrToUnicodeStr (AsciiBootDescription, BootDescription);
-
   // Update the entry
   Status = BootOptionUpdate (BootOption, BootOption->Attributes, BootDescription, DevicePath, BootType, &BootArguments);
 
-  FreePool (BootDescription);
-
 FREE_DEVICE_PATH:
   FreePool (DevicePath);