PCD value in build report shows HEX and DEC both. PatchFv tool only requires
one value.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming....@intel.com>
Cc: Jiewen Yao <jiewen....@intel.com>
---
 Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py     | 2 +-
 Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py   | 2 +-
 Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py  | 2 +-
 Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py 
b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
index 73c18c5..bb9d280 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
@@ -101,7 +101,7 @@ class FileChecker:
                         if (cmp (splitLine[0], "FIXED") == 0) or (cmp 
(splitLine[0], "PATCH") == 0):
                             SplitLine = splitLine[1].strip()[1:].split(")", 1)
                             Type = SplitLine[0]
-                            Value = SplitLine[1].strip()[1:].strip()
+                            Value = SplitLine[1].strip()[1:].strip().split()[0]
                             print "  Type - (" + Type + "), Value - (" + Value 
+ ")"
                             return [Value, Type]
         return ["", ""]
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py 
b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
index f5cb427..e1facd1 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
@@ -209,7 +209,7 @@ class FileChecker:
                         if (cmp (splitLine[0], "FIXED") == 0) or (cmp 
(splitLine[0], "PATCH") == 0):
                             SplitLine = splitLine[1].strip()[1:].split(")", 1)
                             Type = SplitLine[0]
-                            Value = SplitLine[1].strip()[1:].strip()
+                            Value = SplitLine[1].strip()[1:].strip().split()[0]
                             print "  Type - (" + Type + "), Value - (" + Value 
+ ")"
                             return [Value, Type]
         return ["", ""]
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py 
b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
index 5463a93..4d194b3 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
@@ -643,7 +643,7 @@ class FileChecker:
                         if (cmp (splitLine[0], "FIXED") == 0) or (cmp 
(splitLine[0], "PATCH") == 0):
                             SplitLine = splitLine[1].strip()[1:].split(")", 1)
                             Type = SplitLine[0]
-                            Value = SplitLine[1].strip()[1:].strip()
+                            Value = SplitLine[1].strip()[1:].strip().split()[0]
                             print "  Type - (" + Type + "), Value - (" + Value 
+ ")"
                             return [Value, Type]
         return ["", ""]
diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py 
b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
index 57b6724..19c6e04 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
@@ -423,7 +423,7 @@ class FileChecker:
                         if (cmp (splitLine[0], "FIXED") == 0) or (cmp 
(splitLine[0], "PATCH") == 0):
                             SplitLine = splitLine[1].strip()[1:].split(")", 1)
                             Type = SplitLine[0]
-                            Value = SplitLine[1].strip()[1:].strip()
+                            Value = SplitLine[1].strip()[1:].strip().split()[0]
                             print "  Type - (" + Type + "), Value - (" + Value 
+ ")"
                             return [Value, Type]
         return ["", ""]
-- 
2.10.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to