summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/cmd_nvedit.c13
-rw-r--r--common/exports.c3
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)
{
OpenPOWER on IntegriCloud