diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-09-30 05:57:44 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-09-30 05:57:44 +0000 |
| commit | ec2b081a9cb8bb63d4bc6f429c359ca960148a34 (patch) | |
| tree | cf9aa14d6c81a0de44e87832d04241d9a35bcad8 | |
| parent | 907eac63e690c22cee07cf809cc36ace7c497fd2 (diff) | |
| download | edk2-platforms-ec2b081a9cb8bb63d4bc6f429c359ca960148a34.tar.xz | |
1. Move Capsule variable name definition to Capsule variable GUID header file.
2. Align EFI_CAPSULE_LONG_MODE_BUFFER structure to MdeModulePkg definition.
Signed-off-by: lgao4
Reviewed-by: hhtian
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12492 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h | 19 | ||||
| -rw-r--r-- | EdkCompatibilityPkg/Sample/Platform/Generic/Pei/Capsule/Capsule.h | 18 |
2 files changed, 20 insertions, 17 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h b/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h index aa29273e15..49c64e946c 100644 --- a/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h +++ b/EdkCompatibilityPkg/Foundation/Guid/Capsule/Capsule.h @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2011, 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
@@ -30,6 +30,23 @@ Abstract: #define EFI_CAPSULE_VENDOR_GUID \
{ 0x711C703F, 0xC285, 0x4B10, {0xA3, 0xB0, 0x36, 0xEC, 0xBD, 0x3C, 0x8B, 0xE2} }
+//
+// If capsule data is passed via a variable, then this name should be used.
+//
+#define EFI_CAPSULE_VARIABLE_NAME L"CapsuleUpdateData"
+
+//
+// The variable describes the long mode buffer used by IA32 Capsule PEIM
+// to call X64 CapsuleCoalesce code to handle >4GB capsule blocks.
+//
+#define EFI_CAPSULE_LONG_MODE_BUFFER_NAME L"CapsuleLongModeBuffer"
+
+typedef struct {
+ EFI_PHYSICAL_ADDRESS Base;
+ EFI_PHYSICAL_ADDRESS Length;
+ UINT64 StackSize;
+} EFI_CAPSULE_LONG_MODE_BUFFER;
+
extern EFI_GUID gEfiCapsuleVendorGuid;
#endif // #ifndef _EFI_CAPSULE_VENDOR_GUID_H_
diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/Pei/Capsule/Capsule.h b/EdkCompatibilityPkg/Sample/Platform/Generic/Pei/Capsule/Capsule.h index 099ce167d3..204ee8ce4a 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/Pei/Capsule/Capsule.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/Pei/Capsule/Capsule.h @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2011, 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
@@ -21,20 +21,6 @@ Abstract: #define _CAPSULE_PEIM_H
#include "Tiano.h"
-
-//
-// If capsule data is passed via a variable, then this name should be used.
-//
-#define EFI_CAPSULE_VARIABLE_NAME L"CapsuleUpdateData"
-
-//
-// The variable describes the long mode buffer used by IA32 Capsule PEIM
-// to call X64 CapsuleCoalesce code to handle >4GB capsule blocks.
-//
-#define EFI_CAPSULE_LONG_MODE_BUFFER_NAME L"CapsuleLongModeBuffer"
-typedef struct {
- UINT64 Base;
- UINT64 Length;
-} EFI_CAPSULE_LONG_MODE_BUFFER;
+#include EFI_GUID_DEFINITION (Capsule)
#endif
|