From patchwork Wed Mar 20 08:08:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 160647 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp519676jad; Wed, 20 Mar 2019 01:10:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqw9ZJ99uXRioCFwFKl/KRBqLxsfBdB/lkrXYNkx57SwabDfy9CK57U6/UUaKrmwjMwsg+zK X-Received: by 2002:a17:902:bb0c:: with SMTP id l12mr6679448pls.108.1553069420065; Wed, 20 Mar 2019 01:10:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553069420; cv=none; d=google.com; s=arc-20160816; b=dyzhztUko0QZrD/yZ+J5/ikasiCkpwoHVfxayxI/J/FHOFbuPDcvj0x2JwdEL1ugPo E3wXTReXot9C4TySS6YfP4Z5Hu5jXxtHydQD5q9eooK6QSXCyGYZIrlbrTgrkf4pCGKc P4RtdvDJ2YsnIJ6ow6pjCmiH/cgekk1+doSig66FSwsTXF8qXt/M0OY72e8gI6UVwk+2 9kvCakFz9VOGyot5gxuImFC4+2v5/AYkMqIlfhM7d7fJV+qvIHLpeHr/OTncci0U6i8J Cr5ub0RLfL4/wVJAsKJm9Hb/n5e52tsgiAIiFyQ/fVY3/KHiB/f4CEwvfYsPmn7ue7lY 3Q2Q== 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=FiUM6zru8GOP35mJ07M/VOAKhfYuWupXG7rKbhl/US8=; b=muyR7Sylspfbe5IpCfncjKzBWcBmBfVbtEarF11bWIMOEoB7bfqKlcTS7fLwONOAep TOGZVXNbbLerCPeRoWIjR76E9bYrIAGp65Iqpz2+jEBYp4FkDCzr8JO/TUoaN7etdreu qN9zr38OHM80chErLobzoRzIP/eJPlCUhIQ6pFFiyqF7sE51x7CKN9lTOGN6jWXv0L4R pcTNIUH9489IgB1V4z48IQDvkmtPudePPQpgEIe9SrLzyuh4iBQWdf8R0jC0A96AT/7b 1n8q8B43/7PzTYNJ07hsJR1GIV4uDMMpLAyZGP3JTby9Y0/fCbcMYtwK26C+drdafeA/ V5vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=sVYBv5xA; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id o3si1141032pgh.189.2019.03.20.01.10.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 01:10:20 -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 header.s=google header.b=sVYBv5xA; 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 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 D57A9211E0117; Wed, 20 Mar 2019 01:10:15 -0700 (PDT) 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::442; helo=mail-pf1-x442.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (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 4B1012194EB77 for ; Wed, 20 Mar 2019 01:10:15 -0700 (PDT) Received: by mail-pf1-x442.google.com with SMTP id 8so1359216pfr.4 for ; Wed, 20 Mar 2019 01:10:15 -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=rTW56E8e7lJ0BSoY4LJGIwlnWA3lMCKScYjutA5zlbI=; b=sVYBv5xAoPUjpgHdXzTI3BVm5L266mwuhd4bzzzfgL/p0Dkg6e7++EPQdIMhsOUkDA jBbvrhN0BAvcYAijhwjZeud6dqDkQq+BHwQyo61HHwQF8+CK4cRv0chhbUC8q2g9tvvw uDyr5esNJLXuopc19+AfWEbnimyiXrmZqaZNpbN4HCq2dOLjtFr2oqdKoqv4esc2M2Y1 CsTgN0MExcc5P02QMAtiELDDbNY1KVi1cm2maudsRja76udOYYrq3AHy00XxLCPdoNbr KEe4S6K5944VomrWg1gjmQ2pM4x2mN7QPtjWEZmKa9iXubq9u4ZqzYmZmqVdAM12KIpB S80g== 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=rTW56E8e7lJ0BSoY4LJGIwlnWA3lMCKScYjutA5zlbI=; b=q8CtJcpr9AcRo1yISk5OhbGGC2wo5QoCFh/z1a7wFZLq5cN8YrPZhSZG5IiMuLviM7 DijawrJf3dFwMmaa+IyUhb1yBm9ypQGCLH8nIrHSIph99kR9aywdYfHqPJblbuRF8Y2j 1+Vk8QQbtJq2zcwQkLdmy4L57NXQwuFmeUuaStGSVGvkdH8olfmnfXDhWLhxp66ljBB+ MSdXOz5iTlpISTI6eeL8I6iWYGJxyDeFzX3HrgcwIYriKkS+ixiTkR9tIGvOfMd2woeG 3FgLLYk0MhkDTdzm08IbgTqTeMPEcTrlYoMqURhm3yWZdZYkJBYR1Y4ex3+jqT0VKH9m iXjw== X-Gm-Message-State: APjAAAU3fh51A4e/pZcJ27La3et2y4Kh6ilEeWSATt8DVjaqaoNkALcR /aAs8p0u/+hAPZG4GKLHsNldOg== X-Received: by 2002:a63:fc62:: with SMTP id r34mr6611436pgk.154.1553069414984; Wed, 20 Mar 2019 01:10:14 -0700 (PDT) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id f9sm1602796pfd.10.2019.03.20.01.10.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Mar 2019 01:10:14 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Mar 2019 16:08:26 +0800 Message-Id: <20190320080829.52003-16-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190320080829.52003-1-ming.huang@linaro.org> References: <20190320080829.52003-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 15/18] 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, john.garry@huawei.com, xiaojun2@hisilicon.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 Reviewed-by: Leif Lindholm --- 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 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