Reviewed-by: Eric Dong <[email protected]> > -----Original Message----- > From: Ni, Ruiyu > Sent: Wednesday, June 22, 2016 3:26 PM > To: [email protected] > Cc: Dong, Eric; Chan, Amy > Subject: [PATCH] MdeModulePkg/Bds: Do not boot to UI again when BootNext > points to UI > > Per UEFI spec the successful returning of boot option triggers boot > to UI. But when the BootNext just points to UI, it causes confusing. > So the patch avoids booting to UI again when the BootNext points to > UI. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ruiyu Ni <[email protected]> > Cc: Eric Dong <[email protected]> > Cc: Amy Chan <[email protected]> > --- > MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > index 3734ff9..741ddc3 100644 > --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > @@ -6,7 +6,7 @@ > to enter BDS phase. > > (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> > -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> > +Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR> > 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 > @@ -923,9 +923,10 @@ BdsEntry ( > if (!EFI_ERROR (Status)) { > EfiBootManagerBoot (&LoadOption); > EfiBootManagerFreeLoadOption (&LoadOption); > - if (LoadOption.Status == EFI_SUCCESS) { > + if ((LoadOption.Status == EFI_SUCCESS) && (LoadOption.OptionNumber > != BootManagerMenu.OptionNumber)) { > // > // Boot to Boot Manager Menu upon EFI_SUCCESS > + // Exception: Do not boot again when the BootNext points to Boot > Manager Menu. > // > EfiBootManagerBoot (&BootManagerMenu); > } > -- > 2.8.3.windows.1
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
