GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@google.com>
Reviewed-on: https://review.coreboot.org/22440
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Martin Roth 2017-11-12 10:56:43 -07:00
parent 48e44eecc7
commit 4f92b15c13
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/soc/amd/common/def_callouts.c
View File

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