From patchwork Tue Oct 25 17:15:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 79254 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3230229qge; Tue, 25 Oct 2016 10:17:24 -0700 (PDT) X-Received: by 10.36.27.68 with SMTP id 65mr2616167its.21.1477415844833; Tue, 25 Oct 2016 10:17:24 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id h138si13302001ioh.193.2016.10.25.10.17.24; Tue, 25 Oct 2016 10:17:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 68BB760EF1; Tue, 25 Oct 2016 17:17:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 4C58461757; Tue, 25 Oct 2016 17:16:43 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6873661760; Tue, 25 Oct 2016 17:16:37 +0000 (UTC) Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by lists.linaro.org (Postfix) with ESMTPS id 2AAC86175D for ; Tue, 25 Oct 2016 17:16:02 +0000 (UTC) Received: by mail-wm0-f46.google.com with SMTP id b80so175381620wme.1 for ; Tue, 25 Oct 2016 10:16:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L+7q8O1Ud2NkAPNZxHBTEBdM6A41YrWb79zWkjPH58M=; b=hwCBPXfo6DAkD3Km4hW/zHWQB2gUp7VP2hJVfM/YPKfHyHQO7zASh8FujeDSacvffY 0nGJsXJdU6lPtIb/e3JW5jLohsZHDCaD+Kt5lKOkAhHSaLdtA1wl2ef4dzuuUbWT7ry4 3WFs8j9onpUN7O4KOEOZhg8K65SS/KrILGTHfaJbLFFkXBqtNfUjbQYj13tKgoROL3Xb bpV5XmzBOADilvoCthMV0HN2WcB2DNUsd/esv3rbJFldpTVCVUINqv7xmus1bj9ulLFV W6nDT1LTo4e6Pde3C3lBzUkPDpgMPAg1/JQU5lfEnUIsN5mWJcAlOLv900STBlXEigHo W23g== X-Gm-Message-State: ABUngve2K/H7LgoBtK30EesWCN23i4medsyiRQfsDm0SLZgudc7FfF6MY+ywmFnZiC/YoHtiVF4= X-Received: by 10.28.8.11 with SMTP id 11mr4558189wmi.27.1477415760955; Tue, 25 Oct 2016 10:16:00 -0700 (PDT) Received: from localhost.localdomain ([105.129.136.43]) by smtp.gmail.com with ESMTPSA id w65sm4683022wmd.23.2016.10.25.10.15.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 10:15:59 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Tue, 25 Oct 2016 18:15:36 +0100 Message-Id: <1477415736-11265-6-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477415736-11265-1-git-send-email-ard.biesheuvel@linaro.org> References: <1477415736-11265-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [Linaro-uefi] [PATCH 5/5] Platform/ARM/FVP: switch to generic BDS X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Drop the USE_ARM_BDS define, and replace both the ARM and Intel BDSs with the generic BDS. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 12 +++++++----- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf | 7 ++----- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 8 -------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc index d019b09f6456..cf4b803096f1 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc @@ -315,10 +315,12 @@ # Bds # MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf -!if $(USE_ARM_BDS) == TRUE - ArmPlatformPkg/Bds/Bds.inf -!else MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf -!endif + 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 + } diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf index 74cc18fc012e..2ace4d8e04c3 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf @@ -162,12 +162,10 @@ FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0 # Bds # INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf -!if $(USE_ARM_BDS) == TRUE - INF ArmPlatformPkg/Bds/Bds.inf -!else INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + INF MdeModulePkg/Application/UiApp/UiApp.inf # # TianoCore logo (splash screen) @@ -175,7 +173,6 @@ FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0 FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { SECTION RAW = MdeModulePkg/Logo/Logo.bmp } -!endif # FV Filesystem INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc index 99d97c8995ca..56f22a01f69b 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -12,7 +12,6 @@ # [Defines] - USE_ARM_BDS = FALSE SECURE_BOOT_ENABLE = FALSE [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] @@ -119,7 +118,6 @@ SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf # BDS Libraries - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -151,12 +149,8 @@ !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf -!if $(USE_ARM_BDS) == FALSE CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf - GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf - PlatformBdsLib|ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf -!endif [LibraryClasses.common.SEC] ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf @@ -432,10 +426,8 @@ # Shell. gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE -!if $(USE_ARM_BDS) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } -!endif # use the TTY terminal type (which has a working backspace) gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4