From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com [IPv6:2a00:1450:400c:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B1D841A1E46 for ; Tue, 25 Oct 2016 10:41:55 -0700 (PDT) Received: by mail-wm0-x231.google.com with SMTP id c78so176456161wme.0 for ; Tue, 25 Oct 2016 10:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=X36THjowq1eVznZlot1dSNGpmbdjX+XyoZ6cUDFZz7M=; b=BTdRxJAVDvjgxKgye5pq9/3i5ECYYn7fq0OczdbysGW86EZvgp/izlRFzSl+P6yN2X oFYifZoGIb5H+XTq9oSCPCnN1nKqaMpqtPrdXr2b07Y4He1S47SHTlnJ8Ya7t4YnuG7/ 3Et0s89wDah2oBMX537ZPErbDArm8SI7ADT/Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=X36THjowq1eVznZlot1dSNGpmbdjX+XyoZ6cUDFZz7M=; b=Iv1/THLmovfZNOqWknm+mJwmwBS272wUNqCmaaw1lqt+qbhj5bAfdwqkIh/ue70mRR xZHx5YGbTJ5afd0Qeen+SQWcnODAVbmwCKAPdQS8V1pb/Dzpj9/KotrxGv8CRVo6qFXo RKoOPpIAlO5K2NTN31538pm8kfCJeqJxz5fjWSwW2Ni0si+ybTZrqQb009uWrKRpWCk4 zCNVEtQv2wAnIRY+e/S3LRp+l9W3MPI+gFUsaqfx6urpyDkm+HROCibffWvYxX+w0pAS WwcenIvA1o1DnpDxPsqBnVyKKnFfkryjKJPSh6MkcyT5nBBhKjD4EehqASBpJ6c8lXLJ 2ljQ== X-Gm-Message-State: ABUngvefF/qMePlyY0OdJiNoxxoETBoTWtWADJjzroijqhR50GfhF4untZikpPtM0JO74cMX X-Received: by 10.194.205.136 with SMTP id lg8mr17391795wjc.1.1477417314124; Tue, 25 Oct 2016 10:41:54 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id pe5sm26328897wjb.15.2016.10.25.10.41.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Oct 2016 10:41:53 -0700 (PDT) Date: Tue, 25 Oct 2016 18:41:51 +0100 From: Leif Lindholm To: Ard Biesheuvel Cc: edk2-devel@lists.01.org, lersek@redhat.com Message-ID: <20161025174151.GI1161@bivouac.eciton.net> References: <1477413440-680-1-git-send-email-ard.biesheuvel@linaro.org> <1477413440-680-3-git-send-email-ard.biesheuvel@linaro.org> MIME-Version: 1.0 In-Reply-To: <1477413440-680-3-git-send-email-ard.biesheuvel@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH 2/3] BeagleBoardPkg: move to generic BDS X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2016 17:41:56 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Oct 25, 2016 at 05:37:19PM +0100, Ard Biesheuvel wrote: > Drop the ARM BDS and related dependencies, and switch to the generic > BDS instead. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm > --- > BeagleBoardPkg/BeagleBoardPkg.dsc | 60 +++++++++++++++++--- > BeagleBoardPkg/BeagleBoardPkg.fdf | 7 ++- > 2 files changed, 56 insertions(+), 11 deletions(-) > > diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc > index 1e21ed1463a6..2951c689c753 100644 > --- a/BeagleBoardPkg/BeagleBoardPkg.dsc > +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc > @@ -128,9 +128,17 @@ [LibraryClasses.common] > DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf > > NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf > - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf > FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf > > + UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf > + PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > + CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf > + > + # UiApp dependencies > + ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf > + FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf > + DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf > + > [LibraryClasses.common.SEC] > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf > @@ -328,6 +336,7 @@ [PcdsFixedAtBuild.common] > gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|10 > gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0 > > + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4 > > # > # Beagle board Specific PCDs > @@ -368,6 +377,14 @@ [PcdsFixedAtBuild.common] > gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(E68088EF-D1A4-4336-C1DB-4D3A204730A6)" > gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()" > > + # GUID of the UEFI Shell > + gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > + > + # GUID of the UI app > + gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > + > + gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE > + > ################################################################################ > # > # Components Section - list of all EDK II Modules needed by this Platform > @@ -475,13 +492,38 @@ [Components.common] > # > MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > - ArmPlatformPkg/Bds/Bds.inf > - > - # Legacy Linux Loader > - ArmPkg/Application/LinuxLoader/LinuxLoader.inf > + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > + MdeModulePkg/Application/UiApp/UiApp.inf { > + > + NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf > + NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > + NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf > + } > + ShellPkg/Application/Shell/Shell.inf { > + > + ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf > + NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf > + NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf > + NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf > + NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf > + NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf > + NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf > + NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf > + NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf > + HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf > + PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > + BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf > > - # > - # Example Application > - # > - MdeModulePkg/Application/HelloWorld/HelloWorld.inf > + > + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 > + } > > + # Legacy Linux Loader > + ArmPkg/Application/LinuxLoader/LinuxLoader.inf { > + > + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf > + } > diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf > index 733b5a43d318..fcaf44abb5cf 100644 > --- a/BeagleBoardPkg/BeagleBoardPkg.fdf > +++ b/BeagleBoardPkg/BeagleBoardPkg.fdf > @@ -175,14 +175,17 @@ [FV.FvMain] > # > # UEFI application (Shell Embedded Boot Loader) > # > - INF ShellBinPkg/UefiShell/UefiShell.inf > + INF ShellPkg/Application/Shell/Shell.inf > > # > # Bds > # > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > - INF ArmPlatformPkg/Bds/Bds.inf > + INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > + INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > + INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > + INF MdeModulePkg/Application/UiApp/UiApp.inf > > # Legacy Linux Loader > INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf > -- > 2.7.4 >