From 83f0139478b4376162b11012c9c0ca32ca9c597e Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 14 Dec 2014 21:43:53 +0200 Subject: AGESA fam15: Ignore AmdCreateStruct() errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1b7c95e08d74784e0f144cd5836d46bda64a3596 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7819 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/northbridge/amd/agesa/family15/agesawrapper.c | 31 +++++++--------------- .../amd/agesa/family15rl/agesawrapper.c | 2 +- .../amd/agesa/family15tn/agesawrapper.c | 2 +- .../amd/agesa/family16kb/agesawrapper.c | 2 +- 4 files changed, 12 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/northbridge/amd/agesa/family15/agesawrapper.c b/src/northbridge/amd/agesa/family15/agesawrapper.c index 9fc8ab9b5a..602a718e4a 100644 --- a/src/northbridge/amd/agesa/family15/agesawrapper.c +++ b/src/northbridge/amd/agesa/family15/agesawrapper.c @@ -77,10 +77,8 @@ AGESA_STATUS agesawrapper_amdinitreset(void) AmdParamStruct.StdHeader.CalloutPtr = NULL; AmdParamStruct.StdHeader.Func = 0; AmdParamStruct.StdHeader.ImageBasePtr = 0; - status = AmdCreateStruct(&AmdParamStruct); - if (status != AGESA_SUCCESS) { - return status; - } + + AmdCreateStruct(&AmdParamStruct); AmdResetParams.HtConfig.Depth = 0; //MARG34PI disabled AGESA_ENTRY_INIT_RESET by default @@ -110,10 +108,8 @@ AGESA_STATUS agesawrapper_amdinitearly(void) AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) & GetBiosCallout; AmdParamStruct.StdHeader.Func = 0; AmdParamStruct.StdHeader.ImageBasePtr = 0; - status = AmdCreateStruct(&AmdParamStruct); - if (status != AGESA_SUCCESS) { - return status; - } + + AmdCreateStruct(&AmdParamStruct); AmdEarlyParamsPtr = (AMD_EARLY_PARAMS *) AmdParamStruct.NewStructPtr; @@ -149,10 +145,8 @@ AGESA_STATUS agesawrapper_amdinitpost(void) AmdParamStruct.StdHeader.Func = 0; AmdParamStruct.StdHeader.ImageBasePtr = 0; - status = AmdCreateStruct(&AmdParamStruct); - if (status != AGESA_SUCCESS) { - return status; - } + AmdCreateStruct(&AmdParamStruct); + PostParams = (AMD_POST_PARAMS *) AmdParamStruct.NewStructPtr; /* OEM Should Customize the defaults through this hook */ @@ -188,11 +182,7 @@ AGESA_STATUS agesawrapper_amdinitenv(void) AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) & GetBiosCallout; AmdParamStruct.StdHeader.Func = 0; AmdParamStruct.StdHeader.ImageBasePtr = 0; - - status = AmdCreateStruct(&AmdParamStruct); - if (status != AGESA_SUCCESS) { - return status; - } + AmdCreateStruct(&AmdParamStruct); EnvParams = (AMD_ENV_PARAMS *) AmdParamStruct.NewStructPtr; status = AmdInitEnv(EnvParams); AGESA_EVENTLOG(status, &EnvParams->StdHeader); @@ -242,10 +232,8 @@ AGESA_STATUS agesawrapper_amdinitmid(void) AmdParamStruct.StdHeader.Func = 0; AmdParamStruct.StdHeader.ImageBasePtr = 0; - status = AmdCreateStruct(&AmdParamStruct); - if (status != AGESA_SUCCESS) { - return status; - } + AmdCreateStruct(&AmdParamStruct); + status = AmdInitMid((AMD_MID_PARAMS *) AmdParamStruct.NewStructPtr); AGESA_EVENTLOG(status, &AmdParamStruct.StdHeader); AmdReleaseStruct(&AmdParamStruct); @@ -267,7 +255,6 @@ AGESA_STATUS agesawrapper_amdinitlate(void) AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) & GetBiosCallout; AmdParamStruct.StdHeader.Func = 0; AmdParamStruct.StdHeader.ImageBasePtr = 0; - AmdCreateStruct(&AmdParamStruct); AmdLateParamsPtr = (AMD_LATE_PARAMS *) AmdParamStruct.NewStructPtr; diff --git a/src/northbridge/amd/agesa/family15rl/agesawrapper.c b/src/northbridge/amd/agesa/family15rl/agesawrapper.c index 82becf4737..00c9867680 100644 --- a/src/northbridge/amd/agesa/family15rl/agesawrapper.c +++ b/src/northbridge/amd/agesa/family15rl/agesawrapper.c @@ -144,7 +144,7 @@ AGESA_STATUS agesawrapper_amdinitenv(void) AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) & GetBiosCallout; AmdParamStruct.StdHeader.Func = 0; AmdParamStruct.StdHeader.ImageBasePtr = 0; - status = AmdCreateStruct(&AmdParamStruct); + AmdCreateStruct(&AmdParamStruct); EnvParam = (AMD_ENV_PARAMS *) AmdParamStruct.NewStructPtr; status = AmdInitEnv(EnvParam); diff --git a/src/northbridge/amd/agesa/family15tn/agesawrapper.c b/src/northbridge/amd/agesa/family15tn/agesawrapper.c index 82becf4737..00c9867680 100644 --- a/src/northbridge/amd/agesa/family15tn/agesawrapper.c +++ b/src/northbridge/amd/agesa/family15tn/agesawrapper.c @@ -144,7 +144,7 @@ AGESA_STATUS agesawrapper_amdinitenv(void) AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) & GetBiosCallout; AmdParamStruct.StdHeader.Func = 0; AmdParamStruct.StdHeader.ImageBasePtr = 0; - status = AmdCreateStruct(&AmdParamStruct); + AmdCreateStruct(&AmdParamStruct); EnvParam = (AMD_ENV_PARAMS *) AmdParamStruct.NewStructPtr; status = AmdInitEnv(EnvParam); diff --git a/src/northbridge/amd/agesa/family16kb/agesawrapper.c b/src/northbridge/amd/agesa/family16kb/agesawrapper.c index 82becf4737..00c9867680 100644 --- a/src/northbridge/amd/agesa/family16kb/agesawrapper.c +++ b/src/northbridge/amd/agesa/family16kb/agesawrapper.c @@ -144,7 +144,7 @@ AGESA_STATUS agesawrapper_amdinitenv(void) AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) & GetBiosCallout; AmdParamStruct.StdHeader.Func = 0; AmdParamStruct.StdHeader.ImageBasePtr = 0; - status = AmdCreateStruct(&AmdParamStruct); + AmdCreateStruct(&AmdParamStruct); EnvParam = (AMD_ENV_PARAMS *) AmdParamStruct.NewStructPtr; status = AmdInitEnv(EnvParam); -- cgit v1.2.3