Message ID | 20180807205112.2008-1-leif.lindholm@linaro.org |
---|---|
State | New |
Headers | show |
Series | [edk2,edk2-platforms] Silicon/Hisilicon: add PlatformBootManagerUnableToBoot() to PlatformBm | expand |
On 7 August 2018 at 22:51, Leif Lindholm <leif.lindholm@linaro.org> wrote: > edk2 commit 1010873becc5, > ("MdeModulePkg/BdsDxe: Call PlatformBootManagerUnableToBoot()") broke the > d0x build, since they use their own PlatformBootManagerLib, which did not > include this function. > > Implement a trivial one, that just returns. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > > NOTE: The upstream build is currently broken. This failure needs to be > addressed before d02 deletion and d03 fix can go in. > > Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c > index 7dd5ba615c..aa6db929ca 100644 > --- a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c > +++ b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c > @@ -641,3 +641,19 @@ PlatformBootManagerWaitCallback ( > 0 > ); > } > + > +/** > + The function is called when no boot option could be launched, > + including platform recovery options and options pointing to applications > + built into firmware volumes. > + > + If this function returns, BDS attempts to enter an infinite loop. > +**/ > +VOID > +EFIAPI > +PlatformBootManagerUnableToBoot ( > + VOID > + ) > +{ > + return; > +} > -- > 2.11.0 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
On Tue, Aug 07, 2018 at 10:52:59PM +0200, Ard Biesheuvel wrote: > On 7 August 2018 at 22:51, Leif Lindholm <leif.lindholm@linaro.org> wrote: > > edk2 commit 1010873becc5, > > ("MdeModulePkg/BdsDxe: Call PlatformBootManagerUnableToBoot()") broke the > > d0x build, since they use their own PlatformBootManagerLib, which did not > > include this function. > > > > Implement a trivial one, that just returns. > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Thanks, pushed as d346a222df. / Leif > > --- > > > > NOTE: The upstream build is currently broken. This failure needs to be > > addressed before d02 deletion and d03 fix can go in. > > > > Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c | 16 ++++++++++++++++ > > 1 file changed, 16 insertions(+) > > > > diff --git a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c > > index 7dd5ba615c..aa6db929ca 100644 > > --- a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c > > +++ b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c > > @@ -641,3 +641,19 @@ PlatformBootManagerWaitCallback ( > > 0 > > ); > > } > > + > > +/** > > + The function is called when no boot option could be launched, > > + including platform recovery options and options pointing to applications > > + built into firmware volumes. > > + > > + If this function returns, BDS attempts to enter an infinite loop. > > +**/ > > +VOID > > +EFIAPI > > +PlatformBootManagerUnableToBoot ( > > + VOID > > + ) > > +{ > > + return; > > +} > > -- > > 2.11.0 > > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c index 7dd5ba615c..aa6db929ca 100644 --- a/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c +++ b/Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c @@ -641,3 +641,19 @@ PlatformBootManagerWaitCallback ( 0 ); } + +/** + The function is called when no boot option could be launched, + including platform recovery options and options pointing to applications + built into firmware volumes. + + If this function returns, BDS attempts to enter an infinite loop. +**/ +VOID +EFIAPI +PlatformBootManagerUnableToBoot ( + VOID + ) +{ + return; +}
edk2 commit 1010873becc5, ("MdeModulePkg/BdsDxe: Call PlatformBootManagerUnableToBoot()") broke the d0x build, since they use their own PlatformBootManagerLib, which did not include this function. Implement a trivial one, that just returns. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> --- NOTE: The upstream build is currently broken. This failure needs to be addressed before d02 deletion and d03 fix can go in. Silicon/Hisilicon/Library/PlatformBootManagerLib/PlatformBm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel