[Patch] BaseTools: Fix the bug for RAW file alignment value support

[Patch] BaseTools: Fix the bug for RAW file alignment value support

[Yonghong Zhu]

Fix the bug for RAW file to support Align=32 and Align=64. Current FDF
spec FfsAlignmentValues support this two values, while it is not the
valid value for GenFfs. So this patch add the logic to handle it.

Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=248
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 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index c3f3624..d02befe 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -427,15 +427,22 @@ class GenFdsGlobalVariable:
 
     @staticmethod
     def GenerateFfs(Output, Input, Type, Guid, Fixed=False, CheckSum=False, Align=None,
                     SectionAlign=None):
         Cmd = ["GenFfs", "-t", Type, "-g", Guid]
+        mFfsValidAlign = ["0", "8", "16", "128", "512", "1K", "4K", "32K", "64K"]
         if Fixed == True:
             Cmd += ["-x"]
         if CheckSum:
             Cmd += ["-s"]
         if Align not in [None, '']:
+            if Align not in mFfsValidAlign:
+                Align = GenFdsGlobalVariable.GetAlignment (Align)
+                for index in range(0, len(mFfsValidAlign) - 1):
+                    if ((Align > GenFdsGlobalVariable.GetAlignment(mFfsValidAlign[index])) and (Align <= GenFdsGlobalVariable.GetAlignment(mFfsValidAlign[index + 1]))):
+                        break
+                Align = mFfsValidAlign[index + 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 for RAW file alignment value support

[Gao, Liming]

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

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Yonghong Zhu
> Sent: Tuesday, December 27, 2016 6:06 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [Patch] BaseTools: Fix the bug for RAW file alignment value
> support
> 
> Fix the bug for RAW file to support Align=32 and Align=64. Current FDF
> spec FfsAlignmentValues support this two values, while it is not the
> valid value for GenFfs. So this patch add the logic to handle it.
> 
> Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=248
> 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 | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> index c3f3624..d02befe 100644
> --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
> @@ -427,15 +427,22 @@ class GenFdsGlobalVariable:
> 
>      @staticmethod
>      def GenerateFfs(Output, Input, Type, Guid, Fixed=False, CheckSum=False,
> Align=None,
>                      SectionAlign=None):
>          Cmd = ["GenFfs", "-t", Type, "-g", Guid]
> +        mFfsValidAlign = ["0", "8", "16", "128", "512", "1K", "4K", "32K", "64K"]
>          if Fixed == True:
>              Cmd += ["-x"]
>          if CheckSum:
>              Cmd += ["-s"]
>          if Align not in [None, '']:
> +            if Align not in mFfsValidAlign:
> +                Align = GenFdsGlobalVariable.GetAlignment (Align)
> +                for index in range(0, len(mFfsValidAlign) - 1):
> +                    if ((Align >
> GenFdsGlobalVariable.GetAlignment(mFfsValidAlign[index])) and (Align <=
> GenFdsGlobalVariable.GetAlignment(mFfsValidAlign[index + 1]))):
> +                        break
> +                Align = mFfsValidAlign[index + 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