diff --git a/board/cr50/build.mk b/board/cr50/build.mk
index ef2299dccd..ed2f475827 100644
--- a/board/cr50/build.mk
+++ b/board/cr50/build.mk
@@ -43,12 +43,10 @@ board-y += tpm2/hash_data.o
 board-y += tpm2/hkdf.o
 board-y += tpm2/manufacture.o
 board-y += tpm2/platform.o
-board-y += tpm2/post_reset.o
 board-y += tpm2/rsa.o
 board-y += tpm2/stubs.o
 board-y += tpm2/tpm_state.o
 board-y += tpm2/trng.o
-board-y += tpm2/upgrade.o
 board-y += tpm_nvmem_read.o
 board-y += wp.o
 
diff --git a/board/mn50/board.c b/board/mn50/board.c
index 0981a516ce..992fceb93c 100644
--- a/board/mn50/board.c
+++ b/board/mn50/board.c
@@ -304,7 +304,11 @@ DECLARE_SAFE_CONSOLE_COMMAND(socket, command_socket,
 			     "[enable|disable]",
 			     "Activate and deactivate socket");
 
-
+void post_reboot_request(void)
+{
+	/* This will never return. */
+	system_reset(SYSTEM_RESET_MANUALLY_TRIGGERED | SYSTEM_RESET_HARD);
+}
 
 /* Determine key type based on the key ID. */
 static const char *key_type(uint32_t key_id)
diff --git a/chip/g/build.mk b/chip/g/build.mk
index e8eec5f06e..692d4ec320 100644
--- a/chip/g/build.mk
+++ b/chip/g/build.mk
@@ -66,7 +66,7 @@ chip-y+= pmu.o
 chip-y+= trng.o
 chip-y+= runlevel.o
 chip-$(CONFIG_USB_FW_UPDATE)+= usb_upgrade.o
-chip-$(CONFIG_NON_HC_FW_UPDATE)+= upgrade_fw.o
+chip-$(CONFIG_NON_HC_FW_UPDATE)+= upgrade_fw.o post_reset.o upgrade.o
 chip-$(CONFIG_SPS)+= sps.o
 chip-$(CONFIG_TPM_SPS)+=sps_tpm.o
 chip-$(CONFIG_WATCHDOG)+=watchdog.o
diff --git a/board/cr50/tpm2/post_reset.c b/chip/g/post_reset.c
similarity index 100%
rename from board/cr50/tpm2/post_reset.c
rename to chip/g/post_reset.c
diff --git a/board/cr50/tpm2/upgrade.c b/chip/g/upgrade.c
similarity index 100%
rename from board/cr50/tpm2/upgrade.c
rename to chip/g/upgrade.c