From patchwork Tue Mar 6 09:24:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Winkler, Tomas" X-Patchwork-Id: 10261183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7D1E86037E for ; Tue, 6 Mar 2018 09:30:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E3A028EC7 for ; Tue, 6 Mar 2018 09:30:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6249D28ED3; Tue, 6 Mar 2018 09:30:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B9CC28ECB for ; Tue, 6 Mar 2018 09:30:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753243AbeCFJaU (ORCPT ); Tue, 6 Mar 2018 04:30:20 -0500 Received: from mga12.intel.com ([192.55.52.136]:27809 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932448AbeCFJ2g (ORCPT ); Tue, 6 Mar 2018 04:28:36 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Mar 2018 01:28:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,430,1515484800"; d="scan'208";a="209184758" Received: from twinkler-lnx.jer.intel.com ([10.12.91.43]) by fmsmga005.fm.intel.com with ESMTP; 06 Mar 2018 01:28:33 -0800 From: Tomas Winkler To: Jarkko Sakkinen , Jason Gunthorpe Cc: Alexander Usyskin , linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Tomas Winkler Subject: [PATCH 1/5 V2] tpm: sort objects in the Makefile Date: Tue, 6 Mar 2018 11:24:59 +0200 Message-Id: <20180306092503.11568-2-tomas.winkler@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180306092503.11568-1-tomas.winkler@intel.com> References: <20180306092503.11568-1-tomas.winkler@intel.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Make the tpm Makefile a bit more in order by putting objects in one column and group together tpm2 modules Signed-off-by: Tomas Winkler --- V2: 1. back to tpm-y notation 2. Partially sort files alphanumerically. drivers/char/tpm/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index acd758381c58..b2d6ca9e62e4 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -3,12 +3,21 @@ # Makefile for the kernel tpm device drivers. # obj-$(CONFIG_TCG_TPM) += tpm.o -tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \ - tpm-dev-common.o tpmrm-dev.o tpm1_eventlog.o tpm2_eventlog.o \ - tpm2-space.o +tpm-y := tpm-chip.o +tpm-y += tpm-dev.o +tpm-y += tpm-dev-common.o +tpm-y += tpm-interface.o +tpm-y += tpmrm-dev.o +tpm-y += tpm-sysfs.o +tpm-y += tpm1_eventlog.o +tpm-y += tpm2-cmd.o +tpm-y += tpm2_eventlog.o +tpm-y += tpm2-space.o + tpm-$(CONFIG_ACPI) += tpm_ppi.o tpm_eventlog_acpi.o tpm-$(CONFIG_EFI) += tpm_eventlog_efi.o tpm-$(CONFIG_OF) += tpm_eventlog_of.o + obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o obj-$(CONFIG_TCG_TIS) += tpm_tis.o obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o