From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::342; helo=mail-wm1-x342.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (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 D1D2D208AEA1C for ; Mon, 11 Feb 2019 11:47:25 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id m1so495689wml.2 for ; Mon, 11 Feb 2019 11:47:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=geIhrSKVXtlXqXTrQwdq6d55Aq+9EjWVXq/XiXNpNi8=; b=CcqgwSYL4w9QZ6Ms+evVPMxmsna3avAzwK85/nDNB+S8wwiSHEsUs/BxTIlkiG8zLh yjOQM3T5KGrsWfuCHoFkt5CrZgNPMN9Ou97TB8/ZY6zFmGZ4ATAzy9Yizxn8OSqYYxi3 d6gjoIIPKTK294A6Ybw/ca69iwtHIEep+2nv35jcKX+RGSENndOWlcjMlZNb1XMrWSoC oF09NXIpgBVSAdZEb6WjbAnGzH1hRfiYLEAQH+7zQeRcCYLjxi0QZMhKRhsjwAqKDctM lkJ5K+oG31g5Y0mCY4MMmbkDmgIwszyXr608YGZQ+DUSSibsbOMeHeGCYVaMylo5GV/K pi0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=geIhrSKVXtlXqXTrQwdq6d55Aq+9EjWVXq/XiXNpNi8=; b=ZADQzvcmY2h4OAQWnOS0YLXM9i5ekuQswF5wx+ErGLx0tq5xqaEDUMHMqUI1qeC0U8 yiIVo5KrUzoUMcfa47Rif4nSxzsusPS+S/s/6E1qRr2RqPQ/T5vP6jWQtzLUwcOIfBgf dO/6K6k+uxbEQJwcPLQRp5KFpncdfw3yJ5HmPmsgSiHd98xfsT5RvOBN+y/KXx4Bl6/P YCF1RHPwTiolZA+r9hYAcsMDB375vevQ23mMn4ioSWvpd10mqECIpxyMDOfRxRS11GHT zW+YHsODVm5dTPzqve9tJi2ZyFCXhVYT7bnHI7mch+mHVemRYbBq1dN8XRpxqU5CROj8 YZXg== X-Gm-Message-State: AHQUAuZV6GDSOrbc0jprxP5TIV39/qQBEqpgWPzoqx19q6g5ZKwTXCgh dolYu/bnvDIIrHQuIitf/rwcsw== X-Google-Smtp-Source: AHgI3Ias7GhkBwCfG5ZfEvsY3URp19UCe2+PgFr+f904bnjai9W+4+aUA3L3SQN6w8sqz44JGXAO9w== X-Received: by 2002:a1c:d147:: with SMTP id i68mr220895wmg.41.1549914444238; Mon, 11 Feb 2019 11:47:24 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id c18sm16978957wre.32.2019.02.11.11.47.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 11:47:23 -0800 (PST) Date: Mon, 11 Feb 2019 19:47:21 +0000 From: Leif Lindholm To: Ming Huang Cc: linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org, ard.biesheuvel@linaro.org, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com, huangming23@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, john.garry@huawei.com, xinliang.liu@linaro.org, zhangfeng56@huawei.com Message-ID: <20190211194721.kb6zndhcvuc77ogr@bivouac.eciton.net> References: <20190201133436.10500-1-ming.huang@linaro.org> <20190201133436.10500-14-ming.huang@linaro.org> MIME-Version: 1.0 In-Reply-To: <20190201133436.10500-14-ming.huang@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH edk2-platforms v1 13/16] Hisilicon/D06: Remove SECURE_BOOT_ENABLE definition 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: , X-List-Received-Date: Mon, 11 Feb 2019 19:47:26 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Feb 01, 2019 at 09:34:33PM +0800, Ming Huang wrote: > As secure boot is not ready, remove SECURE_BOOT_ENABLE and > relative code. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ming Huang Reviewed-by: Leif Lindholm > --- > Platform/Hisilicon/D06/D06.dsc | 12 ------------ > Platform/Hisilicon/D06/D06.fdf | 11 ----------- > 2 files changed, 23 deletions(-) > > diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc > index 6d581337f199..a3a01bfb1e23 100644 > --- a/Platform/Hisilicon/D06/D06.dsc > +++ b/Platform/Hisilicon/D06/D06.dsc > @@ -30,7 +30,6 @@ [Defines] > FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf > DEFINE NETWORK_IP6_ENABLE = FALSE > DEFINE HTTP_BOOT_ENABLE = FALSE > - DEFINE SECURE_BOOT_ENABLE = FALSE > > !include Silicon/Hisilicon/Hisilicon.dsc.inc > > @@ -87,9 +86,6 @@ [LibraryClasses.common] > LpcLib|Silicon/Hisilicon/Hi1620/Library/LpcLibHi1620/LpcLib.inf > SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf > OemNicLib|Platform/Hisilicon/D06/Library/OemNicLib/OemNicLib.inf > -!if $(SECURE_BOOT_ENABLE) == TRUE > - FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf > -!endif > PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf > PciPlatformLib|Silicon/Hisilicon/Hi1620/Library/Hi1620PciPlatformLib/Hi1620PciPlatformLib.inf > > @@ -290,15 +286,7 @@ [Components.common] > MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > Platform/Hisilicon/D06/Drivers/OemNicConfig2PHi1620/OemNicConfig2P.inf > > -!if $(SECURE_BOOT_ENABLE) == TRUE > - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { > - > - NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf > - } > - SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf > -!else > MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > -!endif > Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { > > diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf > index f72b513352fb..e402628a1b35 100644 > --- a/Platform/Hisilicon/D06/D06.fdf > +++ b/Platform/Hisilicon/D06/D06.fdf > @@ -88,17 +88,10 @@ [FD.D06] > #Blockmap[1]: End > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > ## This is the VARIABLE_STORE_HEADER > -!if $(SECURE_BOOT_ENABLE) == TRUE > - #Signature: gEfiAuthenticatedVariableGuid = > - # { 0xaaf32c78, 0x947b, 0x439a, { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }} > - 0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43, > - 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92, > -!else > #Signature: gEfiVariableGuid = > # { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }} > 0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41, > 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d, > -!endif > #Size: 0xe000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0xdFB8 > 0xB8, 0xdF, 0x00, 0x00, > #FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32 > @@ -183,10 +176,6 @@ [FV.FvMain] > INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf > > -!if $(SECURE_BOOT_ENABLE) == TRUE > - INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf > -!endif > - > INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf > INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf > INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf > -- > 2.9.5 >