2 files changed, 16 insertions, 19 deletions
diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c
index 46db93c719..96f5e27580 100644
--- a/src/lib/loaders/load_and_run_payload.c
+++ b/src/lib/loaders/load_and_run_payload.c
@@ -21,7 +21,10 @@
 #include <stdlib.h>
 #include <console/console.h>
 #include <boot/coreboot_tables.h>
+#include <fallback.h>
+#include <lib.h>
 #include <payload_loader.h>
+#include <timestamp.h>
 
 extern const struct payload_loader_ops vboot_payload_loader;
 extern const struct payload_loader_ops cbfs_payload_loader;
@@ -77,5 +80,18 @@ void payload_run(const struct payload *payload)
 	if (payload == NULL)
 		return;
 
+	/* Reset to booting from this image as late as possible */
+	boot_successful();
+
+	printk(BIOS_DEBUG, "Jumping to boot code at %p\n", payload->entry);
+	post_code(POST_ENTER_ELF_BOOT);
+
+	timestamp_add_now(TS_SELFBOOT_JUMP);
+
+	/* Before we go off to run the payload, see if
+	 * we stayed within our bounds.
+	 */
+	checkstack(_estack, 0);
+
 	selfboot(payload->entry);
 }
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index c0986d11e8..6f200fa868 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -22,16 +22,12 @@
 #include <arch/stages.h>
 #include <console/console.h>
 #include <cpu/cpu.h>
-#include <fallback.h>
 #include <boot/coreboot_tables.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <cbfs.h>
 #include <lib.h>
-#if CONFIG_COLLECT_TIMESTAMPS
-#include <timestamp.h>
-#endif
 #include <payload_loader.h>
 
 /* Maximum physical address we can use for the coreboot bounce buffer. */
@@ -527,21 +523,6 @@ out:
 
 void selfboot(void *entry)
 {
-	/* Reset to booting from this image as late as possible */
-	boot_successful();
-
-	printk(BIOS_DEBUG, "Jumping to boot code at %p\n", entry);
-	post_code(POST_ENTER_ELF_BOOT);
-
-#if CONFIG_COLLECT_TIMESTAMPS
-	timestamp_add_now(TS_SELFBOOT_JUMP);
-#endif
-
-	/* Before we go off to run the payload, see if
-	 * we stayed within our bounds.
-	 */
-	checkstack(_estack, 0);
-
 	/* Jump to kernel */
 	jmp_to_elf_entry(entry, bounce_buffer, bounce_size);
 }