From patchwork Fri Feb 1 13:34:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 157222 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp437966jaa; Fri, 1 Feb 2019 05:36:05 -0800 (PST) X-Google-Smtp-Source: ALg8bN7W9IpzrNTSm+vJg5XFn167bfe98MDLSmuoKqFJawHrTYHPdrs162g1C0Ctgk5wO45027cg X-Received: by 2002:a17:902:c5:: with SMTP id a63mr40212070pla.267.1549028165207; Fri, 01 Feb 2019 05:36:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549028165; cv=none; d=google.com; s=arc-20160816; b=Hb4wqKaZ4sbgF+95dpB9RCDv6wSM18C0sxcOwfpQrODebOT7nzXhOhGqwFLmKFOLsF B9pBvvEKgRJVrNRWBYmVUO77FVyPyBwvfqogeYBOMsvq+tZ8Fv/McVWsAUc6eIUwBwnT LNDll1u7a8XGZsLhPN2tPA5iw3FotkOt5fgHsPvCUq0AqONx59wjk0ZTcPYth31Pn7wz ccv5Y1rjERRVGUt7cwNb3FIHqqcLRJenuN9Ez7caE2gMrd1bG15L84mHOBRSrJYh3PTz CP8QmTljFrviHHV51qs7HsnkiOr8QdSxekgpGNwSEyu0XPc5n+XyvOk6HFvnWv/DYXhm XE2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=pqd76FyuC4uq1Hh4OpppA2cgnVFBIAv9Wt2nOcKfPIw=; b=ac2MNm4BPNhGf73EncQI4K4tWqSG+dCothu7ugQfZJufvA3qFi+ON6w4qNo9rgYGyU xdnB6pnFcBGfQ7VL1NNDXJfNK4/qLv1CC5vUReoZMRnbea5I92+p6Nfa5Us5PFQxiptF iGj8JtMzehpWu69h7CXqOZmT6cJpTA+UL7RDhCj6tgkt3bhHtUn0WKQGZaQUrvAjoVCY splAoIbXFlIrxDOXpyz931YzATtwMv/+r+MUAOYk1iKlklklSXEQR3X+yyTLwmrmAFzx YZCrKNHfwK8OlplFo8p3i3ycUlIc9I40d49NAlnpSXKKuqvPvw38R6DxdDimp2s1ons5 pfQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RQ+0dL+V; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id f95si8224764plb.60.2019.02.01.05.36.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Feb 2019 05:36:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RQ+0dL+V; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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 32BA7211C6075; Fri, 1 Feb 2019 05:36:02 -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=2607:f8b0:4864:20::542; helo=mail-pg1-x542.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (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 475CD211C5729 for ; Fri, 1 Feb 2019 05:36:01 -0800 (PST) Received: by mail-pg1-x542.google.com with SMTP id y4so2948836pgc.12 for ; Fri, 01 Feb 2019 05:36:01 -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; bh=Bfa3JFfG5vqXmoA5jHU1dPz6uLwLTYJOEtsyTVkaaQo=; b=RQ+0dL+Va3I9TtPYl1Ja+wLtem9mMAz5QgoCfHR+M0lAXBTYoJJrsW9Xitu/r+a4Pv nN1uK6bXb/MSQEp43WKSuiAUE4Xenh/epYXBQlngKYgheJYzDAKXg1ZxOykZ98SCxNSO lBs0K5VPMh4E1dsMgGK0rtGjiJmwk3mJoa+Tw= 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; bh=Bfa3JFfG5vqXmoA5jHU1dPz6uLwLTYJOEtsyTVkaaQo=; b=uoHR0pRFAeFaqpc62LFkgUE5Pv+98mrMnBD9TTnqR22Wees4Dj80i5hPcyfjeWSoWJ NwLjvSwHeRPwO4zWQH6oPvhJ6OLIcrQ3fBm0UEpWAgi4+0vWSitm3rYsugdcjmLfHCPJ +m4J0THHOIAIKxcF14raAl8BtsAcRD3Al1MkR/gSRwOjzQG1sQX0QK1PN1vWQv84WR1R Ay0KuuxA6Lbs6Li0Zw4UxOJ6Syfv3Eungwtb9FEN8CLT1iMVzaYpGaUN/iFjW44gHjxC Qjpwo6MaIRlL/+MbTF5Lz/U6aaSARceU7CM77CpfvScxQsAry0xKn2V9pK6s5J9Mtpps 9EDw== X-Gm-Message-State: AJcUukcWT0DsaHUL6VYFdml/pN/CLxAJW3b9tuMZP0jwl8S7EylaIqWg gWSc9qc1kx2aiVvw2+wMm2rzFeLqEa4UnA== X-Received: by 2002:a62:4851:: with SMTP id v78mr39700576pfa.97.1549028160939; Fri, 01 Feb 2019 05:36:00 -0800 (PST) Received: from localhost.localdomain ([114.119.4.74]) by smtp.gmail.com with ESMTPSA id s21sm11134073pfk.133.2019.02.01.05.35.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Feb 2019 05:36:00 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Fri, 1 Feb 2019 21:34:33 +0800 Message-Id: <20190201133436.10500-14-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190201133436.10500-1-ming.huang@linaro.org> References: <20190201133436.10500-1-ming.huang@linaro.org> Subject: [edk2] [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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 --- Platform/Hisilicon/D06/D06.dsc | 12 ------------ Platform/Hisilicon/D06/D06.fdf | 11 ----------- 2 files changed, 23 deletions(-) -- 2.9.5 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm 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