From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-x230.google.com (mail-wr0-x230.google.com [IPv6:2a00:1450:400c:c0c::230]) (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 20642821CF for ; Wed, 1 Mar 2017 00:05:33 -0800 (PST) Received: by mail-wr0-x230.google.com with SMTP id g10so24322171wrg.2 for ; Wed, 01 Mar 2017 00:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=0+u3gie4OHDxtilhuyoVW2DrLEyd8zHhBq9LQF0bncY=; b=hWYcLm52HxBJH7wGQ2Go7sOQ+g6wgsIjqVKFpbiClEmEDYQ4S6cYLXdNTVexNTZ5Uq KAyYZbxFh7D2+jBNpUp5tuK26s5MW3YRNZk7bUvjUxADQE7VRoWYw/Jk3V4EpAfj/dQ6 rOWzE0oypOjaKxH4RPLwu4vbpGzNaHO592aog= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0+u3gie4OHDxtilhuyoVW2DrLEyd8zHhBq9LQF0bncY=; b=UzPGilLljrAzT2xRAd637CVBxLVPJLpL3HJE0YnnceMwsqWptgcJJk7ppJbGMDT68C 7aE/3RiPfeYUyDyWq5m95AfLE1omgh+ib1TtU9fkNSaDKldEodAimC4ibMZuolDXdlRk WkUTRyoSAdoA5B4aRfLwdRt3ukY/V0TleehG0Az6jzFAKuDJL6XqEeysffjpfBFzNNAJ 6YVUsK4smTPRZNLimg+t98kVP1yhJ6difT0AVHx86xThgZU2KfPEJELGesD27dThoqjh s/+qXuQ2ZD01isCKlJrvo8XoKTxfrMjb1fbkWTvpaCenEDAtcKADmZudushE+O4WXqQH Jt5Q== X-Gm-Message-State: AMke39kiSAnFPixi0sevzny3EJPFr3Dwty8ScBaAxVgjAMobJykRthgfyKjfFJXz8FHy/hOu X-Received: by 10.223.163.206 with SMTP id m14mr6547906wrb.34.1488355531297; Wed, 01 Mar 2017 00:05:31 -0800 (PST) Received: from localhost.localdomain ([105.147.1.203]) by smtp.gmail.com with ESMTPSA id y145sm21654238wmc.17.2017.03.01.00.05.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Mar 2017 00:05:30 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Cc: ruiyu.ni@intel.com, Ard Biesheuvel Date: Wed, 1 Mar 2017 08:05:25 +0000 Message-Id: <1488355525-29098-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [PATCH] ArmVirtPkg: move UefiBootManagerLib resolution to ArmVirt.dsc.inc 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: Wed, 01 Mar 2017 08:05:33 -0000 Recent changes to ShellPkg require a resolution for UefiBootManagerLib for all platforms in ArmVirtPkg. So move the resolution to the shared include ArmVirt.dsc.inc. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.dsc.inc | 1 + ArmVirtPkg/ArmVirtQemu.dsc | 1 - ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index d40ea69b072d..2b0a44e14d24 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -151,6 +151,7 @@ [LibraryClasses.common] AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf + UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf [LibraryClasses.common.SEC] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 00cdd7c20201..615e1fca4877 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -60,7 +60,6 @@ [LibraryClasses.common] NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf - UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 8354b13ddb1a..e4902690123c 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -59,7 +59,6 @@ [LibraryClasses.common] NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf - UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf -- 2.7.4