Reviewed-by: Liming Gao
>-Original Message-
>From: Feng, Bob C
>Sent: Monday, February 18, 2019 5:50 PM
>To: edk2-devel@lists.01.org
>Cc: Feng, Bob C ; Gao, Liming
>Subject: [Patch] BaseTools: Fixed a bug in Vpd handling
>
>If there are multiple sku used in a platform and
>gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer PCD
>is used, build will fail.
>
>This is a regression issue introduced by the commit:
>5695877ec8f636bd4ad873ef50eceb9da7a0f382 which only update the
>Vpd offset for default SKU but not other SKUs.
>
>This patch is going to fix this issue.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Bob Feng
>Cc: Liming Gao
>---
> BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
>b/BaseTools/Source/Python/AutoGen/AutoGen.py
>index 2452ecbcba..8370ee0c93 100644
>--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
>+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
>@@ -1686,11 +1686,11 @@ class PlatformAutoGen(AutoGen):
> PcdNvStoreDfBuffer = [item for item in self._DynamicPcdList if
>item.TokenCName == "PcdNvStoreDefaultValueBuffer" and
>item.TokenSpaceGuidCName == "gEfiMdeModulePkgTokenSpaceGuid"]
> if PcdNvStoreDfBuffer:
> PcdName,PcdGuid = PcdNvStoreDfBuffer[0].TokenCName,
>PcdNvStoreDfBuffer[0].TokenSpaceGuidCName
> if (PcdName,PcdGuid) in VpdSkuMap:
> DefaultSku =
>PcdNvStoreDfBuffer[0].SkuInfoList.get(TAB_DEFAULT)
>-VpdSkuMap[(PcdName,PcdGuid)] =
>{DefaultSku.DefaultValue:[DefaultSku]}
>+VpdSkuMap[(PcdName,PcdGuid)] =
>{DefaultSku.DefaultValue:[SkuObj for SkuObj in
>PcdNvStoreDfBuffer[0].SkuInfoList.values() ]}
>
> # Process VPD map file generated by third party BPDG tool
> if NeedProcessVpdMapFile:
> VpdMapFilePath = os.path.join(self.BuildDir,
> TAB_FV_DIRECTORY,
>"%s.map" % self.Platform.VpdToolGuid)
> if os.path.exists(VpdMapFilePath):
>--
>2.20.1.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
