diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-20 16:03:45 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-19 19:29:47 +0200 |
| commit | 6d014adfa2ac4b1151d2b80a6943f59c3e254239 (patch) | |
| tree | cb2305afb1f1b3f2ba42ac080ac20e01b00778d2 /common | |
| parent | a6826fbc5c3802075d98e86488e1116ed0ad6fe5 (diff) | |
| download | blackbird-obmc-uboot-6d014adfa2ac4b1151d2b80a6943f59c3e254239.tar.gz blackbird-obmc-uboot-6d014adfa2ac4b1151d2b80a6943f59c3e254239.zip | |
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>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nvedit.c | 13 | ||||
| -rw-r--r-- | common/exports.c | 3 |
2 files changed, 0 insertions, 16 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index c941b95fbc..dc15750b64 100644 --- 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 ceee73a13e..3dff7351bc 100644 --- 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) { |
