From patchwork Sat Jun 22 14:35:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 806723 Delivered-To: patch@linaro.org Received: by 2002:a5d:508d:0:b0:362:4979:7f74 with SMTP id a13csp1201033wrt; Sat, 22 Jun 2024 07:36:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVzgIu8byAzWG61+CknZWwCXfqbnmvMtT/WlVieusFM7lmP549UirH3GYTKgRdYCxZ5R3r7uAOVmaQ0YjUo6CwG X-Google-Smtp-Source: AGHT+IFjT1k4Diwm01hSXRDB6j33DVSax9g+wHr4MihKqVaAAik+v6Pu9lgNJ90vTtnbt8x8XkKQ X-Received: by 2002:a17:906:3383:b0:a72:438b:2dfe with SMTP id a640c23a62f3a-a7245cf26e7mr140066b.40.1719067019573; Sat, 22 Jun 2024 07:36:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719067019; cv=none; d=google.com; s=arc-20160816; b=PJtjymGtRrNt4IZZ3oAvNEkjSMlrgctDhVjXGmQOOBC/EyTHJTbl/W3tJwBaEsQeeR K8S8oc2mQ3GwHUU2JpBVKD1rYNDG06H9tbF4EKRT+OXzMFRuJnbZ/lGKC/KxEKBwYIxk ND+Q+WgimxH0La64vnm5+vU+vtgrPY7pWmw+YQ3AQhMTKZHgTbM3PIYbVOheOLLRh25J hblKNuE6XDa0iSqehtKO74UIaTcSGCs/FuBUtTyDMHIGFLpqyQVIZSxe+VQYYsrscw9E nPM4cCRg2BrIm5nKeXW1BVOECYvm8GlCXCA/unnTkDxg/3MN5sj5vmVQq11ttrDVcC0r c0MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nZcGBMtH3K0r02Kucnml6DOJS3j4NbOQoJDdifTThoY=; fh=nzsbZJ0SEn01go518cGBqSgrU7mh3+JGrTG0OD1KtOw=; b=I9VqbykYHZYBoZS1c15GMYqDIFqpd8oRiS0NEHoX4ia5lM2OSI4WpuA+8JfzRI7NyL PrT6a5DeJFk0sO4AdJg9Bzf9lM9MVwdLTEZIqSMLGssM4LgdBgk/7YR93nFDKnO6vBnS B3YwGZ9Cvdkma1bm6eRZfuRV0MdpUasCWvkA9677iQORibOkVv9xMLpKHfV3PIuOmQr6 Bvno1cuOggHwLzpgvmc4xzAOwkzvS2seaFDa1uGTZEiQO0FKhVsVgwErIU8M1XIJFssO 0n1Se4FR24of9wRKqy+/rDtdCXimwSkXJSHHxMfUJ4QrqQxHBYeaHYWGxrJ8dRQ3hRny aKTg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="bR//7+e8"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id a640c23a62f3a-a6fcf57960asi185093766b.781.2024.06.22.07.36.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 07:36:59 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="bR//7+e8"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 28B5987D8E; Sat, 22 Jun 2024 16:36:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="bR//7+e8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9D8F48818B; Sat, 22 Jun 2024 16:36:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B4B45878E2 for ; Sat, 22 Jun 2024 16:36:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a689ad8d1f6so364120566b.2 for ; Sat, 22 Jun 2024 07:36:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719066993; x=1719671793; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nZcGBMtH3K0r02Kucnml6DOJS3j4NbOQoJDdifTThoY=; b=bR//7+e82NY0DtO1R+WE/4c5i4piwo0dPwl5SSXGCZKwWkl0fEq4QkOvfjd8DR/bco /7DaioYkY8ysJLObRKjeho3Os9ViScNfBsfiprvm323UFUqNj52juTLCOIKJT7v4i0EY E2fpkls5pTgoHWV0fUUP8lz3bPG0A/YYcpmoEz8UExW28vUkDgBJUDS+2v8ys1FeAIuj +pdDZOmzYvcrL+6HMwIb3La1I0DkapXUgD3pBKWNspaddqEkoEa0YCp6LtGQh4KDBvkx 2jzdzJim0SOzxmluFU7E1JRzAY6ISjZmN2RJae4p7EawoPMB94vQCIPBFg4vYu7Wecch OShQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719066993; x=1719671793; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nZcGBMtH3K0r02Kucnml6DOJS3j4NbOQoJDdifTThoY=; b=fQuD8wzLrMoovjFpmHocu2VkddEP1sBD3c1pELfssuvyUAZ8tVqtk380L11P+aWQAx wg+NKekNl2ATMGv1k/BF4QJyg6GzgSF8+hI6vifFZ6aqid7ZVHRQ6fmqk2hTXqepTzcU MVMMK5ANnEMuiwRuuezF0WfdNUOAiv7P5L3qQcOEqIHIUT/Ke1Xv2rwxWF0hFbZ5fU8A iZ7UlUPlBuidr7dkAi39QZn6k6xW41bDXhnaQ4SMjD2Lzvh7cSqsiMcSq/OAYDkvVUN8 3vP8h5jvReNzqD3NB0AAwRSD8xU2rK9nIRgSkIT8HG12iErfmHVf4B7aUXhXOWQHog2z yr4w== X-Forwarded-Encrypted: i=1; AJvYcCWe8qebXpEDShrx3ECVlbu4CWSeH5n2tQdalZaAMNnUBecf00sPr0gj13y2wafW0Eg4k4TblKJ3141VfZCr49wrPOrJ5A== X-Gm-Message-State: AOJu0YxTm+C1knvpoUs+rH+Eyl6eJEIg3dd1PUT/t2QhOpL0B9rlhQr/ FsMzSgcc0ilGPMhhisl9qW5rmoI39XX1atb6p6WVxYSnH/R2EUJeprNnfyrMvNw= X-Received: by 2002:a17:907:8e93:b0:a6e:f62d:bd02 with SMTP id a640c23a62f3a-a7245c84f2emr590866b.7.1719066992851; Sat, 22 Jun 2024 07:36:32 -0700 (PDT) Received: from localhost.localdomain (ppp046103020130.access.hol.gr. [46.103.20.130]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6fcf54a534sm204005366b.136.2024.06.22.07.36.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 07:36:32 -0700 (PDT) From: Ilias Apalodimas To: sjg@chromium.org, trini@konsulko.com Cc: Ilias Apalodimas , Heinrich Schuchardt , Eddie James , Mattijs Korpershoek , Tim Harvey , Bin Meng , Sean Anderson , Michal Simek , AKASHI Takahiro , Oleksandr Suvorov , Masahisa Kojima , u-boot@lists.denx.de Subject: [PATCH 3/7] efi_loader: remove duplicate TCG algo definitions Date: Sat, 22 Jun 2024 17:35:39 +0300 Message-ID: <20240622143601.187723-4-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622143601.187723-1-ilias.apalodimas@linaro.org> References: <20240622143601.187723-1-ilias.apalodimas@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean commit 97707f12fdab ("tpm: Support boot measurements") moved some of the EFI TCG code to the TPM subsystem. Those definitions are now in tpm-v2.h. Let's remove the duplicate entries Signed-off-by: Ilias Apalodimas Reviewed-by: Heinrich Schuchardt --- include/efi_tcg2.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h index a75b5a35b6e7..54490969b2d1 100644 --- a/include/efi_tcg2.h +++ b/include/efi_tcg2.h @@ -25,14 +25,6 @@ #define PE_COFF_IMAGE 0x0000000000000010 #define EFI_TCG2_MAX_PCR_INDEX 23 - -/* Algorithm Registry */ -#define EFI_TCG2_BOOT_HASH_ALG_SHA1 0x00000001 -#define EFI_TCG2_BOOT_HASH_ALG_SHA256 0x00000002 -#define EFI_TCG2_BOOT_HASH_ALG_SHA384 0x00000004 -#define EFI_TCG2_BOOT_HASH_ALG_SHA512 0x00000008 -#define EFI_TCG2_BOOT_HASH_ALG_SM3_256 0x00000010 - #define EFI_TCG2_FINAL_EVENTS_TABLE_VERSION 1 #define TPM2_EVENT_LOG_SIZE CONFIG_EFI_TCG2_PROTOCOL_EVENTLOG_SIZE