Reviewed-By: Olivier Martin <[email protected]> > -----Original Message----- > From: Laszlo Ersek [mailto:[email protected]] > Sent: 11 December 2014 02:46 > To: [email protected]; [email protected]; > [email protected]; [email protected] > Subject: [edk2] [PATCH v3 11/13] ArmVirtualizationPkg: > PlatformIntelBdsLib: adhere to QEMU's boot order > > We have all the required pieces in place. Let's call > SetBootOrderFromQemu() in PlatformBdsPolicyBehavior(). > > We disable OFW-to-UEFI device path fragment translation for virtio-pci, > and enable it only virtio-mmio at this time. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek <[email protected]> > --- > > ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/Platfor > mIntelBdsLib.inf | 2 ++ > > ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBd > sPlatform.c | 10 ++++++++++ > ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc > | 4 ++++ > 3 files changed, 16 insertions(+) > > diff --git > a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/Platf > ormIntelBdsLib.inf > b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/Platf > ormIntelBdsLib.inf > index d635f13..efd50f3 100644 > --- > a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/Platf > ormIntelBdsLib.inf > +++ > b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/Platf > ormIntelBdsLib.inf > @@ -40,6 +40,7 @@ > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > + OvmfPkg/OvmfPkg.dec > > [LibraryClasses] > BaseLib > @@ -51,6 +52,7 @@ > UefiBootServicesTableLib > PcdLib > GenericBdsLib > + QemuBootOrderLib > > [Guids] > gArmGlobalVariableGuid > diff --git > a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/Intel > BdsPlatform.c > b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/Intel > BdsPlatform.c > index 75b956b..9b91368 100644 > --- > a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/Intel > BdsPlatform.c > +++ > b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/Intel > BdsPlatform.c > @@ -15,6 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, > EITHER EXPRESS OR IMPLIED. > > #include "IntelBdsPlatform.h" > > +#include <Library/QemuBootOrderLib.h> > + > /// > /// Predefined platform default time out value > /// > @@ -305,6 +307,14 @@ PlatformBdsPolicyBehavior ( > > BdsLibConnectAll (); > BdsLibEnumerateAllBootOption (BootOptionList); > + > + SetBootOrderFromQemu (BootOptionList); > + // > + // The BootOrder variable may have changed, reload the in-memory > list with > + // it. > + // > + BdsLibBuildOptionFromVar (BootOptionList, L"BootOrder"); > + > PlatformBdsEnterFrontPage (gPlatformBootTimeOutDefault, TRUE); > } > > diff --git > a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc > b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc > index e16c02e..d2419d2 100644 > --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc > +++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc > @@ -54,6 +54,7 @@ > > GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsL > ib.inf > > PlatformBdsLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformInte > lBdsLib/PlatformIntelBdsLib.inf > > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customiz > edDisplayLib.inf > + > QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf > !endif > > [LibraryClasses.common.UEFI_DRIVER] > @@ -78,6 +79,9 @@ > > ####################################################################### > ######### > > [PcdsFeatureFlag.common] > + gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|FALSE > + gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|TRUE > + > ## If TRUE, Graphics Output Protocol will be installed on virtual > handle created by ConsplitterDxe. > # It could be set FALSE to save size. > gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|FALSE > -- > 1.8.3.1 > > > > ----------------------------------------------------------------------- > ------- > Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server > from Actuate! Instantly Supercharge Your Business Reports and > Dashboards > with Interactivity, Sharing, Native Excel Exports, App Integration & > more > Get technology previously reserved for billion-dollar corporations, > FREE > http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.c > lktrk > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/edk2-devel
-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2557590 ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2548782 ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
