From patchwork Mon Jul 6 15:32:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Thomsen X-Patchwork-Id: 1323688 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rTHaTM9O; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B0qML4Zxpz9sDX for ; Tue, 7 Jul 2020 01:32:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D2627801D8; Mon, 6 Jul 2020 17:32:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="rTHaTM9O"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3ED4E80422; Mon, 6 Jul 2020 17:32:36 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) (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 D99078004A for ; Mon, 6 Jul 2020 17:32:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bruno.thomsen@gmail.com Received: by mail-ed1-x544.google.com with SMTP id h28so35376549edz.0 for ; Mon, 06 Jul 2020 08:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rAk1mkiLQWCaaCzkb6f6anzYDZc9EEsvopCpA7As87o=; b=rTHaTM9OpHIJ2jcwmQv6JXuDfRVniCfp69ZUt8F9cXPpOG0CYPpc9tEeBUMVZxHpqX lLVGU9jQsXG0XwJ1cZ57FX3lybtBbrwUKyBYf6QhDFd//z+1KhhAD0AyD6fQ7gQtZN/W GCsbUmL1XPVMkyIq3LcBP1H7zX3tpt3AhBlJeMO6FBLWZBOAia26ivLQca1SKmL/04eK E1UqDAsiCk9zss+QspdUlc8luAnoFmblrA6xlTqBfFsnZ6tBZQKd5Y4i7Qmve+aAiF8N SHYUFRFmuypv8DPQEllMbyueJNiR95yKxKg/EIkLLtG4gvLaznFmH2yqtSEdwRv5WEY8 CRzQ== 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:mime-version :content-transfer-encoding; bh=rAk1mkiLQWCaaCzkb6f6anzYDZc9EEsvopCpA7As87o=; b=BqqvDBTX+PNj3zNQmFJ2ThuC+m7T+TIbMa+ZpqJMalJV57G/C6aaYsVquxM0vm3YkX grgIlIyys8iOBzgi58luEZguu41+WW9bByZCSTGhzAJI8dov0LKeXODGRsepBIS7CI9U 3g6c2BY755+yXt+wBmYu0AaxIKzWERWjpd1Wv23KMUGT/JEZqJjVlZQeJVtkc6hYSrKw CjFGBps0uVri0J3wEBgkeRUAsQHrLzcpXRW6MC9VQuJy9zwht4cQ+P7FTHVIk+V+GzKZ DCABk/WPBtTWRqhYRXR7bmmzJWvXLjMgsjheu4K6RSsB1zVwW+0Qsb4pz2UJ2YqaQn1z laag== X-Gm-Message-State: AOAM530nvkx2iyRSEjB34JcbGIV+rSaav/S4aproPE47e2GKbeKateAA vv+EZDitg/PVajAfd4xyuSUA70aK/nU= X-Google-Smtp-Source: ABdhPJwteO+QpxXkTayXIgiR7Fo6jB2a7RELyeowj1Fem/DeOr7qfYX1mEe1suKwxDzdipDGaUA21w== X-Received: by 2002:a05:6402:1ad9:: with SMTP id ba25mr24730866edb.74.1594049553206; Mon, 06 Jul 2020 08:32:33 -0700 (PDT) Received: from xps13.lan (3e6b1cc1.rev.stofanet.dk. [62.107.28.193]) by smtp.googlemail.com with ESMTPSA id d12sm24458493edx.80.2020.07.06.08.32.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2020 08:32:32 -0700 (PDT) From: Bruno Thomsen To: u-boot@lists.denx.de Cc: bth@kamstrup.com, Bruno Thomsen Subject: [PATCH] bugfix: tpm2_tis_spi: redeclaration compile error Date: Mon, 6 Jul 2020 17:32:27 +0200 Message-Id: <20200706153227.5195-1-bruno.thomsen@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean tpm2_tis_spi driver fails to compile with errors like this: drivers/tpm/tpm_tis.h:117:2: error: redeclaration of enumerator 'TPM_ACCESS_VALID' drivers/tpm/tpm_tis.h:118:2: error: redeclaration of enumerator 'TPM_ACCESS_ACTIVE_LOCALITY' drivers/tpm/tpm_tis.h:119:2: error: redeclaration of enumerator 'TPM_ACCESS_REQUEST_PENDING' drivers/tpm/tpm_tis.h:120:2: error: redeclaration of enumerator 'TPM_ACCESS_REQUEST_USE' drivers/tpm/tpm_tis.h:124:2: error: redeclaration of enumerator 'TPM_STS_VALID' drivers/tpm/tpm_tis.h:125:2: error: redeclaration of enumerator 'TPM_STS_COMMAND_READY' drivers/tpm/tpm_tis.h:126:2: error: redeclaration of enumerator 'TPM_STS_GO' drivers/tpm/tpm_tis.h:127:2: error: redeclaration of enumerator 'TPM_STS_DATA_AVAIL' drivers/tpm/tpm_tis.h:128:2: error: redeclaration of enumerator 'TPM_STS_DATA_EXPECT' This is due to redeclaration of 9 values in tis_access and tis_status enums from tpm_tis.h. Defines are now declared in include/tpm-v2.h, so removing duplicates from tpm_tis.h. Signed-off-by: Bruno Thomsen --- drivers/tpm/tpm_tis.h | 15 --------------- 1 file changed, 15 deletions(-) base-commit: 04da1cd8076b44ff49a79b7fe048a9e8e56b5f60 diff --git a/drivers/tpm/tpm_tis.h b/drivers/tpm/tpm_tis.h index 947585f8e3..4043f1aeaf 100644 --- a/drivers/tpm/tpm_tis.h +++ b/drivers/tpm/tpm_tis.h @@ -113,19 +113,4 @@ struct tpm_cmd_t { */ #define MAX_COUNT_LONG 50 -enum tis_access { - TPM_ACCESS_VALID = 0x80, - TPM_ACCESS_ACTIVE_LOCALITY = 0x20, - TPM_ACCESS_REQUEST_PENDING = 0x04, - TPM_ACCESS_REQUEST_USE = 0x02, -}; - -enum tis_status { - TPM_STS_VALID = 0x80, - TPM_STS_COMMAND_READY = 0x40, - TPM_STS_GO = 0x20, - TPM_STS_DATA_AVAIL = 0x10, - TPM_STS_DATA_EXPECT = 0x08, -}; - #endif