3 files changed, 11 insertions, 5 deletions
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index 1f2331a07d..4411984d80 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -39,7 +39,6 @@ config CPU_SPECIFIC_OPTIONS
 	select GENERIC_UDELAY
 	select IOAPIC
 	select HAVE_USBDEBUG_OPTIONS
-	select HAVE_HARD_RESET
 	select HAVE_MONOTONIC_TIMER
 	select SPI_FLASH if HAVE_ACPI_RESUME
 	select TSC_SYNC_LFENCE
diff --git a/src/soc/amd/stoneyridge/reset.c b/src/soc/amd/stoneyridge/reset.c
index 738ec59354..34aa576a09 100644
--- a/src/soc/amd/stoneyridge/reset.c
+++ b/src/soc/amd/stoneyridge/reset.c
@@ -20,6 +20,7 @@
 #include <soc/pci_devs.h>
 #include <device/pci_ops.h>
 #include <soc/southbridge.h>
+#include <amdblocks/reset.h>
 
 void set_warm_reset_flag(void)
 {
@@ -45,7 +46,7 @@ static void clear_bios_reset(void)
 	pci_write_config32(SOC_HT_DEV, HT_INIT_CONTROL, htic);
 }
 
-void do_hard_reset(void)
+void do_cold_reset(void)
 {
 	clear_bios_reset();
 
@@ -55,7 +56,7 @@ void do_hard_reset(void)
 	outb(RST_CMD | SYS_RST, SYS_RESET);
 }
 
-void do_soft_reset(void)
+void do_warm_reset(void)
 {
 	set_warm_reset_flag();
 	clear_bios_reset();
@@ -63,3 +64,9 @@ void do_soft_reset(void)
 	/* Assert reset signals only. */
 	outb(RST_CMD | SYS_RST, SYS_RESET);
 }
+
+void do_board_reset(void)
+{
+	/* TODO: Would a warm_reset() suffice? */
+	do_cold_reset();
+}
diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c
index 37ebdc115d..326ea613b0 100644
--- a/src/soc/amd/stoneyridge/southbridge.c
+++ b/src/soc/amd/stoneyridge/southbridge.c
@@ -26,6 +26,7 @@
 #include <elog.h>
 #include <amdblocks/amd_pci_util.h>
 #include <amdblocks/agesawrapper.h>
+#include <amdblocks/reset.h>
 #include <soc/southbridge.h>
 #include <soc/smi.h>
 #include <soc/amd_pci_int_defs.h>
@@ -33,7 +34,6 @@
 #include <soc/pci_devs.h>
 #include <agesa_headers.h>
 #include <soc/nvs.h>
-#include <reset.h>
 
 /*
  * Table of devices that need their AOAC registers enabled and waited
@@ -639,7 +639,7 @@ void bootblock_fch_early_init(void)
 	setup_misc(&reboot);
 
 	if (reboot)
-		soft_reset();
+		warm_reset();
 
 	sb_enable_legacy_io();
 	enable_aoac_devices();