tools/env: allow overwrite of ethaddr on default

This patch allows the U-Boot user space companion utility, fw_setenv,
to overwrite the 'ethaddr' key/value pair if the current value is set
to a per-board-configured default.

This change allows 'fw_setenv' to match the behavior of 'setenv' /
'env set' on the U-Boot command line.

Signed-off-by: Grant Erickson <marathon96@gmail.com>
Fixed excessive white space.
Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 996682ebc7e0797e5981adafdc7548d1df984262..e292d2ba1db43e1f248fb30beadb9732762b0393 100644 (file)
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -45,6 +45,8 @@
 
 #include "fw_env.h"
 
+#include <config.h>
+
 #define WHITESPACE(c) ((c == '\t') || (c == ' '))
 
 #define min(x, y) ({                           \
@@ -390,15 +392,22 @@ int fw_env_write(char *name, char *value)
         * Delete any existing definition
         */
        if (oldval) {
+#ifndef CONFIG_ENV_OVERWRITE
                /*
                 * Ethernet Address and serial# can be set only once
                 */
-               if ((strcmp (name, "ethaddr") == 0) ||
-                       (strcmp (name, "serial#") == 0)) {
+               if (
+                   (strcmp(name, "serial#") == 0) ||
+                   ((strcmp(name, "ethaddr") == 0)
+#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
+                   && (strcmp(oldval, MK_STR(CONFIG_ETHADDR)) != 0)
+#endif /* CONFIG_OVERWRITE_ETHADDR_ONCE && CONFIG_ETHADDR */
+                  ) ) {
                        fprintf (stderr, "Can't overwrite \"%s\"\n", name);
                        errno = EROFS;
                        return -1;
                }
+#endif /* CONFIG_ENV_OVERWRITE */
 
                if (*++nxt == '\0') {
                        *env = '\0';