colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / env / onenand.c

diff --git a/env/onenand.c b/env/onenand.c
index 319f553262db4945ef19ccc7642b0a82bbdbd75f..dfd4e939f8f89d816b1e9410080f811f9b0139d9 100644 (file)
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -1,16 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2010 DENX Software Engineering
  * Wolfgang Denk <wd@denx.de>
  *
  * (C) Copyright 2005-2009 Samsung Electronics
  * Kyungmin Park <kyungmin.park@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
+#include <env_internal.h>
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <search.h>
@@ -26,7 +25,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static void env_onenand_load(void)
+static int env_onenand_load(void)
 {
        struct mtd_info *mtd = &onenand_mtd;
 #ifdef CONFIG_ENV_ADDR_FLEX
@@ -57,8 +56,10 @@ static void env_onenand_load(void)
 #endif /* !ENV_IS_EMBEDDED */
 
        rc = env_import(buf, 1);
-       if (rc)
+       if (!rc)
                gd->env_valid = ENV_VALID;
+
+       return rc;
 }
 
 static int env_onenand_save(void)