From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by mx.groups.io with SMTP id smtpd.web10.4758.1625131270414994359 for ; Thu, 01 Jul 2021 02:21:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=KF29x74+; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.167.45, mailfrom: gjb@semihalf.com) Received: by mail-lf1-f45.google.com with SMTP id a18so10585300lfs.10 for ; Thu, 01 Jul 2021 02:21:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CWsPBVg6PQEyLFNWnHStOoDjSRWZO28Bz5LNafj3EoQ=; b=KF29x74+0vb1crw9IKPGdEGjVIoZCed52ac/VayJojh+i0dmk96jQ78g13KDxh/11f mU6uWr9Mt/ef6AnvSWBw38CHOpF6TD6l2P7ymugvaO18B/eejH2nFebl/+Np/yalnElR 4W1Bn4yqlBrurm7iSDFU8RwVXQEDN+pW5n1wxEWAthUQF3EvnCQPEQ4kYyQ7sq/UfoEx r/OQcmr02fZEFwGyiDFuRsD2PnaelU0NwRaGxBWB4bqsg7BBA3D9OX4fUX6C2qFC/Pqe TJeKXM/qmA5iDHHu0zpeZcAwkSFfAlHop6G1Gj15qHC0WxLey7P9PLHTUBzH78RSMa0z lVbA== 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=CWsPBVg6PQEyLFNWnHStOoDjSRWZO28Bz5LNafj3EoQ=; b=hNPlHqY8dlz/dDexiLLkxvW3HVf40rfSqTmzq1FxAt3uBOMjsA80C0rMC24aSWgMYY 4lkQHMtv03Stu0DI2UCwu2zgdzDDyfKKXohV7xSxdtxiUzf6wkoLO8lpoehxGglOWwi8 GDqoTTeOLOoTyCeENNaEW9RQYX90a79IOO6imBahJiC+frBhxAbMUmEAgvNm/sWxWAzD wKrlFoYC8OemamtnWPHqqnSVlVHnPPdD6ltma0ddpwTBAcldMlck7KF0depsNpno+EK2 E8rSOM25v/+ApGN4NR+8PI52tkCZ4r1dRG/6PYAp0BaqH1wgsbbh9KeTn+fLeIuNGf+b a8pw== X-Gm-Message-State: AOAM531zQCXjdrwQhEGnOZeHg/zLSG5dL3uOFJQSSgZhJBHuz9mBy8Ov AkJ4CDeWVxpzD5Rpfr9SEbRZ/CrJ9HwX71Yv X-Google-Smtp-Source: ABdhPJwHaJjqvUYh1tkckZfifkFEqDwTRcWBWr4HvAR76iQL9peAuVLL/IHRWK+baS3WLAvYTeEcAg== X-Received: by 2002:a19:8c03:: with SMTP id o3mr29955829lfd.499.1625131268243; Thu, 01 Jul 2021 02:21:08 -0700 (PDT) Return-Path: Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id g15sm2343205lfr.110.2021.07.01.02.21.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 02:21:07 -0700 (PDT) From: "Grzegorz Bernacki" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, Samer.El-Haj-Mahmoud@arm.com, sunny.Wang@arm.com, mw@semihalf.com, upstream@semihalf.com, jiewen.yao@intel.com, jian.j.wang@intel.com, min.m.xu@intel.com, lersek@redhat.com, sami.mujawar@arm.com, afish@apple.com, ray.ni@intel.com, jordan.l.justen@intel.com, rebecca@bsdio.com, grehan@freebsd.org, thomas.abraham@arm.com, chasel.chiu@intel.com, nathaniel.l.desimone@intel.com, gaoliming@byosoft.com.cn, eric.dong@intel.com, michael.d.kinney@intel.com, zailiang.sun@intel.com, yi.qian@intel.com, graeme@nuviainc.com, rad@semihalf.com, pete@akeo.ie, Grzegorz Bernacki Subject: [edk2-platforms PATCH v5 2/4] ARM Silicon and Platforms: add SecureBootVariableLib class resolution Date: Thu, 1 Jul 2021 11:20:49 +0200 Message-Id: <20210701092051.1057606-3-gjb@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20210701092051.1057606-1-gjb@semihalf.com> References: <20210701092051.1057606-1-gjb@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The edk2 patch SecurityPkg: Create library for setting Secure Boot variables. removes generic functions from SecureBootConfigDxe and places them into SecureBootVariableLib. This patch adds SecureBootVariableLib mapping for each ARM platform which uses SecureBootConfigDxe. Signed-off-by: Grzegorz Bernacki Reviewed-by: Graeme Gregory #SbsaQemu --- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 1 + Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 1 + Platform/RaspberryPi/RPi3/RPi3.dsc | 1 + Platform/RaspberryPi/RPi4/RPi4.dsc | 1 + Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 4 ++++ 5 files changed, 8 insertions(+) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index fee7cfcc2d..60fdb244ba 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -129,6 +129,7 @@ !if $(SECURE_BOOT_ENABLE) == TRUE TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc index 11ce361cdb..b1c4030ec9 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc @@ -156,6 +156,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE # TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 53825bcf62..73f7f2f8c3 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -167,6 +167,7 @@ # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf !else TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc index fd73c4d14b..d38fee8fb8 100644 --- a/Platform/RaspberryPi/RPi4/RPi4.dsc +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc @@ -164,6 +164,7 @@ !if $(SECURE_BOOT_ENABLE) == TRUE TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc index 88454c1f90..41b7c3bced 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -52,6 +52,10 @@ MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf +!if $(SECURE_BOOT_ENABLE) == TRUE + SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf +!endif + [LibraryClasses.common.SEC] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf -- 2.25.1