Remove support for CONFIG_HAS_UID and "forceenv" command

This (undocumented) concept was only in use for the MVSMR and
davinci_schmoogie Sergey Kubushyn <ksi@koi8.net> boards.
Drop it for now.  If really needed, it should be reimplemented
later in the context of the new environment command set.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
Cc: Sergey Kubushyn <ksi@koi8.net>
Acked-by: Sergey Kubushyn <ksi@koi8.net>

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index c941b95fbcf8333edd5c0643332669bff845a0f5..dc15750b6469e88c08c57154c1cb513cfb218401 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -248,12 +248,7 @@ int _do_setenv (int flag, int argc, char * const argv[])
                 * ver is readonly.
                 */
                if (
-#ifdef CONFIG_HAS_UID
-               /* Allow serial# forced overwrite with 0xdeaf4add flag */
-                   ((strcmp (name, "serial#") == 0) && (flag != 0xdeaf4add)) ||
-#else
                    (strcmp (name, "serial#") == 0) ||
-#endif
                    ((strcmp (name, "ethaddr") == 0)
 #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
                     && (strcmp ((char *)env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)
@@ -398,14 +393,6 @@ int setenv (char *varname, char *varvalue)
                return _do_setenv (0, 3, argv);
 }
 
-#ifdef CONFIG_HAS_UID
-void forceenv (char *varname, char *varvalue)
-{
-       char * const argv[4] = { "forceenv", varname, varvalue, NULL };
-       _do_setenv (0xdeaf4add, 3, argv);
-}
-#endif
-
 int do_setenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        if (argc < 2)

diff --git a/common/exports.c b/common/exports.c
index ceee73a13ef4d74d739463c293c63ade9395d58b..3dff7351bc3d3a5204d4fde0cdeb5d16b28d4bc9 100644 (file)
--- a/common/exports.c
+++ b/common/exports.c
@@ -34,9 +34,6 @@ unsigned long get_version(void)
 # define spi_release_bus   dummy
 # define spi_xfer          dummy
 #endif
-#ifndef CONFIG_HAS_UID
-# define forceenv          dummy
-#endif
 
 void jumptable_init(void)
 {

diff --git a/include/_exports.h b/include/_exports.h
index f3df56827e12897d631607dde863283d59a47f79..d89b65be661772ab84d0209a3a4b29f9efce58eb 100644 (file)
--- a/include/_exports.h
+++ b/include/_exports.h
@@ -18,7 +18,6 @@ EXPORT_FUNC(vprintf)
 EXPORT_FUNC(do_reset)
 EXPORT_FUNC(getenv)
 EXPORT_FUNC(setenv)
-EXPORT_FUNC(forceenv)
 EXPORT_FUNC(simple_strtoul)
 EXPORT_FUNC(simple_strtol)
 EXPORT_FUNC(strcmp)

diff --git a/include/common.h b/include/common.h
index 2f85d12db04a28dfef701a33bcc1edab196e3c7f..7e647e64a7aa18b74711ba3efc0fed5a52d8a32d 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -262,9 +262,6 @@ int saveenv      (void);
 int inline setenv   (char *, char *);
 #else
 int    setenv       (char *, char *);
-#ifdef CONFIG_HAS_UID
-void   forceenv     (char *, char *);
-#endif
 #endif /* CONFIG_PPC */
 #ifdef CONFIG_ARM
 # include <asm/mach-types.h>

diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index 6492068c2fab12e198d346a673b5173e4be91c80..000c4c6dcd3ab09fd115b20de2d5860d981270da 100644 (file)
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -185,7 +185,6 @@
  */
 #define CONFIG_ENV_IS_IN_FLASH
 #undef CONFIG_SYS_FLASH_PROTECTION
-#define CONFIG_HAS_UID
 #define        CONFIG_OVERWRITE_ETHADDR_ONCE
 
 #define CONFIG_ENV_OFFSET      0x8000

diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 875dda4442c6c6c8bb6c6e7bf78f512d4fe7a406..04cdc210e62b3a81522159c29cfedbcf786314dd 100644 (file)
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -99,7 +99,6 @@
 /*=====================*/
 #define CONFIG_RTC_DS1307              /* RTC chip on SCHMOOGIE */
 #define CONFIG_SYS_I2C_RTC_ADDR        0x6f    /* RTC chip I2C address */
-#define CONFIG_HAS_UID
 #define CONFIG_UID_DS28CM00            /* Unique ID on SCHMOOGIE */
 #define CONFIG_SYS_UID_ADDR            0x50    /* UID chip I2C address */
 /*==============================*/

diff --git a/include/exports.h b/include/exports.h
index 1d79a3162c07cbbddb65a015dfccfbf57aae326e..7404a7c8439886ea17518f763ac7dfd4c5fef4ca 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -26,9 +26,6 @@ int setenv (char *varname, char *varvalue);
 long simple_strtol(const char *cp,char **endp,unsigned int base);
 int strcmp(const char * cs,const char * ct);
 int ustrtoul(const char *cp, char **endp, unsigned int base);
-#ifdef CONFIG_HAS_UID
-void forceenv (char *varname, char *varvalue);
-#endif
 #if defined(CONFIG_CMD_I2C)
 int i2c_write (uchar, uint, int , uchar* , int);
 int i2c_read (uchar, uint, int , uchar* , int);