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
similarity index 100%
rename from src/drivers/pc80/tpm.c
rename to src/drivers/pc80/tpm/tpm.c