Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bfb2374 authored by Thiebaud Weksteen's avatar Thiebaud Weksteen Committed by Jarkko Sakkinen
Browse files

tpm: Move eventlog files to a subdirectory 



Signed-off-by: default avatarThiebaud Weksteen <tweek@google.com>
Suggested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 09dd144f

drivers/char/tpm/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 
#

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 \

	 tpm-dev-common.o tpmrm-dev.o eventlog/tpm1.o eventlog/tpm2.o \

         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

tpm-$(CONFIG_ACPI) += tpm_ppi.o eventlog/acpi.o

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.o

drivers/char/tpm/tpm_eventlog_acpi.c→drivers/char/tpm/eventlog/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/acpi.h>

#include <linux/tpm_eventlog.h>



#include "tpm.h"

#include "../tpm.h"



struct acpi_tcpa {

	struct acpi_table_header hdr;

drivers/char/tpm/tpm_eventlog_efi.c→drivers/char/tpm/eventlog/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/efi.h>

#include <linux/tpm_eventlog.h>



#include "tpm.h"

#include "../tpm.h"



/* read binary bios log from EFI configuration table */

int tpm_read_log_efi(struct tpm_chip *chip)

drivers/char/tpm/tpm_eventlog_of.c→drivers/char/tpm/eventlog/of.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/of.h>

#include <linux/tpm_eventlog.h>



#include "tpm.h"

#include "../tpm.h"



int tpm_read_log_of(struct tpm_chip *chip)

{

drivers/char/tpm/tpm1_eventlog.c→drivers/char/tpm/eventlog/tpm1.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/slab.h>

#include <linux/tpm_eventlog.h>



#include "tpm.h"

#include "../tpm.h"





static const char* tcpa_event_type_strings[] = {