diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6cff14a..b44f709 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -465,4 +465,13 @@
 	  assigned to PCI devices - i.e. the memory and prefetch regions, as
 	  passed to pci_set_region().
 
+config BOOTSTAGE
+	default y
+
+config BOOTSTAGE_REPORT
+	default y
+
+config CMD_BOOTSTAGE
+	default y
+
 endmenu
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index ed7905c..a9ca50b 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -163,7 +163,7 @@
 int __weak x86_cleanup_before_linux(void)
 {
 #ifdef CONFIG_BOOTSTAGE_STASH
-	bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH,
+	bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH_ADDR,
 			CONFIG_BOOTSTAGE_STASH_SIZE);
 #endif