[edk2-devel] [PATCH v2] BaseTools/GenFds: Correct file type set for the PIC section

Konstantin Aladyshev posted 1 patch 1 year, 8 months ago
Failed in applying to current master (apply log)
BaseTools/Source/Python/GenFds/FdfParser.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[edk2-devel] [PATCH v2] BaseTools/GenFds: Correct file type set for the PIC section
Posted by Konstantin Aladyshev 1 year, 8 months ago
Corrently the set of file types for the PIC section contains two
duplicate values.
Replace the duplicate value with the correct one to fix the issue.

Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
---
 BaseTools/Source/Python/GenFds/FdfParser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 5c8263f9bc..693e62de7e 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -3996,7 +3996,7 @@ class FdfParser:
             if FileType not in {BINARY_FILE_TYPE_PE32, "SEC_PE32"}:
                 raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)
         elif SectionType == BINARY_FILE_TYPE_PIC:
-            if FileType not in {BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_PIC}:
+            if FileType not in {BINARY_FILE_TYPE_PIC, "SEC_PIC"}:
                 raise Warning(WarningString % FileType, self.FileName, self.CurrentLineNumber)
         elif SectionType == BINARY_FILE_TYPE_TE:
             if FileType not in {BINARY_FILE_TYPE_TE, "SEC_TE"}:
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92974): https://edk2.groups.io/g/devel/message/92974
Mute This Topic: https://groups.io/mt/93345703/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] 回复: [PATCH v2] BaseTools/GenFds: Correct file type set for the PIC section
Posted by gaoliming via groups.io 1 year, 7 months ago
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: Konstantin Aladyshev <aladyshev22@gmail.com>
> 发送时间: 2022年8月30日 18:19
> 收件人: devel@edk2.groups.io
> 抄送: bob.c.feng@intel.com; gaoliming@byosoft.com.cn;
> yuwei.chen@intel.com; Konstantin Aladyshev <aladyshev22@gmail.com>
> 主题: [PATCH v2] BaseTools/GenFds: Correct file type set for the PIC
section
> 
> Corrently the set of file types for the PIC section contains two
> duplicate values.
> Replace the duplicate value with the correct one to fix the issue.
> 
> Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
> ---
>  BaseTools/Source/Python/GenFds/FdfParser.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py
> b/BaseTools/Source/Python/GenFds/FdfParser.py
> index 5c8263f9bc..693e62de7e 100644
> --- a/BaseTools/Source/Python/GenFds/FdfParser.py
> +++ b/BaseTools/Source/Python/GenFds/FdfParser.py
> @@ -3996,7 +3996,7 @@ class FdfParser:
>              if FileType not in {BINARY_FILE_TYPE_PE32, "SEC_PE32"}:
> 
>                  raise Warning(WarningString % FileType, self.FileName,
> self.CurrentLineNumber)
> 
>          elif SectionType == BINARY_FILE_TYPE_PIC:
> 
> -            if FileType not in {BINARY_FILE_TYPE_PIC,
> BINARY_FILE_TYPE_PIC}:
> 
> +            if FileType not in {BINARY_FILE_TYPE_PIC, "SEC_PIC"}:
> 
>                  raise Warning(WarningString % FileType, self.FileName,
> self.CurrentLineNumber)
> 
>          elif SectionType == BINARY_FILE_TYPE_TE:
> 
>              if FileType not in {BINARY_FILE_TYPE_TE, "SEC_TE"}:
> 
> --
> 2.25.1





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#94377): https://edk2.groups.io/g/devel/message/94377
Mute This Topic: https://groups.io/mt/93941512/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-