summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DuetPkg/DuetPkg.dec6
-rw-r--r--DuetPkg/DxeIpl/DxeIpl.h4
-rw-r--r--DuetPkg/DxeIpl/DxeIpl.inf2
-rw-r--r--DuetPkg/DxeIpl/HobGeneration.c9
-rw-r--r--DuetPkg/DxeIpl/HobGeneration.h11
-rw-r--r--DuetPkg/Include/Guid/DxeCoreFileName.h23
-rw-r--r--DuetPkg/Include/Guid/LdrMemoryDescriptor.h33
-rw-r--r--DuetPkg/Library/DuetBdsLib/BdsPlatform.c19
-rw-r--r--DuetPkg/Library/DuetBdsLib/BdsPlatform.h3
-rw-r--r--DuetPkg/Library/DuetBdsLib/PlatformBds.inf1
10 files changed, 76 insertions, 35 deletions
diff --git a/DuetPkg/DuetPkg.dec b/DuetPkg/DuetPkg.dec
index c34c0d4b4..d5c1f5dd5 100644
--- a/DuetPkg/DuetPkg.dec
+++ b/DuetPkg/DuetPkg.dec
@@ -34,3 +34,9 @@
## Include/Guid/ConsoleOutConfig.h
gDuetConsoleOutConfigGuid = { 0xED150714, 0xDF30, 0x407D, { 0xB2, 0x4A, 0x4B, 0x74, 0x2F, 0xD5, 0xCE, 0xA2 }}
+
+ ## Include/Guid/DxeCoreFileName.h
+ gDxeCoreFileNameGuid = { 0xD6A2CB7F, 0x6A18, 0x4e2f, { 0xB4, 0x3B, 0x99, 0x20, 0xA7, 0x33, 0x70, 0x0A }}
+
+ ## Include/Guid/LdrMemoryDescriptor.h
+ gLdrMemoryDescriptorGuid = { 0x7701d7e5, 0x7d1d, 0x4432, { 0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 }} \ No newline at end of file
diff --git a/DuetPkg/DxeIpl/DxeIpl.h b/DuetPkg/DxeIpl/DxeIpl.h
index 18150656a..581c2e6f6 100644
--- a/DuetPkg/DxeIpl/DxeIpl.h
+++ b/DuetPkg/DxeIpl/DxeIpl.h
@@ -1,7 +1,7 @@
/** @file
Internal header file for DxeIpl module.
-Copyright (c) 2006 - 2010, 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
@@ -32,6 +32,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Guid/SystemNvDataGuid.h>
#include <Guid/VariableFormat.h>
#include <Guid/StatusCodeDataTypeDebug.h>
+#include <Guid/DxeCoreFileName.h>
+#include <Guid/LdrMemoryDescriptor.h>
#include <Protocol/Decompress.h>
#include <Protocol/StatusCode.h>
diff --git a/DuetPkg/DxeIpl/DxeIpl.inf b/DuetPkg/DxeIpl/DxeIpl.inf
index 6c0008451..ba7a2c2d3 100644
--- a/DuetPkg/DxeIpl/DxeIpl.inf
+++ b/DuetPkg/DxeIpl/DxeIpl.inf
@@ -39,6 +39,8 @@
[Guids]
gEfiVariableGuid
+ gDxeCoreFileNameGuid
+ gLdrMemoryDescriptorGuid
[Sources]
DxeIpl.h
diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 434653a5e..401d5c718 100644
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -1,6 +1,6 @@
/** @file
-Copyright (c) 2006 - 2010, 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
@@ -23,9 +23,6 @@ Revision History:
#include "FlashLayout.h"
#include "Debug.h"
-#define EFI_DXE_FILE_GUID \
- { 0xb1644c1a, 0xc16a, 0x4c5b, {0x88, 0xde, 0xea, 0xfb, 0xa9, 0x7e, 0x74, 0xd8 }}
-
#define EFI_CPUID_EXTENDED_FUNCTION 0x80000000
#define CPUID_EXTENDED_ADD_SIZE 0x80000008
@@ -188,7 +185,7 @@ HOB_TEMPLATE gHobTemplate = {
0, 0, 0, 0 // UINT8 Reserved[4];
},
},
- EFI_DXE_FILE_GUID,
+ DXE_CORE_FILE_NAME_GUID,
0x0 // EFI_PHYSICAL_ADDRESS of EntryPoint;
},
{ // MemoryDxeCore
@@ -362,7 +359,7 @@ HOB_TEMPLATE gHobTemplate = {
sizeof (MEMORY_DESC_HOB), // Hob size
0 // reserved
},
- EFI_LDR_MEMORY_DESCRIPTOR_GUID
+ LDR_MEMORY_DESCRIPTOR_GUID
},
0,
NULL
diff --git a/DuetPkg/DxeIpl/HobGeneration.h b/DuetPkg/DxeIpl/HobGeneration.h
index fe0b9a933..f9f8f315a 100644
--- a/DuetPkg/DxeIpl/HobGeneration.h
+++ b/DuetPkg/DxeIpl/HobGeneration.h
@@ -1,6 +1,6 @@
/** @file
-Copyright (c) 2006 - 2010, 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
@@ -31,9 +31,6 @@ Revision History:
#define NV_STORAGE_START 0x15000
#define NV_STORAGE_STATE 0x19000
-#define EFI_LDR_MEMORY_DESCRIPTOR_GUID \
- { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60}}
-
#pragma pack(1)
typedef struct {
@@ -52,12 +49,6 @@ typedef struct {
} PROTOCOL_HOB;
typedef struct {
- EFI_HOB_GUID_TYPE Hob;
- UINTN MemDescCount;
- EFI_MEMORY_DESCRIPTOR *MemDesc;
-} MEMORY_DESC_HOB;
-
-typedef struct {
EFI_HOB_GUID_TYPE Hob;
// Note: we get only one PCI Segment now.
EFI_PCI_EXPRESS_BASE_ADDRESS_INFORMATION PciExpressBaseAddressInfo;
diff --git a/DuetPkg/Include/Guid/DxeCoreFileName.h b/DuetPkg/Include/Guid/DxeCoreFileName.h
new file mode 100644
index 000000000..24c0a1584
--- /dev/null
+++ b/DuetPkg/Include/Guid/DxeCoreFileName.h
@@ -0,0 +1,23 @@
+/** @file
+ Guid is EDKII DxeCore moudle GUID.
+
+Copyright (c) 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
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __DXE_CORE_FILE_NAME__
+#define __DXE_CORE_FILE_NAME__
+
+#define DXE_CORE_FILE_NAME_GUID \
+ { 0xD6A2CB7F, 0x6A18, 0x4e2f, {0xB4, 0x3B, 0x99, 0x20, 0xA7, 0x33, 0x70, 0x0A }}
+
+extern EFI_GUID gDxeCoreFileNameGuid;
+
+#endif
diff --git a/DuetPkg/Include/Guid/LdrMemoryDescriptor.h b/DuetPkg/Include/Guid/LdrMemoryDescriptor.h
new file mode 100644
index 000000000..5fd7aa185
--- /dev/null
+++ b/DuetPkg/Include/Guid/LdrMemoryDescriptor.h
@@ -0,0 +1,33 @@
+/** @file
+ Guid is for GUIDED HOB of LDR memory descriptor.
+
+Copyright (c) 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
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __LDR_MEMORY_DESCRIPTOR__
+#define __LDR_MEMORY_DESCRIPTOR__
+
+#define LDR_MEMORY_DESCRIPTOR_GUID \
+ { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60}}
+
+#pragma pack(1)
+
+typedef struct {
+ EFI_HOB_GUID_TYPE Hob;
+ UINTN MemDescCount;
+ EFI_MEMORY_DESCRIPTOR *MemDesc;
+} MEMORY_DESC_HOB;
+
+#pragma pack()
+
+extern EFI_GUID gLdrMemoryDescriptorGuid;
+
+#endif
diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index a478efd1c..205c49c7a 100644
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -1,6 +1,6 @@
/*++
-Copyright (c) 2006 - 2010, 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
@@ -83,21 +83,6 @@ Returns:
return ;
}
-#define EFI_LDR_MEMORY_DESCRIPTOR_GUID \
- { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 }}
-
-EFI_GUID gEfiLdrMemoryDescriptorGuid = EFI_LDR_MEMORY_DESCRIPTOR_GUID;
-
-#pragma pack(1)
-
-typedef struct {
- EFI_HOB_GUID_TYPE Hob;
- UINTN MemDescCount;
- EFI_MEMORY_DESCRIPTOR *MemDesc;
-} MEMORY_DESC_HOB;
-
-#pragma pack()
-
#if 0
VOID
PrintMemoryMap (
@@ -154,7 +139,7 @@ UpdateMemoryMap (
EFI_PHYSICAL_ADDRESS Memory;
EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor;
- GuidHob.Raw = GetFirstGuidHob (&gEfiLdrMemoryDescriptorGuid);
+ GuidHob.Raw = GetFirstGuidHob (&gLdrMemoryDescriptorGuid);
if (GuidHob.Raw == NULL) {
DEBUG ((EFI_D_ERROR, "Fail to get gEfiLdrMemoryDescriptorGuid from GUID HOB LIST!\n"));
return;
diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index bd9d74fe7..564d488c1 100644
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -1,6 +1,6 @@
/*++
-Copyright (c) 2006 - 2007, 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
@@ -51,6 +51,7 @@ Abstract:
#include <Guid/HobList.h>
#include <Guid/PciExpressBaseAddress.h>
#include <Guid/GlobalVariable.h>
+#include <Guid/LdrMemoryDescriptor.h>
extern BDS_CONSOLE_CONNECT_ENTRY gPlatformConsole[];
extern EFI_DEVICE_PATH_PROTOCOL *gPlatformConnectSequence[];
diff --git a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
index e6aabd59b..f50a62e57 100644
--- a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
+++ b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
@@ -57,6 +57,7 @@
gEfiMpsTableGuid
gEfiSmbiosTableGuid
gEfiAcpiTableGuid
+ gLdrMemoryDescriptorGuid
[Pcd]
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 23:09:18 +0000