On Mon, Mar 05, 2018 at 09:21:37PM +0000, Winkler, Tomas wrote: > > On Mon, Mar 05, 2018 at 10:20:12PM +0200, Tomas Winkler wrote: > > > Make the tpm Makefile a bit more in order by putting objects in one > > > column and group together tpm2 modules > > > > > > Prefer tpm-objs += instead of tpm-y += notation. > > > > > > Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx> > > > drivers/char/tpm/Makefile | 14 +++++++++++--- > > > 1 file changed, 11 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > > > index acd758381c58..2fc0e9a73cd6 100644 > > > +++ b/drivers/char/tpm/Makefile > > > @@ -3,9 +3,17 @@ > > > # 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-objs := tpm-interface.o > > > +tpm-objs += tpm-dev.o > > > +tpm-objs += tpm-chip.o > > > +tpm-objs += tpm-dev-common.o > > > +tpm-objs += tpmrm-dev.o > > > +tpm-objs += tpm-sysfs.o > > > +tpm-objs += tpm1_eventlog.o > > > +tpm-objs += tpm2-cmd.o > > > +tpm-objs += tpm2-space.o > > > +tpm-objs += tpm2_eventlog.o > > > > If you are going to do this then sort the list please > > I've sorted in that way that in the future will probably will > compile tpm1- out, you probably mean to alphabetically. Yes alphabetically.. helps avoid merge conflicts If you wan to make TPM1 optional then the original pattern was right.. tpm-y += \ tpm-dev.o \ tpm-$(CONFIG_TPM1) += \ tpm1_eventlog.o tpm-$(CONFIG_TPM2) += \ tpm2_eventlog.o etc Jason
