public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Gao, Liming" <liming.gao@intel.com>
To: "Feng, YunhuaX" <yunhuax.feng@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH] BaseTool: correct the generate compress section process
Date: Fri, 9 Feb 2018 09:00:52 +0000	[thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E1CAE36@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <47C64442C08CCD4089DC43B6B5E46BC482AC28@shsmsx102.ccr.corp.intel.com>

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Feng, YunhuaX
>Sent: Friday, February 09, 2018 4:06 PM
>To: edk2-devel@lists.01.org
>Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming
><liming.gao@intel.com>
>Subject: [PATCH] BaseTool: correct the generate compress section process
>
>First generate a dummy file with section alignment,
>then compress the dummy file to generate the compress file
>
>Cc: Liming Gao <liming.gao@intel.com>
>Cc: Yonghong Zhu <yonghong.zhu@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
>---
> BaseTools/Source/Python/GenFds/CompressSection.py | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
>diff --git a/BaseTools/Source/Python/GenFds/CompressSection.py
>b/BaseTools/Source/Python/GenFds/CompressSection.py
>index 98532ed8e6..56e71a3545 100644
>--- a/BaseTools/Source/Python/GenFds/CompressSection.py
>+++ b/BaseTools/Source/Python/GenFds/CompressSection.py
>@@ -58,10 +58,11 @@ class CompressSection (CompressSectionClassObject) :
>         if FfsInf != None:
>             self.CompType = FfsInf.__ExtendMacro__(self.CompType)
>             self.Alignment = FfsInf.__ExtendMacro__(self.Alignment)
>
>         SectFiles = tuple()
>+        SectAlign = []
>         Index = 0
>         MaxAlign = None
>         for Sect in self.SectionList:
>             Index = Index + 1
>             SecIndex = '%s.%d' %(SecNum, Index)
>@@ -74,27 +75,23 @@ class CompressSection (CompressSectionClassObject) :
>             if ReturnSectList != []:
>                 if AlignValue == None:
>                     AlignValue = "1"
>                 for FileData in ReturnSectList:
>                     SectFiles += (FileData,)
>-
>-        if MaxAlign != None:
>-            if self.Alignment == None:
>-                self.Alignment = MaxAlign
>-            else:
>-                if GenFdsGlobalVariable.GetAlignment (MaxAlign) >
>GenFdsGlobalVariable.GetAlignment (self.Alignment):
>-                    self.Alignment = MaxAlign
>+                    SectAlign.append(AlignValue)
>
>         OutputFile = OutputPath + \
>                      os.sep     + \
>                      ModuleName + \
>                      'SEC'      + \
>                      SecNum     + \
>                      Ffs.SectionSuffix['COMPRESS']
>         OutputFile = os.path.normpath(OutputFile)
>+        DummyFile = OutputFile + '.dummy'
>+        GenFdsGlobalVariable.GenerateSection(DummyFile, SectFiles,
>InputAlign=SectAlign, IsMakefile=IsMakefile)
>
>-        GenFdsGlobalVariable.GenerateSection(OutputFile, SectFiles,
>Section.Section.SectionType['COMPRESS'],
>+        GenFdsGlobalVariable.GenerateSection(OutputFile, [DummyFile],
>Section.Section.SectionType['COMPRESS'],
>                                              CompressionType=self.CompTypeDict[self.CompType],
>IsMakefile=IsMakefile)
>         OutputFileList = []
>         OutputFileList.append(OutputFile)
>         return OutputFileList, self.Alignment
>
>--
>2.12.2.windows.2



  reply	other threads:[~2018-02-09  8:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-09  8:06 [PATCH] BaseTool: correct the generate compress section process Feng, YunhuaX
2018-02-09  9:00 ` Gao, Liming [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-02-09  5:12 Feng, YunhuaX

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14E1CAE36@SHSMSX104.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox