AGESA vendorcode: Fix logic error
We have not really hit this error, due the test on AGESA_UNSUPPORTED above. Change-Id: I6e7d136a1bb46138cc347225bc4c82cfeaff385d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/14394 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
parent
318e2ac974
commit
4dcbdb0ab9
|
@ -109,7 +109,7 @@ AmdAgesaDispatcher (
|
||||||
|
|
||||||
// 3. If not this image specific function, see if we can find alternative image instead
|
// 3. If not this image specific function, see if we can find alternative image instead
|
||||||
if (Status == AGESA_UNSUPPORTED) {
|
if (Status == AGESA_UNSUPPORTED) {
|
||||||
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) || (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) && (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
||||||
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
||||||
ImageEnd = ImageStart + 4;
|
ImageEnd = ImageStart + 4;
|
||||||
// Locate/test image base that matches this component
|
// Locate/test image base that matches this component
|
||||||
|
|
|
@ -112,7 +112,7 @@ AmdAgesaDispatcher (
|
||||||
|
|
||||||
// 3. If not this image specific function, see if we can find alternative image instead
|
// 3. If not this image specific function, see if we can find alternative image instead
|
||||||
if (Status == AGESA_UNSUPPORTED) {
|
if (Status == AGESA_UNSUPPORTED) {
|
||||||
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) || (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) && (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
||||||
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
||||||
ImageEnd = ImageStart + 4;
|
ImageEnd = ImageStart + 4;
|
||||||
// Locate/test image base that matches this component
|
// Locate/test image base that matches this component
|
||||||
|
|
|
@ -115,7 +115,7 @@ AmdAgesaDispatcher (
|
||||||
|
|
||||||
// 3. If not this image specific function, see if we can find alternative image instead
|
// 3. If not this image specific function, see if we can find alternative image instead
|
||||||
if (Status == AGESA_UNSUPPORTED) {
|
if (Status == AGESA_UNSUPPORTED) {
|
||||||
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) || (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) && (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
||||||
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
||||||
ImageEnd = ImageStart + 4;
|
ImageEnd = ImageStart + 4;
|
||||||
// Locate/test image base that matches this component
|
// Locate/test image base that matches this component
|
||||||
|
|
|
@ -113,7 +113,7 @@ AmdAgesaDispatcher (
|
||||||
|
|
||||||
// 3. If not this image specific function, see if we can find alternative image instead
|
// 3. If not this image specific function, see if we can find alternative image instead
|
||||||
if (Status == AGESA_UNSUPPORTED) {
|
if (Status == AGESA_UNSUPPORTED) {
|
||||||
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) || (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) && (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
||||||
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
||||||
ImageEnd = ImageStart + 4;
|
ImageEnd = ImageStart + 4;
|
||||||
// Locate/test image base that matches this component
|
// Locate/test image base that matches this component
|
||||||
|
|
|
@ -112,7 +112,7 @@ AmdAgesaDispatcher (
|
||||||
|
|
||||||
// 3. If not this image specific function, see if we can find alternative image instead
|
// 3. If not this image specific function, see if we can find alternative image instead
|
||||||
if (Status == AGESA_UNSUPPORTED) {
|
if (Status == AGESA_UNSUPPORTED) {
|
||||||
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) || (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) && (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
||||||
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
||||||
ImageEnd = ImageStart + 4;
|
ImageEnd = ImageStart + 4;
|
||||||
// Locate/test image base that matches this component
|
// Locate/test image base that matches this component
|
||||||
|
|
|
@ -112,7 +112,7 @@ AmdAgesaDispatcher (
|
||||||
|
|
||||||
// 3. If not this image specific function, see if we can find alternative image instead
|
// 3. If not this image specific function, see if we can find alternative image instead
|
||||||
if (Status == AGESA_UNSUPPORTED) {
|
if (Status == AGESA_UNSUPPORTED) {
|
||||||
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) || (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
if ((((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0xFFFFFFFF ) && (((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr != 0)) {
|
||||||
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
ImageStart = ((AMD_CONFIG_PARAMS *)ConfigPtr)->AltImageBasePtr;
|
||||||
ImageEnd = ImageStart + 4;
|
ImageEnd = ImageStart + 4;
|
||||||
// Locate/test image base that matches this component
|
// Locate/test image base that matches this component
|
||||||
|
|
Loading…
Reference in New Issue