summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2014-10-30 15:11:48 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-04-10 19:32:13 +0200
commit1ab1eac63ec4c13655e917eb34c86bbf290802a2 (patch)
tree6051fe66dd5572d14f20c312b210ceac03718bcd /src/drivers
parent1164d51828c0edae56376b9ebcbb910e577ed748 (diff)
downloadcoreboot-1ab1eac63ec4c13655e917eb34c86bbf290802a2.tar.xz
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: Iac83e52db96201f37a0086eae9df244f8b8d48d9 Signed-off-by: Stefan Reinauer <reinauer@chromium.org> Original-Commit-Id: be2db391f9da80b8b75137af0fe81dc4724bc9d1 Original-Change-Id: I60ddd1d2a3e72bcf169a0b44e0c7ebcb87f4617d Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/226660 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/9468 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/pc80/Kconfig10
-rw-r--r--src/drivers/pc80/Makefile.inc3
-rw-r--r--src/drivers/pc80/tpm/Kconfig7
-rw-r--r--src/drivers/pc80/tpm/Makefile.inc1
-rw-r--r--src/drivers/pc80/tpm/tpm.c (renamed from src/drivers/pc80/tpm.c)0
5 files changed, 11 insertions, 10 deletions
diff --git a/src/drivers/pc80/Kconfig b/src/drivers/pc80/Kconfig
index f6da88c03c..a1e94aba57 100644
--- a/src/drivers/pc80/Kconfig
+++ b/src/drivers/pc80/Kconfig
@@ -17,16 +17,10 @@ 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
bool
default y if ARCH_X86
+source src/drivers/pc80/tpm/Kconfig
+
endif
diff --git a/src/drivers/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc
index 97159497fd..be8e8ea176 100644
--- a/src/drivers/pc80/Makefile.inc
+++ b/src/drivers/pc80/Makefile.inc
@@ -9,10 +9,9 @@ ramstage-$(CONFIG_SPKMODEM) += spkmodem.c
romstage-$(CONFIG_DRIVERS_MC146818) += mc146818rtc_early.c
-romstage-$(CONFIG_LPC_TPM) += tpm.c
romstage-$(CONFIG_SPKMODEM) += spkmodem.c
-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
index c0429ddc9c..c0429ddc9c 100644
--- a/src/drivers/pc80/tpm.c
+++ b/src/drivers/pc80/tpm/tpm.c