karo: tx6: fix duplicate const error

[karo-tx-uboot.git] / board / karo / common / env.c

diff --git a/board/karo/common/env.c b/board/karo/common/env.c
index c6def4f9ee9b8a52e362def19bafe14f8a822222..d08b7f1a498311fb226b2275cf506717d78b11e1 100644 (file)
--- a/board/karo/common/env.c
+++ b/board/karo/common/env.c
@@ -19,15 +19,24 @@
 #include <errno.h>
 #include <libfdt.h>
 #include <fdt_support.h>
+#include <environment.h>
 
 #include "karo.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static const char const *cleanup_vars[] = {
+#ifdef CONFIG_UBOOT_IGNORE_ENV
+void env_cleanup(void)
+{
+       set_default_env(NULL);
+}
+#else
+static const char * const cleanup_vars[] = {
        "bootargs",
        "fileaddr",
        "filesize",
+       "safeboot",
+       "wdreset",
 };
 
 void env_cleanup(void)
@@ -38,3 +47,4 @@ void env_cleanup(void)
                setenv(cleanup_vars[i], NULL);
        }
 }
+#endif