From patchwork Wed Apr 6 16:15:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65192 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1146903lbc; Wed, 6 Apr 2016 09:15:42 -0700 (PDT) X-Received: by 10.98.65.82 with SMTP id o79mr39261965pfa.115.1459959340141; Wed, 06 Apr 2016 09:15:40 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id ui8si5490624pab.38.2016.04.06.09.15.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2016 09:15:40 -0700 (PDT) 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; 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 dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 99B771A1FB9; Wed, 6 Apr 2016 09:15:37 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x235.google.com (mail-wm0-x235.google.com [IPv6:2a00:1450:400c:c09::235]) (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 D27811A1FBE for ; Wed, 6 Apr 2016 09:15:35 -0700 (PDT) Received: by mail-wm0-x235.google.com with SMTP id n3so70211636wmn.0 for ; Wed, 06 Apr 2016 09:15:35 -0700 (PDT) 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; bh=YgV0dtCOsBTkK56qKMbFeMn+vAhsllat6YzUG2EgNqw=; b=TgcFuEaAL0tIXAgbYHoR4N5T2hftGnbGH/flpqpGeURgXKxXSoReTj2NZ50nLo15fe IvxILm1a4hhOXiPky1RZ4uTHHYkatL1S8EcJSxtFeofD801oPFUjYkda7Ry1Mbg3wvnr PcoRoIMuwtS+TMDAPcXz5dUIINA3mdQgAwxKM= 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=YgV0dtCOsBTkK56qKMbFeMn+vAhsllat6YzUG2EgNqw=; b=m1Pz7KysEQcmUNn649nXMCNbVLybYRylGdzC0KkCdRFbY+yiT763T7DLmK8BKTe30c 78B/wuoHLneJB9tYaKGMXZ/rIlE4bvVD8xp8o9d2UC/TY6lDy/6VSKsRr0p+beA0Y27G fEq8XMqIwMmYZjAWs15IqBtcONDlb8IwJe+8WN8ae68cBrCcxBeqPdCxt71V+engeyrK dADKGJDZD46FC1a1cZlqiNgl0H83E3P0dFmI89drV9iCFBNixywCrq6vmV+2S1+Md7fT +YhEqu0GgXrlb9jGKuqDdAL/Ginmo2UU58TE7WHGpY/7YnYWwCMOx0ZfSjoxWGyrXcv6 LHNg== X-Gm-Message-State: AD7BkJJzlF8tLWehZeXmnba1olS+uVCCpAd7vf6N7v1MUcwvlhLM9pvAPL44ZAILLs6pGqlA X-Received: by 10.28.194.67 with SMTP id s64mr15945422wmf.44.1459959334513; Wed, 06 Apr 2016 09:15:34 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id om6sm3961219wjc.40.2016.04.06.09.15.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Apr 2016 09:15:33 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Wed, 6 Apr 2016 18:15:01 +0200 Message-Id: <1459959319-19293-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459959319-19293-1-git-send-email-ard.biesheuvel@linaro.org> References: <1459959319-19293-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 03/21] ArmVirtPkg: drop dependency on PeiPcdLib for PEI Pcd.inf X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The PcdPeim dynamic PCD driver is dispatched explicitly via an 'A PRIORI' declaration in the platform DSC. Without that declaration, the PEI module can never be dispatched since it transitively depends on protocols it produces itself via PeiPcdLib. So use the NULL PcdLib explicitly only for this driver. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 5 ++++- ArmVirtPkg/ArmVirtQemu.fdf | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.5.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index a1a281303ac4..5a158c2de94b 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -255,7 +255,10 @@ [Components.common] # ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf MdeModulePkg/Core/Pei/PeiMain.inf - MdeModulePkg/Universal/PCD/Pei/Pcd.inf + MdeModulePkg/Universal/PCD/Pei/Pcd.inf { + + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf + } ArmPlatformPkg/PlatformPei/PlatformPeim.inf ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf ArmPkg/Drivers/CpuPei/CpuPei.inf diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf index ef456539cc62..600e10882434 100644 --- a/ArmVirtPkg/ArmVirtQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -262,9 +262,6 @@ [FV.FVMAIN_COMPACT] READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE - APRIORI PEI { - INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf - } INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf INF MdeModulePkg/Core/Pei/PeiMain.inf INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf