ArmPlatformPkg/Bds: Added support to pass parameters to EFI applications

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15452 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 15 insertions, 7 deletions

diff --git a/ArmPlatformPkg/Bds/Bds.c b/ArmPlatformPkg/Bds/Bds.c
index 288884305..fa9dfbafc 100644
--- a/ArmPlatformPkg/Bds/Bds.c
+++ b/ArmPlatformPkg/Bds/Bds.c
@@ -321,8 +321,8 @@ DefineDefaultBootEntries (
 

         OptionalData = (UINT8*)BootArguments;

       } else {

-        OptionalData = NULL;

-        OptionalDataSize = 0;

+        OptionalData = (UINT8*)DefaultBootArgument;

+        OptionalDataSize = CmdLineSize;

       }

 

       BootOptionCreate (LOAD_OPTION_ACTIVE | LOAD_OPTION_CATEGORY_BOOT,

diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c
index b04ebd35a..9ca703842 100644
--- a/ArmPlatformPkg/Bds/BootMenu.c
+++ b/ArmPlatformPkg/Bds/BootMenu.c
@@ -120,7 +120,8 @@ BootMenuAddBootOption (
   BDS_SUPPORTED_DEVICE*     SupportedBootDevice;

   ARM_BDS_LOADER_ARGUMENTS* BootArguments;

   CHAR16                    BootDescription[BOOT_DEVICE_DESCRIPTION_MAX];

-  CHAR8                     CmdLine[BOOT_DEVICE_OPTION_MAX];

+  CHAR8                     AsciiCmdLine[BOOT_DEVICE_OPTION_MAX];

+  CHAR16                    CmdLine[BOOT_DEVICE_OPTION_MAX];

   UINT32                    Attributes;

   ARM_BDS_LOADER_TYPE       BootType;

   BDS_LOAD_OPTION_ENTRY     *BdsLoadOptionEntry;

@@ -188,13 +189,13 @@ BootMenuAddBootOption (
     }

 

     Print(L"Arguments to pass to the binary: ");

-    Status = GetHIInputAscii (CmdLine,BOOT_DEVICE_OPTION_MAX);

+    Status = GetHIInputAscii (AsciiCmdLine, BOOT_DEVICE_OPTION_MAX);

     if (EFI_ERROR(Status)) {

       Status = EFI_ABORTED;

       goto FREE_DEVICE_PATH;

     }

 

-    CmdLineSize = AsciiStrSize (CmdLine);

+    CmdLineSize = AsciiStrSize (AsciiCmdLine);

     InitrdSize = GetDevicePathSize (InitrdPath);

 

     OptionalDataSize = sizeof(ARM_BDS_LOADER_ARGUMENTS) + CmdLineSize + InitrdSize;

@@ -207,8 +208,15 @@ BootMenuAddBootOption (
 

     OptionalData = (UINT8*)BootArguments;

   } else {

-    OptionalData = NULL;

-    OptionalDataSize = 0;

+    Print (L"Arguments to pass to the EFI Application: ");

+    Status = GetHIInputStr (CmdLine, BOOT_DEVICE_OPTION_MAX);

+    if (EFI_ERROR (Status)) {

+      Status = EFI_ABORTED;

+      goto EXIT;

+    }

+

+    OptionalData = (UINT8*)CmdLine;

+    OptionalDataSize = StrSize (CmdLine);

   }

 

   Print(L"Description for this new Entry: ");