|
@@ -53,7 +53,6 @@ ProcessPrmModules (
|
|
OUT PRM_ACPI_DESCRIPTION_TABLE **PrmAcpiDescriptionTable
|
|
OUT PRM_ACPI_DESCRIPTION_TABLE **PrmAcpiDescriptionTable
|
|
)
|
|
)
|
|
{
|
|
{
|
|
- EFI_GUID *PlatformGuid;
|
|
|
|
EFI_IMAGE_EXPORT_DIRECTORY *CurrentImageExportDirectory;
|
|
EFI_IMAGE_EXPORT_DIRECTORY *CurrentImageExportDirectory;
|
|
PRM_MODULE_EXPORT_DESCRIPTOR_STRUCT *CurrentExportDescriptorStruct;
|
|
PRM_MODULE_EXPORT_DESCRIPTOR_STRUCT *CurrentExportDescriptorStruct;
|
|
PRM_ACPI_DESCRIPTION_TABLE *PrmAcpiTable;
|
|
PRM_ACPI_DESCRIPTION_TABLE *PrmAcpiTable;
|
|
@@ -81,18 +80,17 @@ ProcessPrmModules (
|
|
}
|
|
}
|
|
*PrmAcpiDescriptionTable = NULL;
|
|
*PrmAcpiDescriptionTable = NULL;
|
|
|
|
|
|
- PlatformGuid = (EFI_GUID *) PcdGetPtr (PcdPrmPlatformGuid);
|
|
|
|
//
|
|
//
|
|
- // The platform should set PcdPrmPlatformGuid to a non-zero value
|
|
|
|
|
|
+ // The platform DSC GUID must be set to a non-zero value
|
|
//
|
|
//
|
|
- if (CompareGuid (PlatformGuid, &gZeroGuid)) {
|
|
|
|
|
|
+ if (CompareGuid (&gEdkiiDscPlatformGuid, &gZeroGuid)) {
|
|
DEBUG ((
|
|
DEBUG ((
|
|
DEBUG_ERROR,
|
|
DEBUG_ERROR,
|
|
- " %a %a: PcdPrmPlatformGuid must be set to a unique value in the platform DSC file.\n",
|
|
|
|
|
|
+ " %a %a: The Platform GUID in the DSC file must be set to a unique non-zero value.\n",
|
|
_DBGMSGID_,
|
|
_DBGMSGID_,
|
|
__FUNCTION__
|
|
__FUNCTION__
|
|
));
|
|
));
|
|
- ASSERT (!CompareGuid (PlatformGuid, &gZeroGuid));
|
|
|
|
|
|
+ ASSERT (!CompareGuid (&gEdkiiDscPlatformGuid, &gZeroGuid));
|
|
}
|
|
}
|
|
|
|
|
|
DEBUG ((DEBUG_INFO, " %a %a: %d total PRM modules to process.\n", _DBGMSGID_, __FUNCTION__, mPrmModuleCount));
|
|
DEBUG ((DEBUG_INFO, " %a %a: %d total PRM modules to process.\n", _DBGMSGID_, __FUNCTION__, mPrmModuleCount));
|
|
@@ -118,7 +116,7 @@ ProcessPrmModules (
|
|
PrmAcpiTable->Header.OemRevision = PcdGet32 (PcdAcpiDefaultOemRevision);
|
|
PrmAcpiTable->Header.OemRevision = PcdGet32 (PcdAcpiDefaultOemRevision);
|
|
PrmAcpiTable->Header.CreatorId = PcdGet32 (PcdAcpiDefaultCreatorId);
|
|
PrmAcpiTable->Header.CreatorId = PcdGet32 (PcdAcpiDefaultCreatorId);
|
|
PrmAcpiTable->Header.CreatorRevision = PcdGet32 (PcdAcpiDefaultCreatorRevision);
|
|
PrmAcpiTable->Header.CreatorRevision = PcdGet32 (PcdAcpiDefaultCreatorRevision);
|
|
- CopyGuid (&PrmAcpiTable->PrmPlatformGuid, PlatformGuid);
|
|
|
|
|
|
+ CopyGuid (&PrmAcpiTable->PrmPlatformGuid, &gEdkiiDscPlatformGuid);
|
|
PrmAcpiTable->PrmModuleInfoOffset = OFFSET_OF (PRM_ACPI_DESCRIPTION_TABLE, PrmModuleInfoStructure);
|
|
PrmAcpiTable->PrmModuleInfoOffset = OFFSET_OF (PRM_ACPI_DESCRIPTION_TABLE, PrmModuleInfoStructure);
|
|
PrmAcpiTable->PrmModuleInfoCount = (UINT32) mPrmModuleCount;
|
|
PrmAcpiTable->PrmModuleInfoCount = (UINT32) mPrmModuleCount;
|
|
|
|
|