1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH v2] BaseTools: Fixed the multiple pairs brackets issue in GenFv

Chao Li posted 1 patch 1 year, 6 months ago
Failed in applying to current master (apply log)
BaseTools/Source/C/GenFv/GenFvInternalLib.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[edk2-devel] [PATCH v2] BaseTools: Fixed the multiple pairs brackets issue in GenFv
Posted by Chao Li 1 year, 6 months ago 
If operation Werro is turned on when compiling BaseTools, the
multi-brackets warning will be reported. This issue is comes from on of
the LoongArch enabled patche. Removed extra pairs brackets to fix it.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4111

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Chao Li <lichao@loongson.cn>
---
 BaseTools/Source/C/GenFv/GenFvInternalLib.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 5c3d54f5f7..b5b9425003 100644
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -3559,7 +3559,7 @@ Returns:
       }
 
       // Machine type is LOONGARCH64, set a flag so LoongArch64 reset vector processed.
-      if ((MachineType == EFI_IMAGE_MACHINE_LOONGARCH64)) {
+      if (MachineType == EFI_IMAGE_MACHINE_LOONGARCH64) {
         VerboseMsg("Located LoongArch64 SEC core in child FV");
         mLoongArch = TRUE;
       }
@@ -3721,7 +3721,7 @@ Returns:
       mRiscV = TRUE;
     }
 
-    if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) ) {
+    if (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) {
       mLoongArch = TRUE;
     }
 
@@ -4002,7 +4002,7 @@ Returns:
       mArm = TRUE;
     }
 
-    if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) ) {
+    if (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) {
       mLoongArch = TRUE;
     }
 
-- 
2.27.0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95422): https://edk2.groups.io/g/devel/message/95422
Mute This Topic: https://groups.io/mt/94450039/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v2] BaseTools: Fixed the multiple pairs brackets issue in GenFv
Posted by Bob Feng 1 year, 6 months ago 
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Chao Li
Sent: Thursday, October 20, 2022 5:25 PM
To: devel@edk2.groups.io
Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
Subject: [edk2-devel] [PATCH v2] BaseTools: Fixed the multiple pairs brackets issue in GenFv

If operation Werro is turned on when compiling BaseTools, the multi-brackets warning will be reported. This issue is comes from on of the LoongArch enabled patche. Removed extra pairs brackets to fix it.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4111

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Chao Li <lichao@loongson.cn>
---
 BaseTools/Source/C/GenFv/GenFvInternalLib.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 5c3d54f5f7..b5b9425003 100644
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -3559,7 +3559,7 @@ Returns:
       }        // Machine type is LOONGARCH64, set a flag so LoongArch64 reset vector processed.-      if ((MachineType == EFI_IMAGE_MACHINE_LOONGARCH64)) {+      if (MachineType == EFI_IMAGE_MACHINE_LOONGARCH64) {         VerboseMsg("Located LoongArch64 SEC core in child FV");         mLoongArch = TRUE;       }@@ -3721,7 +3721,7 @@ Returns:
       mRiscV = TRUE;     } -    if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) ) {+    if (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) {       mLoongArch = TRUE;     } @@ -4002,7 +4002,7 @@ Returns:
       mArm = TRUE;     } -    if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) ) {+    if (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) {       mLoongArch = TRUE;     } -- 
2.27.0



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95422): https://edk2.groups.io/g/devel/message/95422
Mute This Topic: https://groups.io/mt/94450039/1768742
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng@intel.com] -=-=-=-=-=-=




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95482): https://edk2.groups.io/g/devel/message/95482
Mute This Topic: https://groups.io/mt/94450039/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
回复: [edk2-devel] [PATCH v2] BaseTools: Fixed the multiple pairs brackets issue in GenFv
Posted by gaoliming via groups.io 1 year, 6 months ago 
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Chao Li
> 发送时间: 2022年10月20日 17:25
> 收件人: devel@edk2.groups.io
> 抄送: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Yuwei Chen <yuwei.chen@intel.com>
> 主题: [edk2-devel] [PATCH v2] BaseTools: Fixed the multiple pairs brackets
> issue in GenFv
> 
> If operation Werro is turned on when compiling BaseTools, the
> multi-brackets warning will be reported. This issue is comes from on of
> the LoongArch enabled patche. Removed extra pairs brackets to fix it.
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4111
> 
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Signed-off-by: Chao Li <lichao@loongson.cn>
> ---
>  BaseTools/Source/C/GenFv/GenFvInternalLib.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> index 5c3d54f5f7..b5b9425003 100644
> --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
> @@ -3559,7 +3559,7 @@ Returns:
>        }
> 
> 
> 
>        // Machine type is LOONGARCH64, set a flag so LoongArch64 reset
> vector processed.
> 
> -      if ((MachineType == EFI_IMAGE_MACHINE_LOONGARCH64)) {
> 
> +      if (MachineType == EFI_IMAGE_MACHINE_LOONGARCH64) {
> 
>          VerboseMsg("Located LoongArch64 SEC core in child FV");
> 
>          mLoongArch = TRUE;
> 
>        }
> 
> @@ -3721,7 +3721,7 @@ Returns:
>        mRiscV = TRUE;
> 
>      }
> 
> 
> 
> -    if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) )
> {
> 
> +    if (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) {
> 
>        mLoongArch = TRUE;
> 
>      }
> 
> 
> 
> @@ -4002,7 +4002,7 @@ Returns:
>        mArm = TRUE;
> 
>      }
> 
> 
> 
> -    if ( (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) )
> {
> 
> +    if (ImageContext.Machine == EFI_IMAGE_MACHINE_LOONGARCH64) {
> 
>        mLoongArch = TRUE;
> 
>      }
> 
> 
> 
> --
> 2.27.0
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#95422): https://edk2.groups.io/g/devel/message/95422
> Mute This Topic: https://groups.io/mt/94450039/4905953
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [gaoliming@byosoft.com.cn]
> -=-=-=-=-=-=
> 





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

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.