X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_nvedit.c;h=e8b116df9bae4dc01bb9370e6a977c2a0f37c46d;hb=fbb9ecf7493fbd6b8c8af7d52e90c915459f7040;hp=df0e6dbafdaa63f70ebd17463e82c9f97e6a1446;hpb=5f902cf139559bc436175367a4507b1ddfa4512d;p=u-boot

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index df0e6dbafd..e8b116df9b 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -4,7 +4,9 @@
  *
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Andreas Heppel <aheppel@sysgo.de>
-
+ *
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
@@ -54,16 +56,16 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#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_MMC)  && \
-    !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)
+#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_MMC)		&& \
+	!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_{EEPROM|FLASH|DATAFLASH|ONENAND|\
 SPI_FLASH|MG_DISK|NVRAM|MMC} or CONFIG_ENV_IS_NOWHERE
 #endif
@@ -93,7 +95,7 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
  */
 static int env_id = 1;
 
-int get_env_id (void)
+int get_env_id(void)
 {
 	return env_id;
 }
@@ -116,7 +118,7 @@ static int env_print(char *name)
 		hsearch_r(e, FIND, &ep, &env_htab);
 		if (ep == NULL)
 			return 0;
-		len = printf ("%s=%s\n", ep->key, ep->data);
+		len = printf("%s=%s\n", ep->key, ep->data);
 		return len;
 	}
 
@@ -160,6 +162,37 @@ int do_env_print (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	return rcode;
 }
 
+#ifdef CONFIG_CMD_GREPENV
+static int do_env_grep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	ENTRY *match;
+	unsigned char matched[env_htab.size / 8];
+	int rcode = 1, arg = 1, idx;
+
+	if (argc < 2)
+		return cmd_usage(cmdtp);
+
+	memset(matched, 0, env_htab.size / 8);
+
+	while (arg <= argc) {
+		idx = 0;
+		while ((idx = hstrstr_r(argv[arg], idx, &match, &env_htab))) {
+			if (!(matched[idx / 8] & (1 << (idx & 7)))) {
+				puts(match->key);
+				puts("=");
+				puts(match->data);
+				puts("\n");
+			}
+			matched[idx / 8] |= 1 << (idx & 7);
+			rcode = 0;
+		}
+		arg++;
+	}
+
+	return rcode;
+}
+#endif
+
 /*
  * Set a new environment variable,
  * or replace or delete an existing one.
@@ -176,7 +209,7 @@ int _do_env_set (int flag, int argc, char * const argv[])
 	name = argv[1];
 
 	if (strchr(name, '=')) {
-		printf ("## Error: illegal character '=' in variable name \"%s\"\n", name);
+		printf("## Error: illegal character '=' in variable name \"%s\"\n", name);
 		return 1;
 	}
 
@@ -189,13 +222,12 @@ int _do_env_set (int flag, int argc, char * const argv[])
 	hsearch_r(e, FIND, &ep, &env_htab);
 
 	/* Check for console redirection */
-	if (strcmp(name,"stdin") == 0) {
+	if (strcmp(name, "stdin") == 0)
 		console = stdin;
-	} else if (strcmp(name,"stdout") == 0) {
+	else if (strcmp(name, "stdout") == 0)
 		console = stdout;
-	} else if (strcmp(name,"stderr") == 0) {
+	else if (strcmp(name, "stderr") == 0)
 		console = stderr;
-	}
 
 	if (console != -1) {
 		if (argc < 3) {		/* Cannot delete it! */
@@ -209,11 +241,11 @@ int _do_env_set (int flag, int argc, char * const argv[])
 			return i;
 #else
 		/* Try assigning specified device */
-		if (console_assign (console, argv[2]) < 0)
+		if (console_assign(console, argv[2]) < 0)
 			return 1;
 
 #ifdef CONFIG_SERIAL_MULTI
-		if (serial_assign (argv[2]) < 0)
+		if (serial_assign(argv[2]) < 0)
 			return 1;
 #endif
 #endif /* CONFIG_CONSOLE_MUX */
@@ -225,28 +257,28 @@ int _do_env_set (int flag, int argc, char * const argv[])
 	 */
 	if (ep) {		/* variable exists */
 #ifndef CONFIG_ENV_OVERWRITE
-		if ((strcmp (name, "serial#") == 0) ||
-		    ((strcmp (name, "ethaddr") == 0)
+		if ((strcmp(name, "serial#") == 0) ||
+		    ((strcmp(name, "ethaddr") == 0)
 #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
-		     && (strcmp (ep->data,MK_STR(CONFIG_ETHADDR)) != 0)
+		     && (strcmp(ep->data, MK_STR(CONFIG_ETHADDR)) != 0)
 #endif	/* CONFIG_OVERWRITE_ETHADDR_ONCE && CONFIG_ETHADDR */
 		    ) ) {
-			printf ("Can't overwrite \"%s\"\n", name);
+			printf("Can't overwrite \"%s\"\n", name);
 			return 1;
 		}
 #endif
 		/*
 		 * Switch to new baudrate if new baudrate is supported
 		 */
-		if (strcmp(name,"baudrate") == 0) {
+		if (strcmp(name, "baudrate") == 0) {
 			int baudrate = simple_strtoul(argv[2], NULL, 10);
 			int i;
-			for (i=0; i<N_BAUDRATES; ++i) {
+			for (i = 0; i < N_BAUDRATES; ++i) {
 				if (baudrate == baudrate_table[i])
 					break;
 			}
 			if (i == N_BAUDRATES) {
-				printf ("## Baudrate %d bps not supported\n",
+				printf("## Baudrate %d bps not supported\n",
 					baudrate);
 				return 1;
 			}
@@ -258,11 +290,11 @@ int _do_env_set (int flag, int argc, char * const argv[])
 			gd->bd->bi_baudrate = baudrate;
 #endif
 
-			serial_setbrg ();
+			serial_setbrg();
 			udelay(50000);
 			for (;;) {
 				if (getc() == '\r')
-				      break;
+					break;
 			}
 		}
 	}
@@ -276,14 +308,15 @@ int _do_env_set (int flag, int argc, char * const argv[])
 	/*
 	 * Insert / replace new value
 	 */
-	for (i=2,len=0; i<argc; ++i) {
+	for (i = 2, len = 0; i < argc; ++i)
 		len += strlen(argv[i]) + 1;
-	}
-	if ((value = malloc(len)) == NULL) {
+
+	value = malloc(len);
+	if (value == NULL) {
 		printf("## Can't malloc %d bytes\n", len);
 		return 1;
 	}
-	for (i=2,s=value; i<argc; ++i) {
+	for (i = 2, s = value; i < argc; ++i) {
 		char *v = argv[i];
 
 		while ((*s++ = *v++) != '\0')
@@ -308,12 +341,12 @@ int _do_env_set (int flag, int argc, char * const argv[])
 	 * entry in the environment is changed
 	 */
 
-	if (strcmp(name,"ipaddr") == 0) {
+	if (strcmp(name, "ipaddr") == 0) {
 		char *s = argv[2];	/* always use only one arg */
 		char *e;
 		unsigned long addr;
 		bd->bi_ip_addr = 0;
-		for (addr=0, i=0; i<4; ++i) {
+		for (addr = 0, i = 0; i < 4; ++i) {
 			ulong val = s ? simple_strtoul(s, &e, 10) : 0;
 			addr <<= 8;
 			addr  |= (val & 0xFF);
@@ -321,29 +354,30 @@ int _do_env_set (int flag, int argc, char * const argv[])
 		}
 		bd->bi_ip_addr = htonl(addr);
 		return 0;
-	} else if (strcmp(argv[1],"loadaddr") == 0) {
+	} else if (strcmp(argv[1], "loadaddr") == 0) {
 		load_addr = simple_strtoul(argv[2], NULL, 16);
 		return 0;
 	}
 #if defined(CONFIG_CMD_NET)
-	else if (strcmp(argv[1],"bootfile") == 0) {
-		copy_filename (BootFile, argv[2], sizeof(BootFile));
+	else if (strcmp(argv[1], "bootfile") == 0) {
+		copy_filename(BootFile, argv[2], sizeof(BootFile));
 		return 0;
 	}
 #endif
 	return 0;
 }
 
-int setenv (char *varname, char *varvalue)
+int setenv(const char *varname, const char *varvalue)
 {
-	char * const argv[4] = { "setenv", varname, varvalue, NULL };
+	const char * const argv[4] = { "setenv", varname, varvalue, NULL };
+
 	if ((varvalue == NULL) || (varvalue[0] == '\0'))
-		return _do_env_set(0, 2, argv);
+		return _do_env_set(0, 2, (char * const *)argv);
 	else
-		return _do_env_set(0, 3, argv);
+		return _do_env_set(0, 3, (char * const *)argv);
 }
 
-int do_env_set (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	if (argc < 2)
 		return cmd_usage(cmdtp);
@@ -355,7 +389,7 @@ int do_env_set (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  * Prompt for environment variable
  */
 #if defined(CONFIG_CMD_ASKENV)
-int do_env_ask ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_env_ask(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	extern char console_buffer[CONFIG_SYS_CBSIZE];
 	char message[CONFIG_SYS_CBSIZE];
@@ -383,10 +417,10 @@ int do_env_ask ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		break;
 
 	default:	/* env_ask envname message1 ... messagen size */
-		for (i=2,pos=0; i < argc - 1; i++) {
-			if (pos) {
+		for (i = 2, pos = 0; i < argc - 1; i++) {
+			if (pos)
 				message[pos++] = ' ';
-			}
+
 			strcpy(message+pos, argv[i]);
 			pos += strlen(argv[i]);
 		}
@@ -449,7 +483,7 @@ int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  * return address of storage for that variable,
  * or NULL if not found
  */
-char *getenv (char *name)
+char *getenv(const char *name)
 {
 	if (gd->flags & GD_FLG_ENV_READY) {	/* after import into hashtable */
 		ENTRY e, *ep;
@@ -460,7 +494,7 @@ char *getenv (char *name)
 		e.data = NULL;
 		hsearch_r(e, FIND, &ep, &env_htab);
 
-		return (ep ? ep->data : NULL);
+		return ep ? ep->data : NULL;
 	}
 
 	/* restricted capabilities before import */
@@ -474,23 +508,24 @@ char *getenv (char *name)
 /*
  * Look up variable from environment for restricted C runtime env.
  */
-int getenv_f (char *name, char *buf, unsigned len)
+int getenv_f(const char *name, char *buf, unsigned len)
 {
 	int i, nxt;
 
-	for (i=0; env_get_char(i) != '\0'; i=nxt+1) {
+	for (i = 0; env_get_char(i) != '\0'; i = nxt+1) {
 		int val, n;
 
-		for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
-			if (nxt >= CONFIG_ENV_SIZE) {
-				return (-1);
-			}
+		for (nxt = i; env_get_char(nxt) != '\0'; ++nxt) {
+			if (nxt >= CONFIG_ENV_SIZE)
+				return -1;
 		}
-		if ((val=envmatch((uchar *)name, i)) < 0)
+
+		val = envmatch((uchar *)name, i);
+		if (val < 0)
 			continue;
 
 		/* found; copy out */
-		for (n=0; n<len; ++n, ++buf) {
+		for (n = 0; n < len; ++n, ++buf) {
 			if ((*buf = env_get_char(val++)) == '\0')
 				return n;
 		}
@@ -498,22 +533,23 @@ int getenv_f (char *name, char *buf, unsigned len)
 		if (n)
 			*--buf = '\0';
 
-		printf("env_buf too small [%d]\n", len);
+		printf("env_buf [%d bytes] too small for value of \"%s\"\n",
+			len, name);
 
 		return n;
 	}
-	return (-1);
+	return -1;
 }
 
 #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
 
-int do_env_save (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	extern char * env_name_spec;
+	extern char *env_name_spec;
 
-	printf ("Saving Environment to %s...\n", env_name_spec);
+	printf("Saving Environment to %s...\n", env_name_spec);
 
-	return (saveenv() ? 1 : 0);
+	return saveenv() ? 1 : 0;
 }
 
 U_BOOT_CMD(
@@ -533,27 +569,26 @@ U_BOOT_CMD(
  * If the names match, return the index for the value2, else NULL.
  */
 
-int envmatch (uchar *s1, int i2)
+int envmatch(uchar *s1, int i2)
 {
-
 	while (*s1 == env_get_char(i2++))
 		if (*s1++ == '=')
-			return(i2);
+			return i2;
 	if (*s1 == '\0' && env_get_char(i2-1) == '=')
-		return(i2);
-	return(-1);
+		return i2;
+	return -1;
 }
 
-static int do_env_default(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
+static int do_env_default(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	if ((argc != 2) || (strcmp(argv[1], "-f") != 0)) {
+	if ((argc != 2) || (strcmp(argv[1], "-f") != 0))
 		return cmd_usage(cmdtp);
-	}
+
 	set_default_env("## Resetting to default environment\n");
 	return 0;
 }
 
-static int do_env_delete(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
+static int do_env_delete(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	printf("Not implemented yet\n");
 	return 0;
@@ -640,9 +675,8 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
 		}
 	}
 
-	if (argc < 1) {
+	if (argc < 1)
 		return cmd_usage(cmdtp);
-	}
 
 	addr = (char *)simple_strtoul(argv[0], NULL, 16);
 
@@ -686,7 +720,7 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
 		envp->flags = ACTIVE_FLAG;
 #endif
 	}
-	sprintf(buf, "%zX", (size_t)(len + offsetof(env_t,data)));
+	sprintf(buf, "%zX", (size_t)(len + offsetof(env_t, data)));
 	setenv("filesize", buf);
 
 	return 0;
@@ -711,7 +745,7 @@ sep_err:
  *	size:	length of input data; if missing, proper '\0'
  *		termination is mandatory
  */
-static int do_env_import(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
+static int do_env_import(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	char	*cmd, *addr;
 	char	sep = '\n';
@@ -751,9 +785,8 @@ static int do_env_import(cmd_tbl_t * cmdtp, int flag, int argc, char * const arg
 		}
 	}
 
-	if (argc < 1) {
+	if (argc < 1)
 		return cmd_usage(cmdtp);
-	}
 
 	if (!fmt)
 		printf("## Warning: defaulting to text format\n");
@@ -811,7 +844,7 @@ sep_err:
 #endif
 
 #if defined(CONFIG_CMD_RUN)
-extern int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+extern int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 #endif
 
 /*
@@ -829,6 +862,9 @@ static cmd_tbl_t cmd_env_sub[] = {
 #if defined(CONFIG_CMD_EXPORTENV)
 	U_BOOT_CMD_MKENT(export, 4, 0, do_env_export, "", ""),
 #endif
+#if defined(CONFIG_CMD_GREPENV)
+	U_BOOT_CMD_MKENT(grep, CONFIG_SYS_MAXARGS, 1, do_env_grep, "", ""),
+#endif
 #if defined(CONFIG_CMD_IMPORTENV)
 	U_BOOT_CMD_MKENT(import, 5, 0, do_env_import, "", ""),
 #endif
@@ -849,7 +885,7 @@ void env_reloc(void)
 }
 #endif
 
-static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_env(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	cmd_tbl_t *cp;
 
@@ -878,8 +914,11 @@ U_BOOT_CMD(
 #if defined(CONFIG_CMD_EDITENV)
 	"env edit name - edit environment variable\n"
 #endif
-	"env export [-t | -b | -c] addr [size] - export environmnt\n"
-	"env import [-d] [-t | -b | -c] addr [size] - import environmnt\n"
+	"env export [-t | -b | -c] addr [size] - export environment\n"
+#if defined(CONFIG_CMD_GREPENV)
+	"env grep string [...] - search environment\n"
+#endif
+	"env import [-d] [-t | -b | -c] addr [size] - import environment\n"
 	"env print [name ...] - print environment\n"
 #if defined(CONFIG_CMD_RUN)
 	"env run var [...] - run commands in an environment variable\n"
@@ -911,6 +950,16 @@ U_BOOT_CMD_COMPLETE(
 	var_complete
 );
 
+#ifdef CONFIG_CMD_GREPENV
+U_BOOT_CMD_COMPLETE(
+	grepenv, CONFIG_SYS_MAXARGS, 0,  do_env_grep,
+	"search environment variables",
+	"string ...\n"
+	"    - list environment name=value pairs matching 'string'",
+	var_complete
+);
+#endif
+
 U_BOOT_CMD_COMPLETE(
 	setenv, CONFIG_SYS_MAXARGS, 0,	do_env_set,
 	"set environment variables",