From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1ACA5202E547B for ; Fri, 6 Jul 2018 00:46:30 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jul 2018 00:46:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,315,1526367600"; d="scan'208";a="213860468" Received: from shwde7172.ccr.corp.intel.com ([10.239.158.25]) by orsmga004.jf.intel.com with ESMTP; 06 Jul 2018 00:46:29 -0700 From: Liming Gao To: edk2-devel@lists.01.org Cc: Jiewen Yao Date: Fri, 6 Jul 2018 15:45:46 +0800 Message-Id: <1530863149-9232-1-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 Subject: [PATCH edk2-platforms\devel-MinPlatform] MinPlatformPkg: Enable PatchFv tool supports PCD value format in build report X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jul 2018 07:46:31 -0000 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 Cc: Jiewen Yao --- 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