[PATCH] boot command: Make verbose/dryrun options work again

[Sascha Hauer]

Fixes: bc94fb3 bootm: Initialize bootm_data defaults in single place

bootm_data_init_defaults() must be called before filling in the values
from the commandline options, otherwise the values will be overwritten
in bootm_data_init_defaults().

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 commands/boot.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/commands/boot.c b/commands/boot.c
index bd1be4b..c091b2e 100644
--- a/commands/boot.c
+++ b/commands/boot.c
@@ -52,10 +52,13 @@ static int boot_script(char *path)
 		goto out;
 	}
 
-	data.verbose = verbose;
-	data.dryrun = dryrun;
 	bootm_data_init_defaults(&data);
 
+	if (verbose)
+		data.verbose = verbose;
+	if (dryrun)
+		data.dryrun = dryrun;
+
 	ret = bootm_boot(&data);
 	if (ret)
 		pr_err("Booting %s failed: %s\n", basename(path), strerror(-ret));
-- 
2.8.1