* [Patch] BaseTools: Fixed a bug in Vpd handling
@ 2019-02-18 9:49 Feng, Bob C
2019-02-19 9:06 ` Gao, Liming
0 siblings, 1 reply; 2+ messages in thread
From: Feng, Bob C @ 2019-02-18 9:49 UTC (permalink / raw)
To: edk2-devel; +Cc: Bob Feng, Liming Gao
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 <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch] BaseTools: Fixed a bug in Vpd handling
2019-02-18 9:49 [Patch] BaseTools: Fixed a bug in Vpd handling Feng, Bob C
@ 2019-02-19 9:06 ` Gao, Liming
0 siblings, 0 replies; 2+ messages in thread
From: Gao, Liming @ 2019-02-19 9:06 UTC (permalink / raw)
To: Feng, Bob C, edk2-devel@lists.01.org
Reviewed-by: Liming Gao <liming.gao@intel.com>
>-----Original Message-----
>From: Feng, Bob C
>Sent: Monday, February 18, 2019 5:50 PM
>To: edk2-devel@lists.01.org
>Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
>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 <bob.c.feng@intel.com>
>Cc: Liming Gao <liming.gao@intel.com>
>---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-19 9:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-18 9:49 [Patch] BaseTools: Fixed a bug in Vpd handling Feng, Bob C
2019-02-19 9:06 ` Gao, Liming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox