diff --git a/devicemodel/Makefile b/devicemodel/Makefile
index 63b7769e5..2e09263ca 100644
--- a/devicemodel/Makefile
+++ b/devicemodel/Makefile
@@ -83,9 +83,6 @@ SRCS += hw/platform/acpi/acpi.c
 SRCS += hw/platform/acpi/acpi_pm.c
 SRCS += hw/platform/rpmb/rpmb_sim.c
 SRCS += hw/platform/rpmb/rpmb_backend.c
-SRCS += hw/platform/tpm/tpm_emulator.c
-SRCS += hw/platform/tpm/tpm_crb.c
-SRCS += hw/platform/tpm/tpm.c
 SRCS += hw/platform/debugexit.c
 SRCS += hw/pci/wdt_i6300esb.c
 SRCS += hw/pci/lpc.c
diff --git a/devicemodel/core/main.c b/devicemodel/core/main.c
index ed9a57e19..dcb66094e 100644
--- a/devicemodel/core/main.c
+++ b/devicemodel/core/main.c
@@ -64,7 +64,6 @@
 #include "atomic.h"
 #include "vmcfg_config.h"
 #include "vmcfg.h"
-#include "tpm.h"
 #include "virtio.h"
 
 #define GUEST_NIO_PORT		0x488	/* guest upcalls via i/o port */
@@ -163,7 +162,6 @@ usage(int code)
 		"       --ptdev_no_reset: disable reset check for ptdev\n"
 		"       --debugexit: enable debug exit function\n"
 		"       --intr_monitor: enable interrupt storm monitor\n"
-		"       --vtpm2: Virtual TPM2 args: sock_path=$PATH_OF_SWTPM_SOCKET\n"
 		"............its params: threshold/s,probe-period(s),delay_time(ms),delay_duration(ms)\n",
 		progname, (int)strnlen(progname, PATH_MAX), "", (int)strnlen(progname, PATH_MAX), "",
 		(int)strnlen(progname, PATH_MAX), "");
@@ -471,8 +469,6 @@ vm_init_vdevs(struct vmctx *ctx)
 	if (ret < 0)
 		goto pci_fail;
 
-	init_vtpm2(ctx);
-
 	return 0;
 
 pci_fail:
@@ -507,7 +503,6 @@ vm_deinit_vdevs(struct vmctx *ctx)
 	atkbdc_deinit(ctx);
 	pci_irq_deinit(ctx);
 	ioapic_deinit();
-	deinit_vtpm2(ctx);
 }
 
 static void
@@ -694,7 +689,6 @@ enum {
 	CMD_OPT_VMCFG,
 	CMD_OPT_DUMP,
 	CMD_OPT_INTR_MONITOR,
-	CMD_OPT_VTPM2,
 };
 
 static struct option long_options[] = {
@@ -732,7 +726,6 @@ static struct option long_options[] = {
 		CMD_OPT_PTDEV_NO_RESET},
 	{"debugexit",		no_argument,		0, CMD_OPT_DEBUGEXIT},
 	{"intr_monitor",	required_argument,	0, CMD_OPT_INTR_MONITOR},
-	{"vtpm2",		required_argument,	0, CMD_OPT_VTPM2},
 	{0,			0,			0,  0  },
 };
 
@@ -876,12 +869,6 @@ dm_run(int argc, char *argv[])
 		case CMD_OPT_DEBUGEXIT:
 			debugexit_enabled = true;
 			break;
-		case CMD_OPT_VTPM2:
-			if (acrn_parse_vtpm2(optarg) != 0) {
-				errx(EX_USAGE, "invalid vtpm2 param %s", optarg);
-				exit(1);
-			}
-			break;
 		case CMD_OPT_INTR_MONITOR:
 			if (acrn_parse_intr_monitor(optarg) != 0) {
 				errx(EX_USAGE, "invalid intr-monitor params %s", optarg);