New patch to review for coreboot: 5736000 AMD F15: Fix warnings in Proc/Common

[Martin Roth]

Martin Roth ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3125

-gerrit

commit 5736000112c3593817157f76bcc7391db63728ba
Author: Martin Roth 
Date:   Tue Apr 23 15:02:51 2013 -0600

AMD F15: Fix warnings in Proc/Common

This fixes 3 warnings in the Proc/Common directory:

AmdS3Save.c:250, GNU Compiler 4 (gcc), Priority: Normal
    AmdS3LateRestore.c:123, GNU Compiler 4 (gcc), Priority: Normal
    cast from pointer to integer of different size [-Wpointer-to-int-cast]
    Fixed with a second cast to (intptr_t)

AmdInitReset.c:153, GNU Compiler 4 (gcc), Priority: Normal
    statement with no effect [-Wunused-value]
    Fixed by commenting the line out as it is in the other families code.

Change-Id: Ib35ec466671712af01568b7c2a18ee138fe883c0
    Signed-off-by: Martin Roth 
---
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c     | 2 +-
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c | 2 +-
 src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c
index d96d21e..7a2d1a1 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdInitReset.c
@@ -150,7 +150,7 @@ AmdInitReset (
     AgesaStatus = CalledAgesaStatus;
   }

-  IDS_EXTENDED_HOOK (IDS_INIT_RESET_BEFORE, NULL, NULL, &ResetParams->StdHeader);
+  // IDS_EXTENDED_HOOK (IDS_INIT_RESET_BEFORE, NULL, NULL, &ResetParams->StdHeader);

// Init Debug Print function
   IDS_HDT_CONSOLE_INIT (&ResetParams->StdHeader);
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c
index 22f6803..e293d46 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3LateRestore.c
@@ -120,7 +120,7 @@ AmdS3LateRestore (
   ASSERT (S3LateParams != NULL);

BufferPointer = (UINT8 *) S3LateParams->S3DataBlock.VolatileStorage;
-  S3LateParams->StdHeader.HeapBasePtr = (UINT64) &BufferPointer[((S3_VOLATILE_STORAGE_HEADER *) S3LateParams->S3DataBlock.VolatileStorage)->HeapOffset];
+  S3LateParams->StdHeader.HeapBasePtr = (UINT64) (intptr_t) &BufferPointer[((S3_VOLATILE_STORAGE_HEADER *) S3LateParams->S3DataBlock.VolatileStorage)->HeapOffset];
   ASSERT (S3LateParams->StdHeader.HeapBasePtr != 0);

IDS_HDT_CONSOLE_INIT (&S3LateParams->StdHeader);
diff --git a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c
index 6cff161..59059a3 100644
--- a/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c
+++ b/src/vendorcode/amd/agesa/f15/Proc/Common/AmdS3Save.c
@@ -247,7 +247,7 @@ AmdS3Save (

HeapStatus = AmdS3SaveParams->StdHeader.HeapStatus;
           AmdS3SaveParams->StdHeader.HeapStatus = HEAP_S3_RESUME;
-          AmdS3SaveParams->StdHeader.HeapBasePtr = (UINT64) HeapPtr;
+          AmdS3SaveParams->StdHeader.HeapBasePtr = (UINT64) (intptr_t) HeapPtr;

for (i = 0; i < S3LATE_TABLE_SIZE; i++) {
             if (HeapPtrs[i] != NULL) {