| Message ID | 20191211125138.33377-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | 5819466dc1d2856afa84188745eaa5f415ee08cb |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/1] mkimage: simplify fit_check_params() | expand |
On Wed, Dec 11, 2019 at 01:51:38PM +0100, Heinrich Schuchardt wrote: > fit_check_params() wants at least two of dflag, fflag, and lflag set. > > Simplify the logical constraint checking this. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Applied to u-boot/master, thanks!
diff --git a/tools/fit_image.c b/tools/fit_image.c index 0201cc44d8..c204d58fb6 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -820,9 +820,9 @@ static int fit_check_params(struct image_tool_params *params) { if (params->auto_its) return 0; - return ((params->dflag && (params->fflag || params->lflag)) || - (params->fflag && (params->dflag || params->lflag)) || - (params->lflag && (params->dflag || params->fflag))); + return ((params->dflag && params->fflag) || + (params->fflag && params->lflag) || + (params->lflag && params->dflag)); } U_BOOT_IMAGE_TYPE(
fit_check_params() wants at least two of dflag, fflag, and lflag set. Simplify the logical constraint checking this. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- tools/fit_image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.24.0