diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index 435d7049ea..c72c60b309 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -13,7 +13,7 @@ romstage-y += die.c
 
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += vtxprintf.c printk.c
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += init.c console.c
-bootblock-y += die.c
+bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += die.c
 
 $(obj)/console/init.smm.o : $(obj)/build.h
 $(obj)/console/init.ramstage.o : $(obj)/build.h
diff --git a/src/cpu/samsung/exynos5250/wakeup.c b/src/cpu/samsung/exynos5250/wakeup.c
index 5764c83bd6..02f2ccd2db 100644
--- a/src/cpu/samsung/exynos5250/wakeup.c
+++ b/src/cpu/samsung/exynos5250/wakeup.c
@@ -28,8 +28,8 @@ void wakeup(void)
 
 	power_init();  /* Ensure ps_hold_setup() for early wakeup. */
 	power_exit_wakeup();
-	/* Should never return. */
-	die("Failed to wake up.\n");
+	/* Should never return. If we do, reset. */
+	power_reset();
 }
 
 int get_wakeup_state(void)
diff --git a/src/cpu/samsung/exynos5420/wakeup.c b/src/cpu/samsung/exynos5420/wakeup.c
index af7ef73f89..9d3f065233 100644
--- a/src/cpu/samsung/exynos5420/wakeup.c
+++ b/src/cpu/samsung/exynos5420/wakeup.c
@@ -31,8 +31,8 @@ void wakeup(void)
 	dcache_mmu_disable();
 	icache_invalidate_all();
 	power_exit_wakeup();
-	/* Should never return. */
-	die("Failed to wake up.\n");
+	/* Should never return. If we do, reset. */
+	power_reset();
 }
 
 int get_wakeup_state(void)