From patchwork Tue Dec 11 15:02:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153472 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp716521ljp; Tue, 11 Dec 2018 07:03:00 -0800 (PST) X-Google-Smtp-Source: AFSGD/WX+Dvp/zriHQ/Ox0uAoiU3pkhtD1yL4leUm/34I5EKJeE1QJk3fiohuTCWyfguMkQXt5ZL X-Received: by 2002:a17:902:8e8b:: with SMTP id bg11mr16661886plb.332.1544540580536; Tue, 11 Dec 2018 07:03:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544540580; cv=none; d=google.com; s=arc-20160816; b=LNghtx05XuHciOAT+ijmlZpljgXvpYnSmN5YAeBYf1Mlb383JabQ6QcalrgOgVmvop 2N5eJL5G3aMinR6ahaWOpZtAE3YIyYenQ5LhtjRkdi7AFICk979mr6XPPhKicqBrOENx 7UAkFNAxOVxLvWVn6IO/OKAo1Rjlnxdx1YmTMd1PzKaLZ4yqFVa/O1ypMynBwFkSwFN3 OSJJ0fA/vxlxkK4KcJVVJRYGxi9iP6pgAvmfOf5QkvTJMqe/W+2sNn2E7ghymx3sYlab gg5C2/tZAnhfXyoWwhPFprgg/0j5rR+V5naWnqHe+QISUhW0OEFskWkoe6G5a+oLP2eR pWLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=2T5zVUV1A4eCGu2vVG3S4GS5Ew3+vuQ6eWgQjYfg6qA=; b=Nd6xRjnBXBG3Ag4h8ZVBCYLWpFgcL8A+3ursd4d74ojslrpHp8BBCfT7AI3OT+6OvF u5UuqRiARk/M1exe1R0yQAYODdLM3e88pBlJiuSU+lc1jUqPvj0uX7M6OX4C1TDVF5g0 uuESQiOtpKqtOmRkTqrjrZMIxBRYdEB1dGOvWN1Oi/a4SnU6+u/HB5NNTa1mbZ77Pjmv /0UzfbM4biaOxWBtFf3PcZrdhjuJDAh1tRfnOVuWudpzHGk94vQ+srrJbnnImFrruA5x 0KfSb4Q+lKjoKZPhS83fZRcbHaiszjlMcfDz7uvAEu705PaYFMc+YqFhe23R1EoWHVvZ sfXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=i8IGHGDs; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id a2si11750761pgm.154.2018.12.11.07.03.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 07:03:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=i8IGHGDs; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5F39E2119A455; Tue, 11 Dec 2018 07:02:50 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::343; helo=mail-wm1-x343.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (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 4B9522119A455 for ; Tue, 11 Dec 2018 07:02:49 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id m22so2612089wml.3 for ; Tue, 11 Dec 2018 07:02:49 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=nhIkD7RppHSowIcSk8rGbd96/rDHdAtG/WRUJHZFgCs=; b=i8IGHGDsDMAdGX7aKKAMl0VqXleR4h/MbECd/OjWTFIdPgECMIUsUg3fkfxMsgmzHl LB6vny17wcpTXIa3OszX+pIx7FjI2C7SkaUr22C4zmBD448enSoa3i/vCJxV47525D0k MP1LCQlkc0c1DI5bYmkedCRRi5+YEcwO3vCic= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=nhIkD7RppHSowIcSk8rGbd96/rDHdAtG/WRUJHZFgCs=; b=hh9I9Z8gnDUFg/H/fqz3JCWwneLHrCrY8a7HjpVNklUhHW84iEsOyNSoyDJ5pZs0rP 5LMaOyiFZxf4TTun2lfjKVqJbTfOtDg5WoR+vgawyYzTAlFiyQoyye97PFzIlQr61zzr /ETAB/5dyxNrLOfoUPt1U92Q2Z/c69/sC0QvVeZu7X9hFD4Np0lTw5u7LTxGa52pkx6w Y5Tusn5W/S9JJbvzu1MZfMmbwKNCxwRJ6KRcOcwcPbVAQ7H8iNdVoRfKtLvKVd2fBdYq 4WIY2XGWUadm/xHCbxoma7r1ZpStF+pTgNrJ2Hg3egfWW7Z61bhJU8p6DZzbSl9CMuq8 UPJg== X-Gm-Message-State: AA+aEWZPqchLZRZzxWIhon4LFXxl/G1RQc6hNx2aZnFYCs+ZWQxecC3t rQYaU3EXtAX8QWFPq7nBsDiqMOkfaOfsYQ== X-Received: by 2002:a1c:1707:: with SMTP id 7mr2701252wmx.150.1544540567064; Tue, 11 Dec 2018 07:02:47 -0800 (PST) Received: from harold.home ([2a01:cb1d:112:6f00:8c3:6b9d:cbc9:58c6]) by smtp.gmail.com with ESMTPSA id o9sm285793wmh.3.2018.12.11.07.02.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 07:02:46 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 11 Dec 2018 16:02:35 +0100 Message-Id: <20181211150237.32275-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211150237.32275-1-ard.biesheuvel@linaro.org> References: <20181211150237.32275-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms 4/6] Silicon/Styx: switch to device path protocol driver X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alan@softiron.co.uk Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Replace the default resolution of the DevicePathLib library with the version that invokes the DevicePathDxe protocol driver, which was created to avoid having to carry a copy of the entire library in each module. Note that this driver itself incorporates on the NULL PcdLib instance, to avoid creating a circular dependency on the PCD DXE driver. The driver itself nor the DXE core can depend on the protocol, so they keep using the library directly. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 9 +++++++-- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 9 +++++++-- Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) -- 2.19.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc index 696090cfb2dd..4b7342b3e3ce 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -63,7 +63,7 @@ DEFINE DO_CAPSULE = FALSE UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf + DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf @@ -545,12 +545,18 @@ DEFINE DO_CAPSULE = FALSE # MdeModulePkg/Core/Dxe/DxeMain.inf { + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf } MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } + MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf { + + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + } # # Architectural Protocols @@ -703,7 +709,6 @@ DEFINE DO_CAPSULE = FALSE # # Bds # - MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/BdsDxe/BdsDxe.inf diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc index 5056122aa681..37daef4f82e6 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -59,7 +59,7 @@ DEFINE DO_FLASHER = FALSE UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf + DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf @@ -498,12 +498,18 @@ DEFINE DO_FLASHER = FALSE # MdeModulePkg/Core/Dxe/DxeMain.inf { + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf } MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } + MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf { + + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + } # # Architectural Protocols @@ -633,7 +639,6 @@ DEFINE DO_FLASHER = FALSE # # Bds # - MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/BdsDxe/BdsDxe.inf diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc index 8187e799a6fc..5264346a375c 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc @@ -59,7 +59,7 @@ DEFINE DO_FLASHER = FALSE UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf + DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf @@ -482,12 +482,18 @@ DEFINE DO_FLASHER = FALSE # MdeModulePkg/Core/Dxe/DxeMain.inf { + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf } MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } + MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf { + + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + } # # Architectural Protocols @@ -628,7 +634,6 @@ DEFINE DO_FLASHER = FALSE # # Bds # - MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/BdsDxe/BdsDxe.inf