From patchwork Tue May 10 12:11:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 67450 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2093320qge; Tue, 10 May 2016 05:17:31 -0700 (PDT) X-Received: by 10.140.16.133 with SMTP id 5mr40025545qgb.50.1462882651906; Tue, 10 May 2016 05:17:31 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r194si1223999qha.6.2016.05.10.05.17.31; Tue, 10 May 2016 05:17:31 -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 7CE216163F; Tue, 10 May 2016 12:17:31 +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=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED 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 AD99B61586; Tue, 10 May 2016 12:14:05 +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 0D4B461670; Tue, 10 May 2016 12:14:02 +0000 (UTC) Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by lists.linaro.org (Postfix) with ESMTPS id 4280B61586 for ; Tue, 10 May 2016 12:12:25 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id e201so175185938wme.0 for ; Tue, 10 May 2016 05:12:25 -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=uJ9KvNnUcaZSCch4OtoHrEpFnBD+eLn+fvpbPzj+2cI=; b=jZ0GceydxM2VbEtdEcYhl1Z6JDFx104qC3kv4flbFGPEtNxt2h081gM2O6Hf2HNQDk pEF8H600Tb6XcZTNTzkEZ+N/t6evA2w4D7oPoHFu78jCx7GZMEohUUfVGX2gQZNTgc3+ 95fc1BbvtqdkY0kuOmL6vhkhtJzNao4qA6hVI7RYTqh8Ygx+5eZQCMKOQrLjpe22ImCp zJUp6Y+B2bCIDzDAbOq4bp9e298mCttgo4N3KnuFCvFzQsF69dIGOemvJFMhcNIfUM0N 0LwGYyByKP517u05MUbctNUPhQMq+cb3Mt6LzpO2UdQU6gKgs4mH18PetIB+Ol2QOSn+ CrLA== X-Gm-Message-State: AOPr4FVZtsekyL6Na49NB38Y3rD0yWuvxS5wAR8o0CV7/WDzY4sD+WD/cWFtTVetW9H6mIDa9D8= X-Received: by 10.28.25.67 with SMTP id 64mr16698457wmz.10.1462882344458; Tue, 10 May 2016 05:12:24 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id m20sm2623084wma.23.2016.05.10.05.12.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 May 2016 05:12:23 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Tue, 10 May 2016 14:11:53 +0200 Message-Id: <1462882313-7637-15-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462882313-7637-1-git-send-email-ard.biesheuvel@linaro.org> References: <1462882313-7637-1-git-send-email-ard.biesheuvel@linaro.org> Cc: leo.duran@amd.com Subject: [Linaro-uefi] [PATCH 14/14] Platforms/AMD/Styx: switch to the real variable runtime driver 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" Add the Styx SPI DXE driver to the Cello and OverDrive builds, and replace the emulated variable runtime driver with the real deal. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 9 ++++++++- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 3 ++- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 9 ++++++++- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 3 ++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index 52b891d9d1e4..167ed90a1bdc 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -597,7 +597,14 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # # Environment Variables Protocol # - MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { + + AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf + NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf + } + OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf # # Iscp support diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 04711bd58a5a..b47a13c2601f 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -125,7 +125,8 @@ READ_LOCK_STATUS = TRUE # # Environment Variables Protocol # - INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf # # Iscp support diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index a1a755180da0..aa64be59a204 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -623,7 +623,14 @@ DEFINE TRANS_CODE = $(EL3_TO_EL2) # # Environment Variables Protocol # - MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { + + AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf + NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf + } + OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf # # Iscp support diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index 4e9443642bd2..f06bebc094e5 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -125,7 +125,8 @@ READ_LOCK_STATUS = TRUE # # Environment Variables Protocol # - INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf + INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf + INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf # # Iscp support