| Message ID | 1594192762-15967-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 7d5de35b6f2f65ae882bab7deef279eda2b40c4a |
| Headers | show |
| Series | arm: cmd_stm32prog: Fix the CONFIG_IS_ENABLED() usage | expand |
Hi Bin, > From: Bin Meng <bmeng.cn at gmail.com> > Sent: mercredi 8 juillet 2020 09:19 > > Add parentheses around CONFIG_IS_ENABLED() in the if statement, to fix > potential build failures. > > Signed-off-by: Bin Meng <bmeng.cn at gmail.com> > > --- > Fixes the issue as seen with Azure: > https://dev.azure.com/bmeng/GitHub/_build/results?buildId=251&view=logs&j=064 > 47dc8-3759-5480-c2ba-b1f5a74bd12e&t=3906ed62-68d1-5fd5-bbe4-e8a557f9b32f > > arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > index 0722e4a..cbf0120 100644 > --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > @@ -147,7 +147,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, > int argc, > /* Try bootm for legacy and FIT format image */ > if (genimg_get_format((void *)uimage) != > IMAGE_FORMAT_INVALID) > do_bootm(cmdtp, 0, 4, bootm_argv); > - else if CONFIG_IS_ENABLED(CMD_BOOTZ) > + else if (CONFIG_IS_ENABLED(CMD_BOOTZ)) > do_bootz(cmdtp, 0, 4, bootm_argv); > } > > -- > 2.7.4 Reviewed-by: Patrick Delaunay <patrick.delaunay at st.com> Thanks Patrick
On Thu, Jul 9, 2020 at 1:32 AM Patrick DELAUNAY <patrick.delaunay at st.com> wrote: > > Hi Bin, > > > From: Bin Meng <bmeng.cn at gmail.com> > > Sent: mercredi 8 juillet 2020 09:19 > > > > Add parentheses around CONFIG_IS_ENABLED() in the if statement, to fix > > potential build failures. > > > > Signed-off-by: Bin Meng <bmeng.cn at gmail.com> > > > > --- > > Fixes the issue as seen with Azure: > > https://dev.azure.com/bmeng/GitHub/_build/results?buildId=251&view=logs&j=064 > > 47dc8-3759-5480-c2ba-b1f5a74bd12e&t=3906ed62-68d1-5fd5-bbe4-e8a557f9b32f > > > > arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > > b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > > index 0722e4a..cbf0120 100644 > > --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > > +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c > > @@ -147,7 +147,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, > > int argc, > > /* Try bootm for legacy and FIT format image */ > > if (genimg_get_format((void *)uimage) != > > IMAGE_FORMAT_INVALID) > > do_bootm(cmdtp, 0, 4, bootm_argv); > > - else if CONFIG_IS_ENABLED(CMD_BOOTZ) > > + else if (CONFIG_IS_ENABLED(CMD_BOOTZ)) > > do_bootz(cmdtp, 0, 4, bootm_argv); > > } > > > > -- > > 2.7.4 > > Reviewed-by: Patrick Delaunay <patrick.delaunay at st.com> > applied to u-boot-x86, thanks!
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index 0722e4a..cbf0120 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -147,7 +147,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc, /* Try bootm for legacy and FIT format image */ if (genimg_get_format((void *)uimage) != IMAGE_FORMAT_INVALID) do_bootm(cmdtp, 0, 4, bootm_argv); - else if CONFIG_IS_ENABLED(CMD_BOOTZ) + else if (CONFIG_IS_ENABLED(CMD_BOOTZ)) do_bootz(cmdtp, 0, 4, bootm_argv); }
Add parentheses around CONFIG_IS_ENABLED() in the if statement, to fix potential build failures. Signed-off-by: Bin Meng <bmeng.cn at gmail.com> --- Fixes the issue as seen with Azure: https://dev.azure.com/bmeng/GitHub/_build/results?buildId=251&view=logs&j=06447dc8-3759-5480-c2ba-b1f5a74bd12e&t=3906ed62-68d1-5fd5-bbe4-e8a557f9b32f arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)