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

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

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index c5b6c7c1b22cce6902a53986d475d5767e389cda..d1e6232a6369cd38fcc06b6f5f2ad166187ad523 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -353,7 +353,7 @@ HOB_TEMPLATE  gHobTemplate = {
       },\r
       EFI_STATUS_CODE_RUNTIME_PROTOCOL_GUID\r
     },\r
-    NULL\r
+    0\r
   },\r
   { // EFILDR Memory Descriptor\r
     {\r

diff --git a/DuetPkg/DxeIpl/HobGeneration.h b/DuetPkg/DxeIpl/HobGeneration.h
index 9123089b7337aa42eccfc9e8e1ba1fdc13df69b4..e7e067fe674182e14f57b0cac11c5287e1ec30e8 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.h
+++ b/DuetPkg/DxeIpl/HobGeneration.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2010, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -48,7 +48,7 @@ typedef struct {
 \r
 typedef struct {\r
   EFI_HOB_GUID_TYPE             Hob;\r
-  VOID                          *Interface;\r
+  EFI_PHYSICAL_ADDRESS          Interface;\r
 } PROTOCOL_HOB;\r
 \r
 typedef struct {\r

diff --git a/DuetPkg/DxeIpl/PpisNeededByDxeCore.c b/DuetPkg/DxeIpl/PpisNeededByDxeCore.c
index a1b9b039891f9e2128461e47fea15903e8ee627e..820a14e77a3d70839e1906a048bbd494906e6ba3 100644 (file)
--- a/DuetPkg/DxeIpl/PpisNeededByDxeCore.c
+++ b/DuetPkg/DxeIpl/PpisNeededByDxeCore.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2010, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -70,7 +70,7 @@ Returns:
   //Hob->TianoDecompress.Interface = TianoDecompress;\r
 \r
   InstallSerialStatusCode (&ReportStatusCode);\r
-  Hob->SerialStatusCode.Interface = (VOID *)(UINTN)ReportStatusCode;\r
+  Hob->SerialStatusCode.Interface = (EFI_PHYSICAL_ADDRESS) (UINTN) ReportStatusCode;\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/DuetPkg/Include/EfiFlashMap.h b/DuetPkg/Include/EfiFlashMap.h
index 240789c4c6c1ac219899b36c340ac0e016b27795..5f8ade70ddcb4569e43e413209e3550735c88f8e 100644 (file)
--- a/DuetPkg/Include/EfiFlashMap.h
+++ b/DuetPkg/Include/EfiFlashMap.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
+Copyright (c) 2004 - 2010, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -143,7 +143,7 @@ typedef struct {
   // VolumeId and FilePath indicating a unique file.\r
   //\r
   UINT32                  VolumeId;\r
-  CHAR16                  FilePath[256];\r
+  CHAR16                  FilePath[258];\r
   UINT32                  ActuralSize;\r
   UINT32                  Offset;\r
 } EFI_FLASH_MAP_FS_ENTRY_DATA;\r