From: Sam Protsenko <semen.protsenko@linaro.org>
Date: Mon, 30 Jul 2018 16:19:26 +0000 (+0300)
Subject: env: Don't show "Failed" error message
X-Git-Tag: v2018.09-rc2~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=13bbfb4a395d1c0811cd8624cda64ad2ad4746bf;p=oweals%2Fu-boot.git

env: Don't show "Failed" error message

"Failed" error message from env_load() only clutters the log with
unnecessary details, as we already have all needed warnings by that
time. Example:

    Loading Environment from FAT... MMC: no card present
    ** Bad device mmc 0 **
    Failed (-5)

Let's only print it in case when DEBUG is defined to keep log clear.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
---

diff --git a/env/env.c b/env/env.c
index e033b46124..afed0f3c95 100644
--- a/env/env.c
+++ b/env/env.c
@@ -186,14 +186,18 @@ int env_load(void)
 			continue;
 
 		printf("Loading Environment from %s... ", drv->name);
+		/*
+		 * In error case, the error message must be printed during
+		 * drv->load() in some underlying API, and it must be exactly
+		 * one message.
+		 */
 		ret = drv->load();
-		if (ret)
-			printf("Failed (%d)\n", ret);
-		else
+		if (ret) {
+			debug("Failed (%d)\n", ret);
+		} else {
 			printf("OK\n");
-
-		if (!ret)
 			return 0;
+		}
 	}
 
 	/*