cmd_ide: Remove unused AmigaOneG3SE code

[platform/kernel/u-boot.git] / common / cmd_nvedit.c

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 02b18ec..163765a 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -52,15 +52,17 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CONFIG_ENV_IS_IN_NVRAM)   && \
-    !defined(CONFIG_ENV_IS_IN_EEPROM)  && \
+#if !defined(CONFIG_ENV_IS_IN_EEPROM)  && \
     !defined(CONFIG_ENV_IS_IN_FLASH)   && \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)       && \
+    !defined(CONFIG_ENV_IS_IN_MG_DISK) && \
     !defined(CONFIG_ENV_IS_IN_NAND)    && \
+    !defined(CONFIG_ENV_IS_IN_NVRAM)   && \
     !defined(CONFIG_ENV_IS_IN_ONENAND) && \
     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)       && \
     !defined(CONFIG_ENV_IS_NOWHERE)
-# error Define one of CONFIG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
+# error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\
+SPI_FLASH|MG_DISK|NVRAM|NOWHERE}
 #endif
 
 #define XMK_STR(x)     #x
@@ -75,7 +77,12 @@ DECLARE_GLOBAL_DATA_PTR;
 static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
 #define        N_BAUDRATES (sizeof(baudrate_table) / sizeof(baudrate_table[0]))
 
+static int env_id = 1;
 
+int get_env_id (void)
+{
+       return env_id;
+}
 /************************************************************************
  * Command interface: print one or all environment variables
  */
@@ -160,6 +167,7 @@ int _do_setenv (int flag, int argc, char *argv[])
                return 1;
        }
 
+       env_id++;
        /*
         * search if variable with this name already exists
         */
@@ -277,18 +285,6 @@ int _do_setenv (int flag, int argc, char *argv[])
                *++env = '\0';
        }
 
-#ifdef CONFIG_NET_MULTI
-       if (strncmp(name, "eth", 3) == 0) {
-               char *end;
-               int   num = simple_strtoul(name+3, &end, 10);
-
-               if (strcmp(end, "addr") == 0) {
-                       eth_set_enetaddr(num, argv[2]);
-               }
-       }
-#endif
-
-
        /* Delete only ? */
        if ((argc < 3) || argv[2] == NULL) {
                env_crc_update ();
@@ -336,18 +332,8 @@ int _do_setenv (int flag, int argc, char *argv[])
         * entry in the enviornment is changed
         */
 
-       if (strcmp(argv[1],"ethaddr") == 0) {
-               char *s = argv[2];      /* always use only one arg */
-               char *e;
-               for (i=0; i<6; ++i) {
-                       bd->bi_enetaddr[i] = s ? simple_strtoul(s, &e, 16) : 0;
-                       if (s) s = (*e) ? e+1 : e;
-               }
-#ifdef CONFIG_NET_MULTI
-               eth_set_enetaddr(0, argv[2]);
-#endif
+       if (strcmp(argv[1],"ethaddr") == 0)
                return 0;
-       }
 
        if (strcmp(argv[1],"ipaddr") == 0) {
                char *s = argv[2];      /* always use only one arg */