Merge branch '2023-09-30-assorted-build-related-changes' into next

- Assorted build cleanups / changes

2 files changed, 6 insertions, 5 deletions

diff --git a/test/common/Makefile b/test/common/Makefile
index a5ab10f6f69..12c65f8c951 100644
--- a/test/common/Makefile
+++ b/test/common/Makefile
@@ -2,5 +2,5 @@
 obj-y += cmd_ut_common.o
 obj-$(CONFIG_AUTOBOOT) += test_autoboot.o
 obj-$(CONFIG_CYCLIC) += cyclic.o
-obj-$(CONFIG_EVENT) += event.o
+obj-$(CONFIG_EVENT_DYNAMIC) += event.o
 obj-y += cread.o
diff --git a/test/dm/tpm.c b/test/dm/tpm.c
index 3defb3c3da1..cde933ab284 100644
--- a/test/dm/tpm.c
+++ b/test/dm/tpm.c
@@ -98,10 +98,11 @@ static int test_tpm_autostart(struct unit_test_state *uts,
 
 	if (reinit)
 		ut_assertok(tpm_init(dev));
-	 /*
-	  * tpm_auto_start will rerun tpm_init() if reinit, but handles the
-	  * -EBUSY return code internally.
-	  */
+
+	/*
+	 * tpm_auto_start will rerun tpm_init() if reinit, but handles the
+	 * -EBUSY return code internally.
+	 */
 	ut_assertok(tpm_auto_start(dev));
 
 	return 0;