[Patch] BaseTools: Fix the bug to support generate FFS by Align = Auto

[Patch] BaseTools: Fix the bug to support generate FFS by Align = Auto

[Yonghong Zhu]

FDF spec support to use 'Auto' as <FfsAlignmentValues>, but current Tool
report error about -a=Auto is invalid option.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index c3f3624..05c4070 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -432,10 +432,12 @@ class GenFdsGlobalVariable:
         if Fixed == True:
             Cmd += ["-x"]
         if CheckSum:
             Cmd += ["-s"]
         if Align not in [None, '']:
+            if Align == 'Auto':
+                Align = '1'
             Cmd += ["-a", Align]
 
         Cmd += ["-o", Output]
         for I in range(0, len(Input)):
             Cmd += ("-i", Input[I])
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Fix the bug to support generate FFS by Align = Auto

[Gao, Liming]

Yonghong:
  If Align is Auto, it means FFS alignment will inherit the alignment from its child section. Right?
  If Align is not specifies, it also means FFS alignment will inherit the alignment from its child section.

Thanks
Liming
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Yonghong Zhu
> Sent: Thursday, November 03, 2016 9:58 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [Patch] BaseTools: Fix the bug to support generate FFS by
> Align = Auto
> 
> FDF spec support to use 'Auto' as <FfsAlignmentValues>, but current Tool
> report error about -a=Auto is invalid option.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> index c3f3624..05c4070 100644
> --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> @@ -432,10 +432,12 @@ class GenFdsGlobalVariable:
>          if Fixed == True:
>              Cmd += ["-x"]
>          if CheckSum:
>              Cmd += ["-s"]
>          if Align not in [None, '']:
> +            if Align == 'Auto':
> +                Align = '1'
>              Cmd += ["-a", Align]
> 
>          Cmd += ["-o", Output]
>          for I in range(0, len(Input)):
>              Cmd += ("-i", Input[I])
> --
> 2.6.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

[Patch] BaseTools: Fix the bug to support generate FFS by Align=Auto

[Yonghong Zhu]

FDF spec support to use 'Auto' as <FfsAlignmentValues>, but current Tool
report error about -a=Auto is invalid option when we set Align=Auto for
RAW File.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/GenFds/FdfParser.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 5489df5..f17a41f 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -2744,11 +2744,13 @@ class FdfParser:
         while True:
             AlignValue = None
             if self.__GetAlignment():
                 if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):
                     raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)
-                AlignValue = self.__Token
+                #For FFS, Auto is default option same to ""
+                if not self.__Token == "Auto":
+                    AlignValue = self.__Token
             if not self.__GetNextToken():
                 raise Warning("expected Filename value", self.FileName, self.CurrentLineNumber)
 
             FileName = self.__Token.replace('$(SPACE)', ' ')
             if FileName == '}':
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Fix the bug to support generate FFS by Align=Auto

[Gao, Liming]

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

> -----Original Message-----
> From: Zhu, Yonghong
> Sent: Wednesday, November 09, 2016 6:35 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [Patch] BaseTools: Fix the bug to support generate FFS by
> Align=Auto
> 
> FDF spec support to use 'Auto' as <FfsAlignmentValues>, but current Tool
> report error about -a=Auto is invalid option when we set Align=Auto for
> RAW File.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/Source/Python/GenFds/FdfParser.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py
> b/BaseTools/Source/Python/GenFds/FdfParser.py
> index 5489df5..f17a41f 100644
> --- a/BaseTools/Source/Python/GenFds/FdfParser.py
> +++ b/BaseTools/Source/Python/GenFds/FdfParser.py
> @@ -2744,11 +2744,13 @@ class FdfParser:
>          while True:
>              AlignValue = None
>              if self.__GetAlignment():
>                  if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K",
> "4K", "32K" ,"64K"):
>                      raise Warning("Incorrect alignment '%s'" % self.__Token,
> self.FileName, self.CurrentLineNumber)
> -                AlignValue = self.__Token
> +                #For FFS, Auto is default option same to ""
> +                if not self.__Token == "Auto":
> +                    AlignValue = self.__Token
>              if not self.__GetNextToken():
>                  raise Warning("expected Filename value", self.FileName,
> self.CurrentLineNumber)
> 
>              FileName = self.__Token.replace('$(SPACE)', ' ')
>              if FileName == '}':
> --
> 2.6.1.windows.1