Change DUET specific HOB structure to make all HOB 8-byte align to fix the PI-SCT failure.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10066 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 7 insertions, 7 deletions

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index c5b6c7c1b2..d1e6232a63 100644
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -353,7 +353,7 @@ HOB_TEMPLATE  gHobTemplate = {
       },

       EFI_STATUS_CODE_RUNTIME_PROTOCOL_GUID

     },

-    NULL

+    0

   },

   { // EFILDR Memory Descriptor

     {

diff --git a/DuetPkg/DxeIpl/HobGeneration.h b/DuetPkg/DxeIpl/HobGeneration.h
index 9123089b73..e7e067fe67 100644
--- a/DuetPkg/DxeIpl/HobGeneration.h
+++ b/DuetPkg/DxeIpl/HobGeneration.h
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2006 - 2009, Intel Corporation                                                         

+Copyright (c) 2006 - 2010, Intel Corporation                                                         

 All rights reserved. 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        

@@ -48,7 +48,7 @@ typedef struct {
 

 typedef struct {

   EFI_HOB_GUID_TYPE             Hob;

-  VOID                          *Interface;

+  EFI_PHYSICAL_ADDRESS          Interface;

 } PROTOCOL_HOB;

 

 typedef struct {

diff --git a/DuetPkg/DxeIpl/PpisNeededByDxeCore.c b/DuetPkg/DxeIpl/PpisNeededByDxeCore.c
index a1b9b03989..820a14e77a 100644
--- a/DuetPkg/DxeIpl/PpisNeededByDxeCore.c
+++ b/DuetPkg/DxeIpl/PpisNeededByDxeCore.c
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2010, Intel Corporation                                                         

 All rights reserved. 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        

@@ -70,7 +70,7 @@ Returns:
   //Hob->TianoDecompress.Interface = TianoDecompress;

 

   InstallSerialStatusCode (&ReportStatusCode);

-  Hob->SerialStatusCode.Interface = (VOID *)(UINTN)ReportStatusCode;

+  Hob->SerialStatusCode.Interface = (EFI_PHYSICAL_ADDRESS) (UINTN) ReportStatusCode;

 

   return EFI_SUCCESS;

 }

diff --git a/DuetPkg/Include/EfiFlashMap.h b/DuetPkg/Include/EfiFlashMap.h
index 240789c4c6..5f8ade70dd 100644
--- a/DuetPkg/Include/EfiFlashMap.h
+++ b/DuetPkg/Include/EfiFlashMap.h
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2004 - 2007, Intel Corporation                                                         

+Copyright (c) 2004 - 2010, Intel Corporation                                                         

 All rights reserved. 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        

@@ -143,7 +143,7 @@ typedef struct {
   // VolumeId and FilePath indicating a unique file.

   //

   UINT32                  VolumeId;

-  CHAR16                  FilePath[256];

+  CHAR16                  FilePath[258];

   UINT32                  ActuralSize;

   UINT32                  Offset;

 } EFI_FLASH_MAP_FS_ENTRY_DATA;