Messages in this thread | | | Subject | Re: [PATCH] tpm: Revert tpm_tis_spi_mod.ko to tpm_tis_spi.ko. | From | Alexander Steffen <> | Date | Thu, 6 Feb 2020 13:54:11 +0100 |
| |
On 05.02.2020 21:38, Jarkko Sakkinen wrote: > Revert tpm_tis_spi_mod.ko back to tpm_tis_spi.ko as the rename could break > the build script. This can be achieved by renaming tpm_tis_spi.c as > tpm_tis_spi_main.c. Then tpm_tis_spi-y can be used inside the makefile. > > Cc: Andrey Pronin <apronin@chromium.org> > Cc: Stephen Boyd <swboyd@chromium.org> > Cc: stable@vger.kernel.org > Fixes: 797c0113c9a4 ("tpm: tpm_tis_spi: Support cr50 devices") > Reported-by: Alexander Steffen <Alexander.Steffen@infineon.com> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > --- > drivers/char/tpm/Makefile | 8 +++++--- > drivers/char/tpm/{tpm_tis_spi.c => tpm_tis_spi_main.c} | 0 > 2 files changed, 5 insertions(+), 3 deletions(-) > rename drivers/char/tpm/{tpm_tis_spi.c => tpm_tis_spi_main.c} (100%) > > diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile > index 5a0d99d4fec0..9567e5197f74 100644 > --- a/drivers/char/tpm/Makefile > +++ b/drivers/char/tpm/Makefile > @@ -21,9 +21,11 @@ tpm-$(CONFIG_EFI) += eventlog/efi.o > tpm-$(CONFIG_OF) += 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_mod.o > -tpm_tis_spi_mod-y := tpm_tis_spi.o > -tpm_tis_spi_mod-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o > + > +obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o > +tpm_tis_spi-y := tpm_tis_spi_main.o > +tpm_tis_spi-$(CONFIG_TCG_TIS_SPI_CR50) += tpm_tis_spi_cr50.o > + > obj-$(CONFIG_TCG_TIS_I2C_ATMEL) += tpm_i2c_atmel.o > obj-$(CONFIG_TCG_TIS_I2C_INFINEON) += tpm_i2c_infineon.o > obj-$(CONFIG_TCG_TIS_I2C_NUVOTON) += tpm_i2c_nuvoton.o > diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi_main.c > similarity index 100% > rename from drivers/char/tpm/tpm_tis_spi.c > rename to drivers/char/tpm/tpm_tis_spi_main.c
Works for me, thank you very much :)
Alexander
| |