diff options
| author | Steven Kinney <steven.kinney@amd.com> | 2014-04-17 13:42:47 -0500 |
|---|---|---|
| committer | Steven Kinney <steven.kinney@amd.com> | 2014-04-17 13:42:47 -0500 |
| commit | 5261f4659a94e49046d26c6d6d2b2f75d7aca289 (patch) | |
| tree | c85e326534133066ae301b48525d034a4735b2a6 /ArmPlatformPkg/Bds/BdsHelper.c | |
| parent | 4533f02a98912c745b036d8e6e836e942f244d12 (diff) | |
| parent | 48c8a38e05b73fc8b8eb72dbbdafa02a81b97818 (diff) | |
Fix merge conflicts.linaro-edk2-2014.04
Merge branch 'release-prep'
Conflicts:
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
Signed-off-by: Steven Kinney <steven.kinney@amd.com>
Diffstat (limited to 'ArmPlatformPkg/Bds/BdsHelper.c')
| -rw-r--r-- | ArmPlatformPkg/Bds/BdsHelper.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ArmPlatformPkg/Bds/BdsHelper.c b/ArmPlatformPkg/Bds/BdsHelper.c index d55404619..1c233d76c 100644 --- a/ArmPlatformPkg/Bds/BdsHelper.c +++ b/ArmPlatformPkg/Bds/BdsHelper.c @@ -187,9 +187,7 @@ GetHIInputBoolean ( while(1) {
Print (L"[y/n] ");
- // Set MaxCmdLine to 3 to give space for carriage return (when the user
- // hits enter) and terminal '\0'.
- Status = GetHIInputStr (CmdBoolean, 3);
+ Status = GetHIInputStr (CmdBoolean, 2); if (EFI_ERROR(Status)) {
return Status;
} else if ((CmdBoolean[0] == L'y') || (CmdBoolean[0] == L'Y')) {
|