diff mbox series

[v3,02/20] tpm: sort objects in the Makefile

Message ID 20180918093459.19165-3-tomas.winkler@intel.com (mailing list archive)
State New, archived
Headers show
Series tpm: separate tpm 1.x and tpm 2.x commands | expand

Commit Message

Winkler, Tomas Sept. 18, 2018, 9:34 a.m. UTC 
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 <tomas.winkler@intel.com>
---
V2: 1. back to tpm-y notation
    2. Partially sort files alphanumerically.
V3: Rebase

 drivers/char/tpm/Makefile | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Comments

Jarkko Sakkinen Sept. 19, 2018, 1:48 p.m. UTC | #1 
On Tue, Sep 18, 2018 at 12:34:41PM +0300, Tomas Winkler wrote:
> Make the tpm Makefile a bit more in order by putting
> objects in one column and group together tpm2 modules

The change is fine but do you mean by the subordinate clause here?

/Jarkko

> 
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
> V2: 1. back to tpm-y notation
>     2. Partially sort files alphanumerically.
> V3: Rebase
> 
>  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 4e9c33ca1f8f..efc785053627 100644
> --- a/drivers/char/tpm/Makefile
> +++ b/drivers/char/tpm/Makefile
> @@ -3,9 +3,18 @@
>  # 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 eventlog/common.o eventlog/tpm1.o \
> -	 eventlog/tpm2.o tpm2-space.o
> +tpm-y := tpm-chip.o
> +tpm-y += tpm-dev-common.o
> +tpm-y += tpm-dev.o
> +tpm-y += tpm-interface.o
> +tpm-y += tpm2-cmd.o
> +tpm-y += tpmrm-dev.o
> +tpm-y += tpm2-space.o
> +tpm-y += tpm-sysfs.o
> +tpm-y += eventlog/common.o
> +tpm-y += eventlog/tpm1.o
> +tpm-y += eventlog/tpm2.o
> +
>  tpm-$(CONFIG_ACPI) += tpm_ppi.o eventlog/acpi.o
>  tpm-$(CONFIG_EFI) += eventlog/efi.o
>  tpm-$(CONFIG_OF) += eventlog/of.o
> -- 
> 2.14.4
>
Jarkko Sakkinen Sept. 19, 2018, 1:59 p.m. UTC | #2 
On Wed, Sep 19, 2018 at 04:48:53PM +0300, Jarkko Sakkinen wrote:
> On Tue, Sep 18, 2018 at 12:34:41PM +0300, Tomas Winkler wrote:
> > Make the tpm Makefile a bit more in order by putting
> > objects in one column and group together tpm2 modules
> 
> The change is fine but do you mean by the subordinate clause here?
> 
> /Jarkko
> 
> > 
> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> > ---
> > V2: 1. back to tpm-y notation
> >     2. Partially sort files alphanumerically.
> > V3: Rebase
> > 
> >  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 4e9c33ca1f8f..efc785053627 100644
> > --- a/drivers/char/tpm/Makefile
> > +++ b/drivers/char/tpm/Makefile
> > @@ -3,9 +3,18 @@
> >  # 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 eventlog/common.o eventlog/tpm1.o \
> > -	 eventlog/tpm2.o tpm2-space.o
> > +tpm-y := tpm-chip.o
> > +tpm-y += tpm-dev-common.o
> > +tpm-y += tpm-dev.o
> > +tpm-y += tpm-interface.o
> > +tpm-y += tpm2-cmd.o
> > +tpm-y += tpmrm-dev.o
> > +tpm-y += tpm2-space.o
> > +tpm-y += tpm-sysfs.o
> > +tpm-y += eventlog/common.o
> > +tpm-y += eventlog/tpm1.o
> > +tpm-y += eventlog/tpm2.o
> > +
> >  tpm-$(CONFIG_ACPI) += tpm_ppi.o eventlog/acpi.o
> >  tpm-$(CONFIG_EFI) += eventlog/efi.o
> >  tpm-$(CONFIG_OF) += eventlog/of.o
> > -- 
> > 2.14.4
> > 

Forgot to add this:

Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

/Jarkko
diff mbox series

Patch

diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
index 4e9c33ca1f8f..efc785053627 100644
--- a/drivers/char/tpm/Makefile
+++ b/drivers/char/tpm/Makefile
@@ -3,9 +3,18 @@ 
 # 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 eventlog/common.o eventlog/tpm1.o \
-	 eventlog/tpm2.o tpm2-space.o
+tpm-y := tpm-chip.o
+tpm-y += tpm-dev-common.o
+tpm-y += tpm-dev.o
+tpm-y += tpm-interface.o
+tpm-y += tpm2-cmd.o
+tpm-y += tpmrm-dev.o
+tpm-y += tpm2-space.o
+tpm-y += tpm-sysfs.o
+tpm-y += eventlog/common.o
+tpm-y += eventlog/tpm1.o
+tpm-y += eventlog/tpm2.o
+
 tpm-$(CONFIG_ACPI) += tpm_ppi.o eventlog/acpi.o
 tpm-$(CONFIG_EFI) += eventlog/efi.o
 tpm-$(CONFIG_OF) += eventlog/of.o