tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg PCD: Update PCD database structure definition to match BaseTools 

To follow PI1.4a, BaseTools has be updated to fix artificial limitation of
SkuId range.

This patch is to update PCD database structure definition to match BaseTools.

Note: The source code and BaseTools need to be upgraded at the same time,
and if they are not upgraded at the same time, build error like below will
be triggered to help user identify the problem.

"Please make sure the version of PCD PEIM Service and the generated
PCD PEI Database match."

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Star Zeng 2016-08-31 14:47:36 +08:00
parent a01f68bd9b
commit b6e89910dd
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Guid for Pcd DataBase Signature. Guid for Pcd DataBase Signature.
Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution. the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at The full text of the license may be found at
@ -23,7 +23,7 @@ extern EFI_GUID gPcdDataBaseSignatureGuid;
// //
// Common definitions // Common definitions
// //
typedef UINT8 SKU_ID; typedef UINT64 SKU_ID;
#define PCD_TYPE_SHIFT 28 #define PCD_TYPE_SHIFT 28
@ -62,7 +62,7 @@ typedef struct {
} DYNAMICEX_MAPPING; } DYNAMICEX_MAPPING;
typedef struct { typedef struct {
UINT32 SkuDataStartOffset; // Offset(with TYPE info) from the PCD_DB. UINT32 SkuDataStartOffset; // Offset(with DATUM TYPE info) from the PCD_DB.
UINT32 SkuIdTableOffset; // Offset from the PCD_DB. UINT32 SkuIdTableOffset; // Offset from the PCD_DB.
} SKU_HEAD; } SKU_HEAD;
@ -95,6 +95,7 @@ typedef struct {
GUID Signature; // PcdDataBaseGuid. GUID Signature; // PcdDataBaseGuid.
UINT32 BuildVersion; UINT32 BuildVersion;
UINT32 Length; UINT32 Length;
SKU_ID SystemSkuId; // Current SkuId value.
UINT32 UninitDataBaseSize; // Total size for PCD those default value with 0. UINT32 UninitDataBaseSize; // Total size for PCD those default value with 0.
TABLE_OFFSET LocalTokenNumberTableOffset; TABLE_OFFSET LocalTokenNumberTableOffset;
TABLE_OFFSET ExMapTableOffset; TABLE_OFFSET ExMapTableOffset;
@ -106,14 +107,15 @@ typedef struct {
UINT16 LocalTokenCount; // LOCAL_TOKEN_NUMBER for all. UINT16 LocalTokenCount; // LOCAL_TOKEN_NUMBER for all.
UINT16 ExTokenCount; // EX_TOKEN_NUMBER for DynamicEx. UINT16 ExTokenCount; // EX_TOKEN_NUMBER for DynamicEx.
UINT16 GuidTableCount; // The Number of Guid in GuidTable. UINT16 GuidTableCount; // The Number of Guid in GuidTable.
SKU_ID SystemSkuId; // Current SkuId value. UINT8 Pad[2]; // Pad bytes to satisfy the alignment.
UINT8 Pad; // Pad bytes to satisfy the alignment.
// //
// Default initialized external PCD database binary structure // Default initialized external PCD database binary structure
// //
// Padding is needed to keep necessary alignment // Padding is needed to keep necessary alignment
// //
//SKU_ID SkuIdTable[]; // SkuIds system supports.
//SKU_ID SkuIndexTable[]; // SkuIds for each PCD with SKU enable.
//UINT64 ValueUint64[]; //UINT64 ValueUint64[];
//UINT32 ValueUint32[]; //UINT32 ValueUint32[];
//VPD_HEAD VpdHead[]; // VPD Offset //VPD_HEAD VpdHead[]; // VPD Offset
@ -129,8 +131,6 @@ typedef struct {
//UINT16 ValueUint16[]; //UINT16 ValueUint16[];
//UINT8 ValueUint8[]; //UINT8 ValueUint8[];
//BOOLEAN ValueBoolean[]; //BOOLEAN ValueBoolean[];
//UINT8 SkuIdTable[]; // SkuIds system supports.
//UINT8 SkuIndexTable[]; // SkuIds for each PCD with SKU enable.
} PCD_DATABASE_INIT; } PCD_DATABASE_INIT;

2
MdeModulePkg/Universal/PCD/Dxe/Pcd.c
View File

@ -239,7 +239,7 @@ DxeGetPcdInfoGetSku (
VOID VOID
) )
{ {
return mPcdDatabase.DxeDb->SystemSkuId; return (UINTN) mPcdDatabase.DxeDb->SystemSkuId;
} }
/** /**

2
MdeModulePkg/Universal/PCD/Dxe/Service.c
View File

@ -958,7 +958,7 @@ GetSkuEnabledTokenNumber (
{ {
SKU_HEAD *SkuHead; SKU_HEAD *SkuHead;
SKU_ID *SkuIdTable; SKU_ID *SkuIdTable;
INTN Index; UINTN Index;
UINT8 *Value; UINT8 *Value;
UINT8 *PcdDb; UINT8 *PcdDb;
BOOLEAN FoundSku; BOOLEAN FoundSku;

4
MdeModulePkg/Universal/PCD/Dxe/Service.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Private functions used by PCD DXE driver. Private functions used by PCD DXE driver.
Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -39,7 +39,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
// Please make sure the PCD Serivce DXE Version is consistent with // Please make sure the PCD Serivce DXE Version is consistent with
// the version of the generated DXE PCD Database by build tool. // the version of the generated DXE PCD Database by build tool.
// //
#define PCD_SERVICE_DXE_VERSION 5 #define PCD_SERVICE_DXE_VERSION 6
// //
// PCD_DXE_SERVICE_DRIVER_VERSION is defined in Autogen.h. // PCD_DXE_SERVICE_DRIVER_VERSION is defined in Autogen.h.

2
MdeModulePkg/Universal/PCD/Pei/Pcd.c
View File

@ -226,7 +226,7 @@ PeiGetPcdInfoGetSku (
VOID VOID
) )
{ {
return GetPcdDatabase()->SystemSkuId; return (UINTN) GetPcdDatabase()->SystemSkuId;
} }
/** /**

4
MdeModulePkg/Universal/PCD/Pei/Service.c
View File

@ -2,7 +2,7 @@
The driver internal functions are implmented here. The driver internal functions are implmented here.
They build Pei PCD database, and provide access service to PCD database. They build Pei PCD database, and provide access service to PCD database.
Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -550,7 +550,7 @@ GetSkuEnabledTokenNumber (
PEI_PCD_DATABASE *PeiPcdDb; PEI_PCD_DATABASE *PeiPcdDb;
SKU_HEAD *SkuHead; SKU_HEAD *SkuHead;
SKU_ID *SkuIdTable; SKU_ID *SkuIdTable;
INTN Index; UINTN Index;
UINT8 *Value; UINT8 *Value;
BOOLEAN FoundSku; BOOLEAN FoundSku;

4
MdeModulePkg/Universal/PCD/Pei/Service.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
The internal header file declares the private functions used by PeiPcd driver. The internal header file declares the private functions used by PeiPcd driver.
Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
// Please make sure the PCD Serivce PEIM Version is consistent with // Please make sure the PCD Serivce PEIM Version is consistent with
// the version of the generated PEIM PCD Database by build tool. // the version of the generated PEIM PCD Database by build tool.
// //
#define PCD_SERVICE_PEIM_VERSION 5 #define PCD_SERVICE_PEIM_VERSION 6
// //
// PCD_PEI_SERVICE_DRIVER_VERSION is defined in Autogen.h. // PCD_PEI_SERVICE_DRIVER_VERSION is defined in Autogen.h.