Add Regular Expressions Support
v2 cover Add Regular Expressions Support
The following patch series adds the SLRE "Super Light Regular Expression" library and uses this to add regex support for the "env grep" (aka "grepenv") command, and new functions (or operators?) "gsub" and "sub" to the "setexpr" command.
The rework to "env grep" also fixed a few bugs (which caused it to dump always _all_ environment variables on some systems), and adds the capability to grep in either the variable name, or the value, or in both (the old version always did the latter). Instead of special functions we now use common code (i. e. hexport_r()) for the variable look-up, which gives us sorted output as a free additional benefit.
This allows to do things like
- print all MAC addresses:
=> env grep -e eth.*addr eth1addr=00:10:ec:80:c5:15 ethaddr=00:10:ec:00:c5:15
- print all variables that have at least 2 colons in their value:
=> env grep -v -e :.*:
addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off panic=1
eth1addr=00:10:ec:80:c5:15
ethaddr=00:10:ec:00:c5:15
ver=U-Boot 2013.04-rc1-00289-g497746b-dirty (Mar 22 2013 - 12:50:25)- Generate broadcast address by substituting the last two numbers of the IP address by "255.255":
=> print ipaddr
ipaddr=192.168.1.104 => setexpr broadcast sub "(.*\\.).*\\..*" "\\1255.255" $ipaddr broadcast=192.168.255.255
- Depending on keyboard configuration (German vs. US keyboard) a bar code scanner may initialize the MAC address as C0:E5:4E:02:06:DC or as C0>E5>4E>02>06>DC. Make sure we always have a correct value:
=> print ethaddr
ethaddr=C0>E5>4E>02>06>DC => setexpr ethaddr gsub > : ethaddr=C0:E5:4E:02:06:DC
etc.
Regex support can be enabled by defining CONFIG_REGEX in the board config file.
Notes:
- This patch series has been compile-tested (and found to be clean with ELDK v5.3) on all of the following boards:
ARM: m28evk
PPC4xx: acadia bamboo bluestone bubinga canyonlands dlvision-10g dlvision ebony gdppc440etx icon intip io io64 iocon katmai kilauea luan makalu neo ocotea redwood sequoia t3corp taihu taishan walnut yosemite yucca
- Runtime / functional testing has been done mostly on PPC (Sequoia board).
Changes in v2:
- fixed trailing whitespace errors
- Note 1: The "line over 80 characters" warning will NOT be fixed due to the "never break user-visible strings" rule.
- Note 2: The "Alignment should match open parenthesis" check will NOT be fixed due to the "indent by TABs only" rule.
- Fix ERROR: "foo * bar" should be "foo *bar" errors
- Fix trailing whitespace error
- Note: the "Alignment should match open parenthesis" check will not be fixed due to the "indent always byy TABs" rule.
- no changes; most of this is imported code and is intentionally left as is
- the "Alignment should match open parenthesis" check is left due to the "indent only by TABs" rule
- the "line over 80 characters" warning is left due to the "never break user-visible strings" rule
- Fix trailing whitespace error
- fix "No space is necessary after a cast" checks
- fix "space prohibited before semicolon" and "space required after that ';'" errors (but I onsider the result less readable :-( )
- Note: the remaining warnings ("line over 80 characters") and checks ("Alignment should match open parenthesis") are intentionally left as is.
- Do the white space cleanup globally, and as separate patch
Wolfgang Denk (11):
hashtable: preparations to use hexport_r() for "env grep" "env grep" - reimplement command using hexport_r()
"env grep" - add options to grep in name, value, or both. Add SLRE - Super Light Regular Expression library
"env grep" - add support for regular expression matches
setexpr: simplify code, improve help message
setexpr: add regex substring matching and substitution
m28evk: white space cleanup
m28evk: enable "env grep" and regexp support amcc-common.h: minor white space cleanup
amcc-common.h: enable support for "env grep", "setexpr", and regex.
README | 7 + common/cmd_nvedit.c | 87 +++-- common/cmd_setexpr.c | 296 ++++++++++++++++- include/configs/amcc-common.h | 9 +- include/configs/m28evk.h | 259 +++++++-------- include/search.h | 15 +- include/slre.h | 100 ++++++ lib/Makefile | 1 + lib/hashtable.c | 93 ++++-- lib/slre.c | 724 ++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 1391 insertions(+), 200 deletions(-) create mode 100644 include/slre.h create mode 100644 lib/slre.c
Signature · 1 line
1.8.1.4
PATCH v2 1/11 hashtable: preparations to use hexport_r() for "env grep"
The output of "env grep" is unsorted, and printing is done by a private implementation to parse the hash table. We have all the needed code in place in hexport_r() alsready, so let's use this instead. Here we prepare the code for this, without any functional changes yet.
---
Changes in v2:
- fixed trailing whitespace errors
- Note 1: The "line over 80 characters" warning will NOT be fixed due to the "never break user-visible strings" rule.
- Note 2: The "Alignment should match open parenthesis" check will NOT be fixed due to the "indent by TABs only" rule.
common/cmd_nvedit.c | 10 +++++++--- include/search.h | 8 +++++++- lib/hashtable.c | 32 ++++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 12 deletions(-)
common/cmd_nvedit.c +7 -3
@@ -1,5 +1,5 @@/* -* (C) Copyright 2000-2010 +* (C) Copyright 2000-2013 * Wolfgang Denk, DENX Software Engineering, wd at denx.de. * * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@ -871,7 +871,9 @@ NXTARG: ; argv++;if (sep) {/* export as text file */ - len =hexport_r (&env_htab, sep,0 , &addr, size, argc, argv); + len =hexport_r (&env_htab, sep, +H_MATCH_KEY |H_MATCH_IDENT , + &addr, size, argc, argv);if (len <0 ) {error ("Cannot export environment: errno = %d\n" , errno);return 1 ;
@@ -889,7 +891,9 @@ NXTARG: ; else /* export as raw binary data */ res = addr; - len =hexport_r (&env_htab,'\0' ,0 , &res,ENV_SIZE , argc, argv); + len =hexport_r (&env_htab,'\0' , +H_MATCH_KEY |H_MATCH_IDENT , + &res,ENV_SIZE , argc, argv);if (len <0 ) {error ("Cannot export environment: errno = %d\n" , errno);return 1 ;
include/search.h +7 -1
@@ -22,7 +22,7 @@/* * Based on code from uClibc-0.9.30.3 * Extensions for use within U-Boot -* Copyright (C) 2010 Wolfgang Denk <[email protected]> +* Copyright (C) 2010-2013 Wolfgang Denk <[email protected]> */ #ifndef _SEARCH_H
@@ -131,5 +131,11 @@ extern int hwalk_r(struct hsearch_data *__htab, int (*callback)(ENTRY *));#define H_FORCE (1 << 1)/* overwrite read-only/write-once variables */ #define H_INTERACTIVE (1 << 2)/* indicate that an import is user directed */ #define H_HIDE_DOT (1 << 3)/* don't print env vars that begin with '.' */ +#define H_MATCH_KEY (1 << 4)/* search/grep key = variable names */ +#define H_MATCH_DATA (1 << 5)/* search/grep data = variable values */ +#define H_MATCH_BOTH (H_MATCH_KEY | H_MATCH_DATA)/* search/grep both */ +#define H_MATCH_IDENT (1 << 6)/* search for indentical strings */ +#define H_MATCH_SUBSTR (1 << 7)/* search for substring matches */ +#define H_MATCH_METHOD (H_MATCH_IDENT | H_MATCH_SUBSTR)#endif /* search.h */
lib/hashtable.c +24 -8
@@ -2,7 +2,7 @@* This implementation is based on code from uClibc-0.9.30.3 but was * modified and extended for use within U-Boot. * -* Copyright (C) 2010 Wolfgang Denk <[email protected]> +* Copyright (C) 2010-2013 Wolfgang Denk <[email protected]> * * Original license header: *
@@ -563,6 +563,28 @@ static int cmpkey(const void *p1, const void *p2)return (strcmp (e1->key, e2->key)); } +static int match_strings (ENTRY *ep,int flag, +int argc,char *const argv[]) +{ +int arg; + +for (arg =0 ; arg < argc; ++arg) { +if (flag &H_MATCH_KEY ) { +switch (flag &H_MATCH_METHOD ) { +case H_MATCH_IDENT : +if (strcmp (argv[arg], ep->key) ==0 ) +return 1 ; +break ; +default : +printf ("## ERROR: unsupported match method: 0x%02x\n" , + flag &H_MATCH_METHOD ); +break ; + } + } + } +return 0 ; +} +ssize_t hexport_r (struct hsearch_data *htab,const char sep,int flag,char **resp,size_t size,int argc,char *const argv[])
@@ -589,14 +611,8 @@ ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag,if (htab->table[i].used >0 ) {ENTRY *ep = &htab->table[i].entry; -int arg, found =0 ; +int found =match_strings (ep, flag, argc, argv); -for (arg =0 ; arg < argc; ++arg) { -if (strcmp (argv[arg], ep->key) ==0 ) { - found =1 ; -break ; - } - }if ((argc >0 ) && (found ==0 ))continue ;
Signature · 1 line
1.8.1.4
PATCH v2 2/11 "env grep" - reimplement command using hexport_r()
In reply to Wolfgang DenkAlso drop hstrstr_r() which is not needed any more. The new code is way more flexible.
---
Changes in v2:
- Fix ERROR: "foo * bar" should be "foo *bar" errors
- Fix trailing whitespace error
- Note: the "Alignment should match open parenthesis" check will not be fixed due to the "indent always byy TABs" rule.
common/cmd_nvedit.c | 30 ++++++++++--------------- include/search.h | 6 ----- lib/hashtable.c | 64 +++++++++++++++++++++++------------------------------ 3 files changed, 40 insertions(+), 60 deletions(-)
common/cmd_nvedit.c +12 -18
@@ -162,31 +162,25 @@ static int do_env_print(cmd_tbl_t *cmdtp, int flag, int argc,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; +char *res =NULL ; +int len;if (argc <2 )return CMD_RET_USAGE ; -memset (matched,0 , env_htab.size /8 ); + len =hexport_r (&env_htab,'\n' , + flag |H_MATCH_BOTH |H_MATCH_SUBSTR , + &res,0 , argc, argv); -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++; +if (len >0 ) { +puts (res); +free (res); } -return rcode; +if (len <2 ) +return 1 ; + +return 0 ; }#endif #endif /* CONFIG_SPL_BUILD */
include/search.h +0 -6
@@ -98,12 +98,6 @@ extern int hsearch_r(ENTRY __item, ACTION __action, ENTRY ** __retval,*/ extern int hmatch_r (const char *__match,int __last_idx,ENTRY ** __retval,struct hsearch_data *__htab); -/* -* Search for an entry whose key or data contains `MATCH'. Otherwise, -* Same semantics as hsearch_r(). -*/ -extern int hstrstr_r (const char *__match,int __last_idx,ENTRY ** __retval, -struct hsearch_data *__htab);/* Search and delete entry matching ITEM.key in internal hash table. */ extern int hdelete_r(const char *__key, struct hsearch_data *__htab,
lib/hashtable.c +28 -36
87 lines not on this page · raw message
Signature · 1 line
1.8.1.4
PATCH v2 3/11 "env grep" - add options to grep in name, value, or both.
In reply to Wolfgang DenkAdd options to "env grep" command:
-n : search only the envrironment variable names
-v : search only their values
-b : search both names and values (= default)
An option "--" will stop parsing options, so to print variables that contain the striing "- " please use:
env grep -- "- "
Or to print all environment varioables which have a '-' in their name, use:
env grep -n -- -
---
Changes in v2: None
common/cmd_nvedit.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-)
common/cmd_nvedit.c +33 -5
@@ -163,13 +163,39 @@ static int do_env_grep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { char *res = NULL; -int len; +int len, grep_flags;if (argc <2 )return CMD_RET_USAGE ; + grep_flags =H_MATCH_BOTH ; + +while (argc >1 && **(argv +1 ) =='-' ) { +char *arg = *++argv; + + --argc; +while (*++arg) { +switch (*arg) { +case 'n' :/* grep for name */ + grep_flags =H_MATCH_KEY ; +break ; +case 'v' :/* grep for value */ + grep_flags =H_MATCH_DATA ; +break ; +case 'b' :/* grep for both */ + grep_flags =H_MATCH_BOTH ; +break ; +case '-' : + goto DONE; +default : +return CMD_RET_USAGE ; + } + } + } + +DONE: len =hexport_r (&env_htab,'\n' , - flag |H_MATCH_BOTH |H_MATCH_SUBSTR , + flag | grep_flags |H_MATCH_SUBSTR , &res,0 , argc, argv);if (len >0 ) {
@@ -1106,7 +1132,7 @@ static char env_help_text[] = "env flags - print variables that have non-default flags\n"#endif #if defined(CONFIG_CMD_GREPENV ) - "env grep string [...] - search environment\n" + "env grep [-n | -v | -b] string [...] - search environment\n"#endif #if defined(CONFIG_CMD_IMPORTENV )"env import [-d] [-t | -b | -c] addr [size] - import environment\n"
@@ -1153,8 +1179,10 @@ U_BOOT_CMD_COMPLETE(U_BOOT_CMD_COMPLETE ( grepenv,CONFIG_SYS_MAXARGS ,0 , do_env_grep,"search environment variables" , -"string ...\n" -" - list environment name=value pairs matching 'string'" , +"[-n | -v | -b] string ...\n" +" - list environment name=value pairs matching 'string'\n" +" \"-n\": search variable names; \"-v\": search values;\n" +" \"-b\": search both names and values (default)" , var_complete );#endif
Signature · 1 line
1.8.1.4
PATCH v2 4/11 Add SLRE - Super Light Regular Expression library
In reply to Wolfgang DenkDownloaded from http://slre.sourceforge.net/
and adapted for U-Boot environment.
Used to implement regex operations on environment variables. Code size is ~ 3.5 KiB on PPC.
To enable this code, define the CONFIG_REGEX option in your board config file.
Note: There are more recent versions of the SLRE library available at
http://slre.googlecode.com ; unfortunately, the new code has a heavily reorked API which makes it less usable for our purposes:
- the return code is strings, which are more difficult to process
- we don't get any information any more which sub-string of the data was matched by the given regex
- it is much more cumbersome to work with arbitrary expressions, where for example the number of substrings for capturing are not known at compile time
Also, there does not seem to be any real changes or improvements of the functionality.
Because of this, we deliberately stick with the older code.
Note 2: the test code (built when SLRE_TEST is defined) was modified to allow for more extensive testing; now we can test the regexp matching on all lines on a text file (instead of the whole data in the file as a single block).
---
Changes in v2:
- no changes; most of this is imported code and is intentionally left as is
- the "Alignment should match open parenthesis" check is left due to the "indent only by TABs" rule
- the "line over 80 characters" warning is left due to the "never break user-visible strings" rule
README | 7 + include/slre.h | 100 ++++++++ lib/Makefile | 1 + lib/slre.c | 724 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 832 insertions(+) create mode 100644 include/slre.h create mode 100644 lib/slre.c
README +7 -0
@@ -930,6 +930,13 @@ The following options need to be configured: XXX - this list needs to get updated! +- Regular expression support: + CONFIG_REGEX + If this variable is defined, U-Boot is linked against + the SLRE (Super Light Regular Expression) library, + which adds regex support to some commands, as for + example "env grep" and "setexpr". + - Device tree: CONFIG_OF_CONTROL If this variable is defined, U-Boot will use a device tree
include/slre.h new file +100 -0
100 lines not on this page · raw message
lib/Makefile +1 -0
@@ -71,6 +71,7 @@ COBJS-y += crc32.o COBJS-y += ctype.o COBJS-y += div64.o COBJS-y += linux_string.o +COBJS-$(CONFIG_REGEX) += slre.o COBJS-y += string.o COBJS-y += time.o COBJS-$(CONFIG_BOOTP_PXE) += uuid.o
lib/slre.c new file +724 -0
724 lines not on this page · raw message
Signature · 1 line
1.8.1.4
PATCH v2 5/11 "env grep" - add support for regular expression matches
In reply to Wolfgang DenkWhen CONFIG_REGEX is enabled, the new option "-e" becomes available which causes regular expression matches to be used. This allows for example things like these:
- print all MAC addresses:
=> env grep -e eth.*addr eth1addr=00:10:ec:80:c5:15 ethaddr=00:10:ec:00:c5:15
- print all variables that have at least 2 colons in their value:
=> env grep -v -e :.*:
addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off
panic=1
eth1addr=00:10:ec:80:c5:15
ethaddr=00:10:ec:00:c5:15
ver=U-Boot 2013.04-rc1-00289-g497746b-dirty (Mar 22 2013 - 12:50:25)etc.
---
Changes in v2:
- Fix trailing whitespace error
common/cmd_nvedit.c | 29 +++++++++++++++++++++++------ include/search.h | 5 +++-- lib/hashtable.c | 29 ++++++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 11 deletions(-)
common/cmd_nvedit.c +23 -6
@@ -163,12 +163,13 @@ static int do_env_grep(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { char *res = NULL; -int len, grep_flags; +int len, grep_how, grep_what;if (argc <2 )return CMD_RET_USAGE ; - grep_flags =H_MATCH_BOTH ; + grep_how =H_MATCH_SUBSTR ;/* default: substring search */ + grep_what =H_MATCH_BOTH ;/* default: grep names and values */ while (argc >1 && **(argv +1 ) =='-' ) {char *arg = *++argv;
@@ -176,14 +177,19 @@ static int do_env_grep(cmd_tbl_t *cmdtp, int flag, --argc;while (*++arg) {switch (*arg) { +#ifdef CONFIG_REGEX +case 'e' :/* use regex matching */ + grep_how =H_MATCH_REGEX ; +break ; +#endif case 'n' :/* grep for name */ - grep_flags =H_MATCH_KEY ; + grep_what =H_MATCH_KEY ;break ;case 'v' :/* grep for value */ - grep_flags =H_MATCH_DATA ; + grep_what =H_MATCH_DATA ;break ;case 'b' :/* grep for both */ - grep_flags =H_MATCH_BOTH ; + grep_what =H_MATCH_BOTH ;break ;case '-' : goto DONE;
@@ -195,7 +201,7 @@ static int do_env_grep(cmd_tbl_t *cmdtp, int flag, DONE: len =hexport_r (&env_htab,'\n' , - flag | grep_flags |H_MATCH_SUBSTR , + flag | grep_what | grep_how, &res,0 , argc, argv);if (len >0 ) {
@@ -1132,8 +1138,12 @@ static char env_help_text[] = "env flags - print variables that have non-default flags\n"#endif #if defined(CONFIG_CMD_GREPENV ) +#ifdef CONFIG_REGEX +"env grep [-e] [-n | -v | -b] string [...] - search environment\n" +#else "env grep [-n | -v | -b] string [...] - search environment\n"#endif +#endif #if defined(CONFIG_CMD_IMPORTENV ) "env import [-d] [-t | -b | -c] addr [size] - import environment\n"#endif
@@ -1179,8 +1189,15 @@ U_BOOT_CMD_COMPLETE(U_BOOT_CMD_COMPLETE ( grepenv,CONFIG_SYS_MAXARGS ,0 , do_env_grep,"search environment variables" , +#ifdef CONFIG_REGEX + "[-e] [-n | -v | -b] string ...\n" +#else "[-n | -v | -b] string ...\n" +#endif " - list environment name=value pairs matching 'string'\n" +#ifdef CONFIG_REGEX + " \"-e\": enable regular expressions;\n" +#endif" \"-n\": search variable names; \"-v\": search values;\n" " \"-b\": search both names and values (default)" , var_complete
include/search.h +3 -2
@@ -129,7 +129,8 @@ extern int hwalk_r(struct hsearch_data *__htab, int (*callback)(ENTRY *));#define H_MATCH_DATA (1 << 5)/* search/grep data = variable values */ #define H_MATCH_BOTH (H_MATCH_KEY | H_MATCH_DATA)/* search/grep both */ #define H_MATCH_IDENT (1 << 6)/* search for indentical strings */ -#define H_MATCH_SUBSTR (1 << 7)/* search for substring matches */ -#define H_MATCH_METHOD (H_MATCH_IDENT | H_MATCH_SUBSTR) +#define H_MATCH_SUBSTR (1 << 7)/* search for substring matches */ +#define H_MATCH_REGEX (1 << 8)/* search for regular expression matches */ +#define H_MATCH_METHOD (H_MATCH_IDENT | H_MATCH_SUBSTR | H_MATCH_REGEX)#endif /* search.h */
lib/hashtable.c +26 -3
@@ -57,6 +57,7 @@#include <env_callback.h> #include <env_flags.h> #include <search.h> +#include <slre.h> /* * [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986
@@ -540,7 +541,7 @@ static int cmpkey(const void *p1, const void *p2)return (strcmp (e1->key, e2->key)); } -static int match_string (int flag,const char *str,const char *pat) +static int match_string (int flag,const char *str,const char *pat,void *priv) {switch (flag &H_MATCH_METHOD ) {case H_MATCH_IDENT :
@@ -551,6 +552,17 @@ static int match_string(int flag, const char *str, const char *pat)if (strstr (str, pat))return 1 ;break ; +#ifdef CONFIG_REGEX +case H_MATCH_REGEX : + { +struct slre *slrep = (struct slre *)priv; +struct cap caps[slrep->num_caps +2 ]; + +if (slre_match (slrep, str,strlen (str), caps)) +return 1 ; + } +break ; +#endif default :printf ("## ERROR: unsupported match method: 0x%02x\n" , flag &H_MATCH_METHOD );
@@ -563,14 +575,25 @@ static int match_entry(ENTRY *ep, int flag, int argc, char * const argv[]) { int arg; +void *priv =NULL ;for (arg =1 ; arg < argc; ++arg) { +#ifdef CONFIG_REGEX +struct slre slre; + +if (slre_compile (&slre, argv[arg]) ==0 ) { +printf ("Error compiling regex: %s\n" , slre.err_str); +return 0 ; + } + + priv = (void *)&slre; +#endif if (flag &H_MATCH_KEY ) { -if (match_string (flag, ep->key, argv[arg])) +if (match_string (flag, ep->key, argv[arg], priv))return 1 ; }if (flag &H_MATCH_DATA ) { -if (match_string (flag, ep->data, argv[arg])) +if (match_string (flag, ep->data, argv[arg], priv))return 1 ; } }
Signature · 1 line
1.8.1.4
PATCH v2 6/11 setexpr: simplify code, improve help message
In reply to Wolfgang DenkSimplify the argument checking for the "setexpr" command. This is done mainly to make future extensions easier.
Also improve the help message for the one argument version of the command - this does not "load an address", but a value, which in this context may be a plain number or a pointer dereference.
---
Changes in v2: None
common/cmd_setexpr.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
common/cmd_setexpr.c +11 -7
@@ -56,22 +56,26 @@ static int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])ulong value;int w; -/* Validate arguments */ -if (argc !=5 && argc !=3 ) -return CMD_RET_USAGE ; -if (argc ==5 &&strlen (argv[3 ]) !=1 ) +if (argc <3 )return CMD_RET_USAGE ; w =cmd_get_data_size (argv[0 ],4 ); a =get_arg (argv[2 ], w); +/* plain assignment: "setexpr name value" */ if (argc ==3 ) {setenv_hex (argv[1 ], a); -return 0 ; } +/* standard operators: "setexpr name val1 op val2" */ +if (argc !=5 ) +return CMD_RET_USAGE ; + +if (strlen (argv[3 ]) !=1 ) +return CMD_RET_USAGE ; + b =get_arg (argv[4 ], w);switch (argv[3 ][0 ]) {
@@ -117,6 +121,6 @@ U_BOOT_CMD(" express specified by <op>. <op> can be &, |, ^, +, -, *, /, %\n" " size argument is only meaningful if value1 and/or value2 are\n" " memory addresses (*)\n" -"setexpr[.b, .w, .l] name *value\n" -" - load a memory address into a variable" +"setexpr[.b, .w, .l] name [*]value\n" +" - load a value into a variable" );
Signature · 1 line
1.8.1.4
PATCH v2 7/11 setexpr: add regex substring matching and substitution
In reply to Wolfgang DenkAdd "setexpr name gsub r s [t]" and "setexpr name sub r s [t]" commands which implement substring matching for the regular expression <r> in the string <t>, and substitution of the string <s>. The result is assigned to the environment variable <name>. If <t> is not supplied, the previous value of <name> is used instead. "gsub" performs global substitution, while "sub" will replace only the first substring.
Both commands are closely modeled after the gawk functions with the same names.
Examples:
- Generate broadcast address by substituting the last two numbers of the IP address by "255.255":
=> print ipaddr
ipaddr=192.168.1.104 => setexpr broadcast sub "(.*\\.).*\\..*" "\\1255.255" $ipaddr broadcast=192.168.255.255
- Depending on keyboard configuration (German vs. US keyboard) a barcode scanner may initialize the MAC address as C0:E5:4E:02:06:DC or as C0>E5>4E>02>06>DC. Make sure we always have a correct value:
=> print ethaddr ethaddr=C0>E5>4E>02>06>DC => setexpr ethaddr gsub > : ethaddr=C0:E5:4E:02:06:DC
- Do the same, but substitute one step at a time in a loop until no futher matches:
=> setenv ethaddr C0>E5>4E>02>06>DC => while setexpr ethaddr sub > : > do > echo ----- > done ethaddr=C0:E5>4E>02>06>DC ----- ethaddr=C0:E5:4E>02>06>DC ----- ethaddr=C0:E5:4E:02>06>DC ----- ethaddr=C0:E5:4E:02:06>DC ----- ethaddr=C0:E5:4E:02:06:DC ----- C0:E5:4E:02:06:DC: No match => print ethaddr ethaddr=C0:E5:4E:02:06:DC
etc.
To enable this feature, the CONFIG_REGEX option has to be defined in the board config file.
---
Changes in v2:
- fix "No space is necessary after a cast" checks
- fix "space prohibited before semicolon" and "space required after that ';'" errors (but I consider the result less readable :-( )
- Note: the remaining warnings ("line over 80 characters") and checks ("Alignment should match open parenthesis") are intentionally left as is.
common/cmd_setexpr.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 277 insertions(+), 3 deletions(-)
common/cmd_setexpr.c +277 -3
@@ -1,5 +1,6 @@/* * Copyright 2008 Freescale Semiconductor, Inc. +* Copyright 2013 Wolfgang Denk <[email protected]> * * See file CREDITS for list of people who contributed to this * project.
@@ -50,13 +51,263 @@ static ulong get_arg(char *s, int w) } } +#ifdef CONFIG_REGEX + +#include <slre.h> + +#define SLRE_BUFSZ 16384 +#define SLRE_PATSZ 4096 + +/* +* memstr - Find the first substring in memory +* @s1: The string to be searched +* @s2: The string to search for +* +* Similar to and based on strstr(), +* but strings do not need to be NUL terminated. +*/ +static char *memstr (const char *s1,int l1,const char *s2,int l2) +{ +if (!l2) +return (char *)s1; + +while (l1 >= l2) { + l1--; +if (!memcmp (s1, s2, l2)) +return (char *)s1; + s1++; + } +return NULL ; +} + +static char *substitute (char *string,/* string buffer */ +int *slen,/* current string length */ +int ssize,/* string bufer size */ +const char *old,/* old (replaced) string */ +int olen,/* length of old string */ +const char *new,/* new (replacement) string */ +int nlen)/* length of new string */ +{ +char *p =memstr (string, *slen, old, olen); + +if (p ==NULL ) +return NULL ; + +debug ("## Match at pos %ld: match len %d, subst len %d\n" , + (long )(p - string), olen, nlen); + +/* make sure replacement matches */ +if (*slen + nlen - olen > ssize) { +printf ("## error: substitution buffer overflow\n" ); +return NULL ; + } + +/* move tail if needed */ +if (olen != nlen) { +int tail, len; + + len = (olen > nlen) ? olen : nlen; + + tail = ssize - (p + len - string); + +debug ("## tail len %d\n" , tail); + +memmove (p + nlen, p + olen, tail); + } + +/* insert substitue */ +memcpy (p, new, nlen); + + *slen += nlen - olen; + +return p + nlen; +} + +/* +* Perform regex operations on a environment variable +* +* Returns 0 if OK, 1 in case of errors. +*/ +static int regex_sub (const char *name, +const char *r,const char *s,const char *t, +int global) +{ +struct slre slre; +char data[SLRE_BUFSZ ]; +char *datap = data; +const char *value; +int res, len, nlen, loop; + +if (name ==NULL ) +return 1 ; + +if (slre_compile (&slre, r) ==0 ) { +printf ("Error compiling regex: %s\n" , slre.err_str); +return 1 ; + } + +if (t ==NULL ) { + value =getenv (name); + +if (value ==NULL ) { +printf ("## Error: variable \"%s\" not defined\n" , name); +return 1 ; + } + t = value; + } + +debug ("REGEX on %s=%s\n" , name, t); +debug ("REGEX=\"%s\", SUBST=\"%s\", GLOBAL=%d\n" , + r, s ? s :"<NULL>" , global); + + len =strlen (t); +if (len +1 >SLRE_BUFSZ ) { +printf ("## error: subst buffer overflow: have %d, need %d\n" , +SLRE_BUFSZ , len +1 ); +return 1 ; + } + +strcpy (data, t); + +if (s ==NULL ) + nlen =0 ; +else + nlen =strlen (s); + +for (loop =0 ;; loop++) { +struct cap caps[slre.num_caps +2 ]; +char nbuf[SLRE_PATSZ ]; +const char *old; +char *np; +int i, olen; + + (void )memset (caps,0 ,sizeof (caps)); + + res =slre_match (&slre, datap, len, caps); + +debug ("Result: %d\n" , res); + +for (i =0 ; i < slre.num_caps; i++) { +if (caps[i].len >0 ) { +debug ("Substring %d: [%.*s]\n" , i, + caps[i].len, caps[i].ptr); + } + } + +if (res ==0 ) { +if (loop ==0 ) { +printf ("%s: No match\n" , t); +return 1 ; + }else { +break ; + } + } + +debug ("## MATCH ## %s\n" , data); + +if (s ==NULL ) { +printf ("%s=%s\n" , name, t); +return 1 ; + } + + old = caps[0 ].ptr; + olen = caps[0 ].len; + +if (nlen +1 >=SLRE_PATSZ ) { +printf ("## error: pattern buffer overflow: have %d, need %d\n" , +SLRE_BUFSZ , nlen +1 ); +return 1 ; + } +strcpy (nbuf, s); + +debug ("## SUBST(1) ## %s\n" , nbuf); + +/* +* Handle back references +* +* Support for \0 ... \9, where \0 is the +* whole matched pattern (similar to &). +* +* Implementation is a bit simpleminded as +* backrefs are substituted sequentially, one +* by one. This will lead to somewhat +* unexpected results if the replacement +* strings contain any \N strings then then +* may get substitued, too. We accept this +* restriction for the sake of simplicity. +*/ +for (i =0 ; i <10 ; ++i) { +char backref[2 ] = { +'\\' , +'0' , + }; + +if (caps[i].len ==0 ) +break ; + + backref[1 ] += i; + +debug ("## BACKREF %d: replace \"%.*s\" by \"%.*s\" in \"%s\"\n" , + i, +2 , backref, + caps[i].len, caps[i].ptr, + nbuf); + +for (np = nbuf;;) { +char *p =memstr (np, nlen, backref,2 ); + +if (p ==NULL ) +break ; + + np =substitute (np, &nlen, +SLRE_PATSZ , + backref,2 , + caps[i].ptr, caps[i].len); + +if (np ==NULL ) +return 1 ; + } + } +debug ("## SUBST(2) ## %s\n" , nbuf); + + datap =substitute (datap, &len,SLRE_BUFSZ , + old, olen, + nbuf, nlen); + +if (datap ==NULL ) +return 1 ; + +debug ("## REMAINDER: %s\n" , datap); + +debug ("## RESULT: %s\n" , data); + +if (!global) +break ; + } +debug ("## FINAL (now setenv()) : %s\n" , data); + +printf ("%s=%s\n" , name, data); + +return setenv (name, data); +} +#endif +static int do_setexpr (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {ulong a, b;ulong value;int w; -if (argc <3 ) +/* +* We take 3, 5, or 6 arguments: +* 3 : setexpr name value +* 5 : setexpr name val1 op val2 +* setexpr name [g]sub r s +* 6 : setexpr name [g]sub r s t +*/ + +/* > 6 already tested by max command args */ +if ((argc <3 ) || (argc ==4 ))return CMD_RET_USAGE ; w =cmd_get_data_size (argv[0 ],4 );
@@ -69,6 +320,19 @@ static int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return 0 ; } +/* 5 or 6 args (6 args only with [g]sub) */ +#ifdef CONFIG_REGEX +/* +* rexep handling: "setexpr name [g]sub r s [t]" +* with 5 args, "t" will be NULL +*/ +if (strcmp (argv[2 ],"gsub" ) ==0 ) +return regex_sub (argv[1 ], argv[3 ], argv[4 ], argv[5 ],1 ); + +if (strcmp (argv[2 ],"sub" ) ==0 ) +return regex_sub (argv[1 ], argv[3 ], argv[4 ], argv[5 ],0 ); +#endif +/* standard operators: "setexpr name val1 op val2" */ if (argc !=5 )return CMD_RET_USAGE ;
@@ -114,13 +378,23 @@ static int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }U_BOOT_CMD ( - setexpr,5 ,0 , do_setexpr, + setexpr,6 ,0 , do_setexpr,"set environment variable as the result of eval expression" ,"[.b, .w, .l] name [*]value1 <op> [*]value2\n" " - set environment variable 'name' to the result of the evaluated\n" -" express specified by <op>. <op> can be &, |, ^, +, -, *, /, %\n" +" expression specified by <op>. <op> can be &, |, ^, +, -, *, /, %\n" " size argument is only meaningful if value1 and/or value2 are\n" " memory addresses (*)\n" "setexpr[.b, .w, .l] name [*]value\n" " - load a value into a variable" +#ifdef CONFIG_REGEX +"\n" +"setexpr name gsub r s [t]\n" +" - For each substring matching the regular expression <r> in the\n" +" string <t>, substitute the string <s>. The result is\n" +" assigned to <name>. If <t> is not supplied, use the old\n" +" value of <name>\n" +"setexpr name sub r s [t]\n" +" - Just like gsub(), but replace only the first matching substring" +#endif );
Signature · 1 line
1.8.1.4
PATCH v2 8/11 m28evk: white space cleanup
In reply to Wolfgang DenkChange all "#define<TAB>" sequences into "#define<SPACE>"
---
Changes in v2:
- Do the white space cleanup globally, and as separate patch
include/configs/m28evk.h | 256 +++++++++++++++++++++++------------------------ 1 file changed, 128 insertions(+), 128 deletions(-)
include/configs/m28evk.h +128 -128
@@ -23,71 +23,71 @@/* * SoC configurations */ -#define CONFIG_MX28 /* i.MX28 SoC */ -#define CONFIG_MXS_GPIO /* GPIO control */ -#define CONFIG_SYS_HZ 1000/* Ticks per second */ +#define CONFIG_MX28 /* i.MX28 SoC */ +#define CONFIG_MXS_GPIO /* GPIO control */ +#define CONFIG_SYS_HZ 1000/* Ticks per second */ /* * Define M28EVK machine type by hand until it lands in mach-types */ -#define MACH_TYPE_M28EVK 3613 +#define MACH_TYPE_M28EVK 3613 -#define CONFIG_MACH_TYPE MACH_TYPE_M28EVK +#define CONFIG_MACH_TYPE MACH_TYPE_M28EVK#include <asm/arch/regs-base.h> -#define CONFIG_SYS_NO_FLASH -#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_ARCH_MISC_INIT +#define CONFIG_SYS_NO_FLASH +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_ARCH_MISC_INIT /* * SPL */ -#define CONFIG_SPL -#define CONFIG_SPL_NO_CPU_SUPPORT_CODE -#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs" -#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_GPIO_SUPPORT +#define CONFIG_SPL +#define CONFIG_SPL_NO_CPU_SUPPORT_CODE +#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs" +#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" +#define CONFIG_SPL_LIBCOMMON_SUPPORT +#define CONFIG_SPL_LIBGENERIC_SUPPORT +#define CONFIG_SPL_GPIO_SUPPORT /* * U-Boot Commands */ #include <config_cmd_default.h> -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DOS_PARTITION +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DOS_PARTITION -#define CONFIG_CMD_CACHE -#define CONFIG_CMD_DATE -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_CMD_GPIO -#define CONFIG_CMD_I2C -#define CONFIG_CMD_MII -#define CONFIG_CMD_MMC -#define CONFIG_CMD_NAND -#define CONFIG_CMD_NET -#define CONFIG_CMD_NFS -#define CONFIG_CMD_PING -#define CONFIG_CMD_SETEXPR -#define CONFIG_CMD_SF -#define CONFIG_CMD_SPI -#define CONFIG_CMD_USB +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_DATE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_FAT +#define CONFIG_CMD_GPIO +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_MMC +#define CONFIG_CMD_NAND +#define CONFIG_CMD_NET +#define CONFIG_CMD_NFS +#define CONFIG_CMD_PING +#define CONFIG_CMD_SETEXPR +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_CMD_USB /* * Memory configurations */ -#define CONFIG_NR_DRAM_BANKS 1/* 1 bank of DRAM */ -#define PHYS_SDRAM_1 0x40000000/* Base address */ -#define PHYS_SDRAM_1_SIZE 0x20000000/* Max 512 MB RAM */ -#define CONFIG_SYS_MALLOC_LEN 0x00400000/* 4 MB for malloc */ -#define CONFIG_SYS_GBL_DATA_SIZE 128/* Initial data */ -#define CONFIG_SYS_MEMTEST_START 0x40000000/* Memtest start adr */ -#define CONFIG_SYS_MEMTEST_END 0x40400000/* 4 MB RAM test */ -#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_NR_DRAM_BANKS 1/* 1 bank of DRAM */ +#define PHYS_SDRAM_1 0x40000000/* Base address */ +#define PHYS_SDRAM_1_SIZE 0x20000000/* Max 512 MB RAM */ +#define CONFIG_SYS_MALLOC_LEN 0x00400000/* 4 MB for malloc */ +#define CONFIG_SYS_GBL_DATA_SIZE 128/* Initial data */ +#define CONFIG_SYS_MEMTEST_START 0x40000000/* Memtest start adr */ +#define CONFIG_SYS_MEMTEST_END 0x40400000/* 4 MB RAM test */ +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1/* Point initial SP in SRAM so SPL can use it too. */ #define CONFIG_SYS_INIT_RAM_ADDR 0x00000000
@@ -102,42 +102,42 @@* strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot * binary. In case there was more of this mess, 0x100 bytes are skipped. */ -#define CONFIG_SYS_TEXT_BASE 0x40000100 +#define CONFIG_SYS_TEXT_BASE 0x40000100/* * U-Boot general configurations */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_PROMPT "=> " -#define CONFIG_SYS_CBSIZE 1024/* Console I/O buffer size */ -#define CONFIG_SYS_PBSIZE \ +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_PROMPT "=> " +#define CONFIG_SYS_CBSIZE 1024/* Console I/O buffer size */ +#define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)/* Print buffer size */ -#define CONFIG_SYS_MAXARGS 32/* Max number of command args */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +#define CONFIG_SYS_MAXARGS 32/* Max number of command args */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot argument buffer size */ -#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ -#define CONFIG_AUTO_COMPLETE /* Command auto complete */ -#define CONFIG_CMDLINE_EDITING /* Command history etc */ -#define CONFIG_SYS_HUSH_PARSER +#define CONFIG_VERSION_VARIABLE /* U-BOOT version */ +#define CONFIG_AUTO_COMPLETE /* Command auto complete */ +#define CONFIG_CMDLINE_EDITING /* Command history etc */ +#define CONFIG_SYS_HUSH_PARSER /* * Serial Driver */ -#define CONFIG_PL011_SERIAL -#define CONFIG_PL011_CLOCK 24000000 -#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } -#define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200/* Default baud rate */ +#define CONFIG_PL011_SERIAL +#define CONFIG_PL011_CLOCK 24000000 +#define CONFIG_PL01x_PORTS { (void *)MXS_UARTDBG_BASE } +#define CONFIG_CONS_INDEX 0 +#define CONFIG_BAUDRATE 115200/* Default baud rate */ /* * MMC Driver */ #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC -#define CONFIG_BOUNCE_BUFFER -#define CONFIG_GENERIC_MMC -#define CONFIG_MXS_MMC +#define CONFIG_MMC +#define CONFIG_BOUNCE_BUFFER +#define CONFIG_GENERIC_MMC +#define CONFIG_MXS_MMC #endif /*
@@ -148,31 +148,31 @@/* * NAND */ -#define CONFIG_ENV_SIZE (16 * 1024) +#define CONFIG_ENV_SIZE (16 * 1024)#ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_MXS -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE 0x60000000 -#define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_NAND_MXS +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE 0x60000000 +#define CONFIG_SYS_NAND_5_ADDR_CYCLE /* Environment is in NAND */ -#define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -#define CONFIG_ENV_SECT_SIZE (128 * 1024) -#define CONFIG_ENV_RANGE (512 * 1024) -#define CONFIG_ENV_OFFSET 0x300000 -#define CONFIG_ENV_OFFSET_REDUND \ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE +#define CONFIG_ENV_SECT_SIZE (128 * 1024) +#define CONFIG_ENV_RANGE (512 * 1024) +#define CONFIG_ENV_OFFSET 0x300000 +#define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#define CONFIG_CMD_MTDPARTS -#define CONFIG_RBTREE -#define CONFIG_LZO -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#define MTDIDS_DEFAULT "nand0=gpmi-nand" -#define MTDPARTS_DEFAULT \ +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS +#define CONFIG_CMD_MTDPARTS +#define CONFIG_RBTREE +#define CONFIG_LZO +#define CONFIG_MTD_DEVICE +#define CONFIG_MTD_PARTITIONS +#define MTDIDS_DEFAULT "nand0=gpmi-nand" +#define MTDPARTS_DEFAULT \ "mtdparts=gpmi-nand:" \ "3m(bootloader)ro," \ "512k(environment)," \
@@ -182,34 +182,34 @@"8m(ramdisk)," \ "-(filesystem)"#else -#define CONFIG_ENV_IS_NOWHERE +#define CONFIG_ENV_IS_NOWHERE #endif /* * Ethernet on SOC (FEC) */ #ifdef CONFIG_CMD_NET -#define CONFIG_ETHPRIME "FEC0" -#define CONFIG_FEC_MXC -#define CONFIG_MII -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_ETHPRIME "FEC0" +#define CONFIG_FEC_MXC +#define CONFIG_MII +#define CONFIG_FEC_XCV_TYPE RMII#endif /* * I2C */ #ifdef CONFIG_CMD_I2C -#define CONFIG_I2C_MXS -#define CONFIG_HARD_I2C -#define CONFIG_SYS_I2C_SPEED 400000 +#define CONFIG_I2C_MXS +#define CONFIG_HARD_I2C +#define CONFIG_SYS_I2C_SPEED 400000#endif /* * EEPROM */ #ifdef CONFIG_CMD_EEPROM -#define CONFIG_SYS_I2C_MULTI_EEPROMS -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#define CONFIG_SYS_I2C_MULTI_EEPROMS +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2#endif /*
@@ -217,13 +217,13 @@*/ #ifdef CONFIG_CMD_DATE /* Use the internal RTC in the MXS chip */ -#define CONFIG_RTC_INTERNAL +#define CONFIG_RTC_INTERNAL #ifdef CONFIG_RTC_INTERNAL -#define CONFIG_RTC_MXS +#define CONFIG_RTC_MXS #else -#define CONFIG_RTC_M41T62 -#define CONFIG_SYS_I2C_RTC_ADDR 0x68 -#define CONFIG_SYS_M41T11_BASE_YEAR 2000 +#define CONFIG_RTC_M41T62 +#define CONFIG_SYS_I2C_RTC_ADDR 0x68 +#define CONFIG_SYS_M41T11_BASE_YEAR 2000#endif #endif
@@ -231,59 +231,59 @@* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_MXS +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_MXS #define CONFIG_EHCI_MXS_PORT0 #define CONFIG_EHCI_MXS_PORT1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_EHCI_IS_TDI -#define CONFIG_USB_STORAGE +#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_STORAGE #endif /* * SPI */ #ifdef CONFIG_CMD_SPI -#define CONFIG_HARD_SPI -#define CONFIG_MXS_SPI -#define CONFIG_SPI_HALF_DUPLEX -#define CONFIG_DEFAULT_SPI_BUS 2 -#define CONFIG_DEFAULT_SPI_CS 0 -#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0 +#define CONFIG_HARD_SPI +#define CONFIG_MXS_SPI +#define CONFIG_SPI_HALF_DUPLEX +#define CONFIG_DEFAULT_SPI_BUS 2 +#define CONFIG_DEFAULT_SPI_CS 0 +#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0/* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SF_DEFAULT_BUS 2 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 40000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_STMICRO +#define CONFIG_SF_DEFAULT_BUS 2 +#define CONFIG_SF_DEFAULT_CS 0 +#define CONFIG_SF_DEFAULT_SPEED 40000000 +#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define CONFIG_ENV_SPI_BUS 2 -#define CONFIG_ENV_SPI_CS 0 -#define CONFIG_ENV_SPI_MAX_HZ 40000000 -#define CONFIG_ENV_SPI_MODE SPI_MODE_0 +#define CONFIG_ENV_SPI_BUS 2 +#define CONFIG_ENV_SPI_CS 0 +#define CONFIG_ENV_SPI_MAX_HZ 40000000 +#define CONFIG_ENV_SPI_MODE SPI_MODE_0#endif #endif /* * Boot Linux */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_BOOTDELAY 3 -#define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " -#define CONFIG_BOOTCOMMAND "run bootcmd_net" -#define CONFIG_LOADADDR 0x42000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_OF_LIBFDT +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTFILE "uImage" +#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " +#define CONFIG_BOOTCOMMAND "run bootcmd_net" +#define CONFIG_LOADADDR 0x42000000 +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_OF_LIBFDT /* * Extra Environments */ -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CONFIG_EXTRA_ENV_SETTINGS \ "update_nand_full_filename=u-boot.nand\0" \ "update_nand_firmware_filename=u-boot.sb\0" \ "update_sd_firmware_filename=u-boot.sd\0" \
Signature · 1 line
1.8.1.4
PATCH v2 8/11 m28evk: white space cleanup
Dear Wolfgang Denk,
Quoted 3 lines
Change all "#define<TAB>" sequences into "#define<SPACE>"
Signed-off-by Wolfgang Denk <[email protected]>
Best regards,
Marek Vasut
PATCH v2 9/11 m28evk: enable "env grep" and regexp support
In reply to Wolfgang DenkConflicts:
include/configs/m28evk.h
---
Changes in v2: None
include/configs/m28evk.h | 3 +++ 1 file changed, 3 insertions(+)
include/configs/m28evk.h +3 -0
@@ -65,6 +65,7 @@#define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT #define CONFIG_CMD_GPIO +#define CONFIG_CMD_GREPENV #define CONFIG_CMD_I2C #define CONFIG_CMD_MII #define CONFIG_CMD_MMC
@@ -77,6 +78,8 @@#define CONFIG_CMD_SPI #define CONFIG_CMD_USB +#define CONFIG_REGEX /* Enable regular expression support */ +/* * Memory configurations */
Signature · 1 line
1.8.1.4
PATCH v2 10/11 amcc-common.h: minor white space cleanup
In reply to Wolfgang DenkAlign some comments.
---
Changes in v2: None
include/configs/amcc-common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/amcc-common.h +3 -3
@@ -108,12 +108,12 @@#define CONFIG_MX_CYCLIC /* enable mdc/mwc commands */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_VERSION_VARIABLE /* include version env variable */ -#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/ +#define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup*/ -#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ +#define CONFIG_SYS_HUSH_PARSER /* Use the HUSH parser */ #define CONFIG_LOADS_ECHO /* echo on for serial download */ -#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ +#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ /* * BOOTP options
Signature · 1 line
1.8.1.4
PATCH v2 10/11 amcc-common.h: minor white space cleanup
Quoted 3 lines · Wolfgang Denk
Align some comments.
Signed-off-by Wolfgang Denk <[email protected]>
Thanks,
Stefan
PATCH v2 11/11 amcc-common.h: enable support for "env grep", "setexpr", and regex.
In reply to Wolfgang Denk---
Changes in v2: None
include/configs/amcc-common.h | 3 +++ 1 file changed, 3 insertions(+)
include/configs/amcc-common.h +3 -0
@@ -71,6 +71,7 @@#define CONFIG_CMD_DIAG #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF +#define CONFIG_CMD_GREPENV #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ #define CONFIG_CMD_MII
@@ -78,6 +79,7 @@#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_REGINFO +#define CONFIG_CMD_SETEXPR /* * Miscellaneous configurable options
@@ -115,6 +117,7 @@#define CONFIG_LOADS_ECHO /* echo on for serial download */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ +#define CONFIG_REGEX /* Enable regular expression support */ /* * BOOTP options */
Signature · 1 line
1.8.1.4
PATCH v2 11/11 amcc-common.h: enable support for "env grep", "setexpr", and regex.
Quoted 1 line · Wolfgang Denk
Signed-off-by Wolfgang Denk <[email protected]>
Thanks,
Stefan
v2 cover Add Regular Expressions Support
In reply to Wolfgang DenkQuoted 104 lines · Wolfgang Denk
The following patch series adds the SLRE "Super Light Regular Expression" library and uses this to add regex support for the "env grep" (aka "grepenv") command, and new functions (or operators?) "gsub" and "sub" to the "setexpr" command.
The rework to "env grep" also fixed a few bugs (which caused it to dump always _all_ environment variables on some systems), and adds the capability to grep in either the variable name, or the value, or in both (the old version always did the latter). Instead of special functions we now use common code (i. e.
hexport_r()) for the variable look-up, which gives us sorted output as a free additional benefit.This allows to do things like
- print all MAC addresses:
=> env grep -e eth.*addr eth1addr=00:10:ec:80:c5:15 ethaddr=00:10:ec:00:c5:15- print all variables that have at least 2 colons in their value:
=> env grep -v -e :.*: addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off panic=1 eth1addr=00:10:ec:80:c5:15 ethaddr=00:10:ec:00:c5:15 ver=U-Boot 2013.04-rc1-00289-g497746b-dirty (Mar 22 2013 - 12:50:25)- Generate broadcast address by substituting the last two numbers of the IP address by "255.255":
=> print ipaddr
ipaddr=192.168.1.104 => setexpr broadcast sub "(.*\\.).*\\..*" "\\1255.255" $ipaddr broadcast=192.168.255.255- Depending on keyboard configuration (German vs. US keyboard) a bar code scanner may initialize the MAC address as C0:E5:4E:02:06:DC or as C0>E5>4E>02>06>DC. Make sure we always have a correct value:
=> print ethaddr
ethaddr=C0>E5>4E>02>06>DC => setexpr ethaddr gsub > : ethaddr=C0:E5:4E:02:06:DCetc.
Regex support can be enabled by defining
CONFIG_REGEXin the board config file.Notes:
- This patch series has been compile-tested (and found to be clean with ELDK v5.3) on all of the following boards:
ARM: m28evk
PPC4xx: acadia bamboo bluestone bubinga canyonlands dlvision-10g dlvision ebony gdppc440etx icon intip io io64 iocon katmai kilauea luan makalu neo ocotea redwood sequoia t3corp taihu taishan walnut yosemite yucca
- Runtime / functional testing has been done mostly on PPC (Sequoia board).
Changes in v2:
- fixed trailing whitespace errors
- Note 1: The "line over 80 characters" warning will NOT be fixed due to the "never break user-visible strings" rule.
- Note 2: The "Alignment should match open parenthesis" check will NOT be fixed due to the "indent by TABs only" rule.
- Fix ERROR: "foo * bar" should be "foo *bar" errors
- Fix trailing whitespace error
- Note: the "Alignment should match open parenthesis" check will not be fixed due to the "indent always byy TABs" rule.
- no changes; most of this is imported code and is intentionally left as is
- the "Alignment should match open parenthesis" check is left due to the "indent only by TABs" rule
- the "line over 80 characters" warning is left due to the "never break user-visible strings" rule
- Fix trailing whitespace error
- fix "No space is necessary after a cast" checks
- fix "space prohibited before semicolon" and "space required after that ';'" errors (but I onsider the result less readable :-( )
- Note: the remaining warnings ("line over 80 characters") and checks ("Alignment should match open parenthesis") are intentionally left as is.
- Do the white space cleanup globally, and as separate patchWolfgang Denk (11):
hashtable: preparations to usehexport_r()for "env grep" "env grep" - reimplement command usinghexport_r()
"env grep" - add options to grep in name, value, or both. Add SLRE - Super Light Regular Expression library
"env grep" - add support for regular expression matches
setexpr: simplify code, improve help message
setexpr: add regex substring matching and substitution
m28evk: white space cleanup
m28evk: enable "env grep" and regexp supportamcc-common.h: minor white space cleanup
amcc-common.h: enable support for "env grep", "setexpr", and regex.
Quoted 13 lines
README | 7 + common/cmd_nvedit.c | 87 +++-- common/cmd_setexpr.c | 296 ++++++++++++++++- include/configs/amcc-common.h | 9 +- include/configs/m28evk.h | 259 +++++++-------- include/search.h | 15 +- include/slre.h | 100 ++++++ lib/Makefile | 1 + lib/hashtable.c | 93 ++++-- lib/slre.c | 724 ++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 1391 insertions(+), 200 deletions(-) create mode 100644 include/slre.h create mode 100644 lib/slre.c
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130502/a7aa76a2/attachment.pgp>