From be2db391f9da80b8b75137af0fe81dc4724bc9d1 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Thu, 30 Oct 2014 15:11:48 -0700 Subject: [PATCH] tpm: Move the LPC TPM driver to a subdirectory This moves the LPC TPM driver to drivers/pc80/tpm so it can be turned into a ramstage driver with a chip.h It includes no other changes yet. BUG=chrome-os-partner:33385 BRANCH=samus,auron TEST=emerge-samus coreboot Change-Id: I60ddd1d2a3e72bcf169a0b44e0c7ebcb87f4617d Signed-off-by: Duncan Laurie Reviewed-on: https://chromium-review.googlesource.com/226660 Reviewed-by: Aaron Durbin --- src/drivers/pc80/Kconfig | 10 ++-------- src/drivers/pc80/Makefile.inc | 3 +-- src/drivers/pc80/tpm/Kconfig | 7 +++++++ src/drivers/pc80/tpm/Makefile.inc | 1 + src/drivers/pc80/{ => tpm}/tpm.c | 0 5 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 src/drivers/pc80/tpm/Kconfig create mode 100644 src/drivers/pc80/tpm/Makefile.inc rename src/drivers/pc80/{ => tpm}/tpm.c (100%) diff --git a/src/drivers/pc80/Kconfig b/src/drivers/pc80/Kconfig index 99e66d33e0..2e406b3715 100644 --- a/src/drivers/pc80/Kconfig +++ b/src/drivers/pc80/Kconfig @@ -15,14 +15,6 @@ config DRIVERS_PS2_KEYBOARD this option, then you can say N here to speed up boot time. Otherwise say Y. -config LPC_TPM - bool - default n - help - Enable this option to enable TPM support in coreboot. - - If unsure, say N. - config DRIVERS_MC146818_RTC bool default y if ARCH_X86 @@ -37,3 +29,5 @@ config DRIVERS_RTC_HAS_ALTCENTURY bool "The RTC supports alt century" depends on DRIVERS_MC146818_RTC default y + +source src/drivers/pc80/tpm/Kconfig diff --git a/src/drivers/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc index 6851d7925b..61b3853b61 100644 --- a/src/drivers/pc80/Makefile.inc +++ b/src/drivers/pc80/Makefile.inc @@ -6,12 +6,11 @@ ramstage-y += i8259.c ramstage-$(CONFIG_UDELAY_IO) += udelay_io.c ramstage-y += keyboard.c -romstage-$(CONFIG_LPC_TPM) += tpm.c ifeq ($(CONFIG_DRIVERS_MC146818_CMOS),y) romstage-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.c endif -subdirs-y += vga +subdirs-y += tpm vga cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += cmos.default cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE):nvramtool diff --git a/src/drivers/pc80/tpm/Kconfig b/src/drivers/pc80/tpm/Kconfig new file mode 100644 index 0000000000..fbb3b423f4 --- /dev/null +++ b/src/drivers/pc80/tpm/Kconfig @@ -0,0 +1,7 @@ +config LPC_TPM + bool + default n + help + Enable this option to enable LPC TPM support in coreboot. + + If unsure, say N. diff --git a/src/drivers/pc80/tpm/Makefile.inc b/src/drivers/pc80/tpm/Makefile.inc new file mode 100644 index 0000000000..6f973e12f1 --- /dev/null +++ b/src/drivers/pc80/tpm/Makefile.inc @@ -0,0 +1 @@ +romstage-$(CONFIG_LPC_TPM) += tpm.c diff --git a/src/drivers/pc80/tpm.c b/src/drivers/pc80/tpm/tpm.c similarity index 100% rename from src/drivers/pc80/tpm.c rename to src/drivers/pc80/tpm/tpm.c