redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

Allow CONFIG_REGEX to be disabled when CONFIG_NET 

Instead of selecting REGEX when NET is enabled, make it the default, but
allow boards that are tiny to disable it and lose functionality on all
but the first Ethernet adapter.

cm-bf548, bf538f-ezkit, and bf533-stamp need this. None appear to have
more than one Ethernet interface.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
utp
Joe Hershberger 2015-06-22 17:57:36 -05:00 committed by Tom Rini
parent fb69b6cd27
commit f7848d90dd
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/env_callback.h
View File

@ -33,8 +33,10 @@
#ifdef CONFIG_REGEX #ifdef CONFIG_REGEX
#define ENV_DOT_ESCAPE "\\" #define ENV_DOT_ESCAPE "\\"
#define ETHADDR_WILDCARD "\\d?"
#else #else
#define ENV_DOT_ESCAPE #define ENV_DOT_ESCAPE
#define ETHADDR_WILDCARD
#endif #endif
#ifdef CONFIG_CMD_DNS #ifdef CONFIG_CMD_DNS
@ -53,7 +55,7 @@
"nvlan:nvlan," \ "nvlan:nvlan," \
"vlan:vlan," \ "vlan:vlan," \
DNS_CALLBACK \ DNS_CALLBACK \
"eth\\d?addr:ethaddr," "eth" ETHADDR_WILDCARD "addr:ethaddr,"
#else #else
#define NET_CALLBACKS #define NET_CALLBACKS
#endif #endif

1
lib/Kconfig
View File

@ -38,6 +38,7 @@ config SYS_VSNPRINTF
config REGEX config REGEX
bool "Enable regular expression support" bool "Enable regular expression support"
default y if NET
help help
If this variable is defined, U-Boot is linked against the If this variable is defined, U-Boot is linked against the
SLRE (Super Light Regular Expression) library, which adds SLRE (Super Light Regular Expression) library, which adds

1
net/Kconfig
View File

@ -4,7 +4,6 @@
menuconfig NET menuconfig NET
bool "Networking support" bool "Networking support"
select REGEX
if NET if NET