X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UnixPkg%2FUnixFlashMapPei%2FFlashMap.c;h=059bb34bbee90fb0b8a63dd94b854db98e3b6c01;hb=f6b4e53dfe43c27d448cedb57059e5b7ca236dd8;hp=9e96ac2425798848533b1b299e9fc25e7eeb5607;hpb=804405e7d10525e41720216137b2551f62a0663f;p=mirror_edk2.git

diff --git a/UnixPkg/UnixFlashMapPei/FlashMap.c b/UnixPkg/UnixFlashMapPei/FlashMap.c
index 9e96ac2425..059bb34bbe 100644
--- a/UnixPkg/UnixFlashMapPei/FlashMap.c
+++ b/UnixPkg/UnixFlashMapPei/FlashMap.c
@@ -1,7 +1,7 @@
 /*++
 
-Copyright (c) 2006 - 2008, Intel Corporation                                                         
-All rights reserved. This program and the accompanying materials                          
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
 http://opensource.org/licenses/bsd-license.php                                            
@@ -23,7 +23,6 @@ Abstract:
 #include "PiPei.h"
 
 #include <Guid/SystemNvDataGuid.h>
-#include <Guid/FirmwareFileSystem.h>
 #include <Ppi/UnixFwh.h>
 #include <Protocol/FirmwareVolumeBlock.h>
 
@@ -38,8 +37,8 @@ Abstract:
 EFI_STATUS
 EFIAPI
 PeimInitializeFlashMap (
-  IN EFI_FFS_FILE_HEADER       *FfsHeader,
-  IN EFI_PEI_SERVICES          **PeiServices
+  IN       EFI_PEI_FILE_HANDLE       FileHandle,
+  IN CONST EFI_PEI_SERVICES          **PeiServices
   )
 /*++
 
@@ -57,9 +56,10 @@ Returns:
 // TODO:    EFI_SUCCESS - add return value to function comment
 {
   EFI_STATUS              Status;
-  UNIX_FWH_PPI           *UnixFwhPpi;
+  UNIX_FWH_PPI            *UnixFwhPpi;
   EFI_PEI_PPI_DESCRIPTOR  *PpiDescriptor;
   EFI_PHYSICAL_ADDRESS    FdBase;
+  EFI_PHYSICAL_ADDRESS    FdFixUp;
   UINT64                  FdSize;
 
   DEBUG ((EFI_D_ERROR, "NT 32 Flash Map PEIM Loaded\n"));
@@ -78,14 +78,14 @@ Returns:
   //
   // Assume that FD0 contains the Flash map.
   //
-  Status = UnixFwhPpi->UnixFwh (0, &FdBase, &FdSize);
+  Status = UnixFwhPpi->UnixFwh (0, &FdBase, &FdSize, &FdFixUp);
   if (EFI_ERROR (Status)) {
     return Status;
   }
   
-  PcdSet32 (PcdFlashNvStorageVariableBase, PcdGet32 (PcdUnixFlashNvStorageVariableBase) + (UINT32) FdBase);
-  PcdSet32 (PcdFlashNvStorageFtwWorkingBase, PcdGet32 (PcdUnixFlashNvStorageFtwWorkingBase) + (UINT32) FdBase);
-  PcdSet32 (PcdFlashNvStorageFtwSpareBase, PcdGet32 (PcdUnixFlashNvStorageFtwSpareBase) + (UINT32) FdBase);
+  PcdSet64 (PcdFlashNvStorageVariableBase64, PcdGet64 (PcdUnixFlashNvStorageVariableBase) + FdFixUp);
+  PcdSet64 (PcdFlashNvStorageFtwWorkingBase64, PcdGet64 (PcdUnixFlashNvStorageFtwWorkingBase) + FdFixUp);
+  PcdSet64 (PcdFlashNvStorageFtwSpareBase64, PcdGet64 (PcdUnixFlashNvStorageFtwSpareBase) + FdFixUp);
 
   return EFI_SUCCESS;
 }