[coreboot-gerrit] Change in coreboot[master]: amd/stoneyridge: Update def_callouts.c to reset using reset.c

[Martin Roth (Code Review)]

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/22440


Change subject: amd/stoneyridge: Update def_callouts.c to reset using reset.c
......................................................................

amd/stoneyridge: Update def_callouts.c to reset using reset.c

Convert functionality to use coreboot-centric functions and defined
values.  This change should have no functional effect.

BUG=b:62241048
TEST=Build Gardenia; Build & boot Kahlee.

Change-Id: I62ae50af05d3ac770560368245c4ae81cf9c4395
Signed-off-by: Martin Roth <martinroth at google.com>
---
M src/soc/amd/common/def_callouts.c
1 file changed, 6 insertions(+), 4 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/22440/1

diff --git a/src/soc/amd/common/def_callouts.c b/src/soc/amd/common/def_callouts.c
index e8d404e..4e42e9e 100644
--- a/src/soc/amd/common/def_callouts.c
+++ b/src/soc/amd/common/def_callouts.c
@@ -18,6 +18,7 @@
 #include <amdlib.h>
 #include <BiosCallOuts.h>
 #include "agesawrapper.h"
+#include <reset.h>
 #include <soc/southbridge.h>
 
 #if ENV_BOOTBLOCK
@@ -100,7 +101,6 @@
 AGESA_STATUS agesa_Reset(UINT32 Func, UINTN Data, VOID *ConfigPtr)
 {
 	AGESA_STATUS Status;
-	UINT8 Value;
 	UINTN ResetType;
 	AMD_CONFIG_PARAMS *StdHeader;
 
@@ -114,11 +114,13 @@
 	 */
 	switch (ResetType) {
 	case WARM_RESET_WHENEVER:
-	case COLD_RESET_WHENEVER:
 	case WARM_RESET_IMMEDIATELY:
+		do_soft_reset();
+		break;
+
+	case COLD_RESET_WHENEVER:
 	case COLD_RESET_IMMEDIATELY:
-		Value = 0x06;
-		LibAmdIoWrite(AccessWidth8, SYS_RESET, &Value, StdHeader);
+		do_hard_reset();
 		break;
 
 	default:

-- 
To view, visit https://review.coreboot.org/22440
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62ae50af05d3ac770560368245c4ae81cf9c4395
Gerrit-Change-Number: 22440
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171112/008296a9/attachment.html>