The payload is in ELF format per the universal payload spec.
PLD_INFO_HEADER is stored in the ELF payload as a separate section
named ".upld_info".

Extra data needed by payload is stored in sections whose name starts
with ".upld.".

Signed-off-by: Ray Ni <ray.ni@...>
Cc: Michael D Kinney <michael.d.kinney@...>
Cc: Liming Gao <gaoliming@...>
Cc: Zhiguang Liu <zhiguang.liu@...>
Cc: Maurice Ma <maurice.ma@...>
Cc: Guo Dong <guo.dong@...>
---
.../Include/UniversalPayload/ExtraData.h | 28 ++++++++++++++
.../UniversalPayload/UniversalPayload.h | 38 +++++++++++++++++++
MdeModulePkg/MdeModulePkg.dec | 3 ++
3 files changed, 69 insertions(+)
create mode 100644 MdeModulePkg/Include/UniversalPayload/ExtraData.h
create mode 100644 MdeModulePkg/Include/UniversalPayload/UniversalPayload.h

diff --git a/MdeModulePkg/Include/UniversalPayload/ExtraData.h b/MdeModuleP=
kg/Include/UniversalPayload/ExtraData.h
new file mode 100644
index 0000000000..07b7426683
--- /dev/null
+++ b/MdeModulePkg/Include/UniversalPayload/ExtraData.h
@@ -0,0 +1,28 @@
+/** @file=0D
+=0D
+ Copyright (c) 2021, Intel Corporation. All rights reserved.<BR>=0D
+ SPDX-License-Identifier: BSD-2-Clause-Patent=0D
+=0D
+**/=0D
+#ifndef __EXTRA_DATA_H__=0D
+#define __EXTRA_DATA_H__=0D
+=0D
+extern GUID gPldExtraDataGuid;=0D
+=0D
+#pragma pack(1)=0D
+=0D
+typedef struct {=0D
+ CHAR8 Identifier[16];=0D
+ EFI_PHYSICAL_ADDRESS Base;=0D
+ UINT64 Size;=0D
+} PLD_EXTRA_DATA_ENTRY;=0D
+=0D
+typedef struct {=0D
+ PLD_GENERIC_HEADER PldHeader;=0D
+ UINT32 Count;=0D
+ PLD_EXTRA_DATA_ENTRY Entry[0];=0D
+} PLD_EXTRA_DATA;=0D
+=0D
+#pragma pack()=0D
+=0D
+#endif=0D
diff --git a/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h b/Mde=
ModulePkg/Include/UniversalPayload/UniversalPayload.h
new file mode 100644
index 0000000000..b8e9fe11a1
--- /dev/null
+++ b/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h
@@ -0,0 +1,38 @@
+/** @file=0D
+=0D
+ Copyright (c) 2021, Intel Corporation. All rights reserved.<BR>=0D
+ SPDX-License-Identifier: BSD-2-Clause-Patent=0D
+=0D
+**/=0D
+#ifndef __UNIVERSAL_PAYLOAD_H__=0D
+#define __UNIVERSAL_PAYLOAD_H__=0D
+=0D
+typedef VOID (EFIAPI *UNIVERSAL_PAYLOAD_ENTRY) (VOID *HobList);=0D
+=0D
+#define PLD_IDENTIFIER SIGNATURE_32('U', 'P', 'L', 'D')=
=0D
+#define PLD_INFO_SEC_NAME ".upld_info"=0D
+#define PLD_EXTRA_SEC_NAME_PREFIX ".upld."=0D
+#define PLD_EXTRA_SEC_NAME_PREFIX_LENGTH (sizeof (PLD_EXTRA_SEC_NAME_PREFI=
X) - 1)=0D
+=0D
+#pragma pack(1)=0D
+=0D
+typedef struct {=0D
+ UINT32 Identifier;=0D
+ UINT32 HeaderLength;=0D
+ UINT16 SpecRevision;=0D
+ UINT8 Reserved[2];=0D
+ UINT32 Revision;=0D
+ UINT32 Attribute;=0D
+ UINT32 Capability;=0D
+ CHAR8 ProducerId[16];=0D
+ CHAR8 ImageId[16];=0D
+} PLD_INFO_HEADER;=0D
+=0D
+typedef struct {=0D
+ UINT8 Revision;=0D
+ UINT8 Reserved[3];=0D
+} PLD_GENERIC_HEADER;=0D
+=0D
+#pragma pack()=0D
+=0D
+#endif=0D
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 8d38383915..d823ad0ba7 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -404,6 +404,9 @@ [Guids]
## Include/Guid/MigratedFvInfo.h=0D
gEdkiiMigratedFvInfoGuid =3D { 0xc1ab12f7, 0x74aa, 0x408d, { 0xa2, 0xf4,=
0xc6, 0xce, 0xfd, 0x17, 0x98, 0x71 } }=0D
=0D
+ ## Include/UniversalPayload/ExtraData.h=0D
+ gPldExtraDataGuid =3D {0x15a5baf6, 0x1c91, 0x467d, {0x9d, 0xfb, 0x31, 0x=
9d, 0x17, 0x8d, 0x4b, 0xb4}}=0D
+=0D
[Ppis]=0D
## Include/Ppi/AtaController.h=0D
gPeiAtaControllerPpiGuid =3D { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0,=
0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}=0D
--=20
2.31.1.windows.1