From nobody Tue Feb 10 08:41:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1524868510097666.3516484939437; Fri, 27 Apr 2018 15:35:10 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1E845207DF45F; Fri, 27 Apr 2018 15:33:10 -0700 (PDT) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 0A85D2034C8D4 for ; Fri, 27 Apr 2018 15:33:03 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Apr 2018 15:33:02 -0700 Received: from jcarsey-desk1.amr.corp.intel.com ([10.7.159.144]) by orsmga002.jf.intel.com with ESMTP; 27 Apr 2018 15:33:01 -0700 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,336,1520924400"; d="scan'208";a="54252879" From: Jaben Carsey To: edk2-devel@lists.01.org Date: Fri, 27 Apr 2018 15:32:50 -0700 Message-Id: <4b8f6ccd4f276d90f579a8e5d7ef5fb5bb1b445d.1524868035.git.jaben.carsey@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: References: In-Reply-To: References: Subject: [edk2] [PATCH v1 36/42] BaseTools: GenFds - use existing shared string X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/GenFds/Fv.py | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python= /GenFds/Fv.py index 40e8bcd5aa72..188282a27cd2 100644 --- a/BaseTools/Source/Python/GenFds/Fv.py +++ b/BaseTools/Source/Python/GenFds/Fv.py @@ -29,8 +29,8 @@ from CommonDataClass.FdfClass import FvClassObject from Common.Misc import SaveFileOnChange, PackGUID from Common.LongFilePathSupport import CopyLongFilePath from Common.LongFilePathSupport import OpenLongFilePath as open +from Common.DataType import TAB_LINE_BREAK =20 -T_CHAR_LF =3D '\n' FV_UI_EXT_ENTY_GUID =3D 'A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C' =20 ## generate FV @@ -111,7 +111,7 @@ class FV (FvClassObject): if not Flag: self.FvInfFile.writelines("EFI_FILE_NAME =3D " + \ FileName + \ - T_CHAR_LF) + TAB_LINE_BREAK) =20 # Process Modules in FfsList for FfsFile in self.FfsList : @@ -125,7 +125,7 @@ class FV (FvClassObject): if not Flag: self.FvInfFile.writelines("EFI_FILE_NAME =3D " + \ FileName + \ - T_CHAR_LF) + TAB_LINE_BREAK) if not Flag: SaveFileOnChange(self.InfFileName, self.FvInfFile.getvalue(), = False) self.FvInfFile.close() @@ -270,36 +270,36 @@ class FV (FvClassObject): # # Add [Options] # - self.FvInfFile.writelines("[options]" + T_CHAR_LF) + self.FvInfFile.writelines("[options]" + TAB_LINE_BREAK) if BaseAddress is not None : self.FvInfFile.writelines("EFI_BASE_ADDRESS =3D " + \ BaseAddress + \ - T_CHAR_LF) + TAB_LINE_BREAK) =20 if BlockSize is not None: self.FvInfFile.writelines("EFI_BLOCK_SIZE =3D " + \ '0x%X' %BlockSize + \ - T_CHAR_LF) + TAB_LINE_BREAK) if BlockNum is not None: self.FvInfFile.writelines("EFI_NUM_BLOCKS =3D " + \ ' 0x%X' %BlockNum + \ - T_CHAR_LF) + TAB_LINE_BREAK) else: if self.BlockSizeList =3D=3D []: if not self._GetBlockSize(): #set default block size is 1 - self.FvInfFile.writelines("EFI_BLOCK_SIZE =3D 0x1" + = T_CHAR_LF) + self.FvInfFile.writelines("EFI_BLOCK_SIZE =3D 0x1" + = TAB_LINE_BREAK) =20 for BlockSize in self.BlockSizeList : if BlockSize[0] is not None: self.FvInfFile.writelines("EFI_BLOCK_SIZE =3D " + \ '0x%X' %BlockSize[0] + \ - T_CHAR_LF) + TAB_LINE_BREAK) =20 if BlockSize[1] is not None: self.FvInfFile.writelines("EFI_NUM_BLOCKS =3D " + \ ' 0x%X' %BlockSize[1] + \ - T_CHAR_LF) + TAB_LINE_BREAK) =20 if self.BsBaseAddress is not None: self.FvInfFile.writelines('EFI_BOOT_DRIVER_BASE_ADDRESS =3D ' = + \ @@ -310,11 +310,11 @@ class FV (FvClassObject): # # Add attribute # - self.FvInfFile.writelines("[attributes]" + T_CHAR_LF) + self.FvInfFile.writelines("[attributes]" + TAB_LINE_BREAK) =20 self.FvInfFile.writelines("EFI_ERASE_POLARITY =3D " + \ ' %s' %ErasePloarity + \ - T_CHAR_LF) + TAB_LINE_BREAK) if not (self.FvAttributeDict is None): for FvAttribute in self.FvAttributeDict.keys() : if FvAttribute =3D=3D "FvUsedSizeEnable": @@ -325,12 +325,12 @@ class FV (FvClassObject): FvAttribute + \ ' =3D ' + \ self.FvAttributeDict[FvAttribute= ] + \ - T_CHAR_LF ) + TAB_LINE_BREAK ) if self.FvAlignment is not None: self.FvInfFile.writelines("EFI_FVB2_ALIGNMENT_" + \ self.FvAlignment.strip() + \ " =3D TRUE" + \ - T_CHAR_LF) + TAB_LINE_BREAK) =20 # # Generate FV extension header file @@ -416,14 +416,14 @@ class FV (FvClassObject): os.remove (self.InfFileName) self.FvInfFile.writelines("EFI_FV_EXT_HEADER_FILE_NAME =3D= " + \ FvExtHeaderFileName = + \ - T_CHAR_LF) + TAB_LINE_BREAK) =20 =20 # # Add [Files] # - self.FvInfFile.writelines("[files]" + T_CHAR_LF) + self.FvInfFile.writelines("[files]" + TAB_LINE_BREAK) if VtfDict and self.UiFvName in VtfDict: self.FvInfFile.writelines("EFI_FILE_NAME =3D " = + \ VtfDict[self.UiFvName] = + \ - T_CHAR_LF) + TAB_LINE_BREAK) --=20 2.16.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel