[U-Boot] [PATCH 1/2] Allow CONFIG_REGEX to be disabled when CONFIG_NET

[U-Boot] [PATCH 1/2] Allow CONFIG_REGEX to be disabled when CONFIG_NET

[Joe Hershberger]

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>
---

 include/env_callback.h | 4 +++-
 lib/Kconfig            | 1 +
 net/Kconfig            | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/env_callback.h b/include/env_callback.h
index ab5d42d..90b95b5 100644
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -33,8 +33,10 @@
 
 #ifdef CONFIG_REGEX
 #define ENV_DOT_ESCAPE "\\"
+#define ETHADDR_WILDCARD "\\d?"
 #else
 #define ENV_DOT_ESCAPE
+#define ETHADDR_WILDCARD
 #endif
 
 #ifdef CONFIG_CMD_DNS
@@ -53,7 +55,7 @@
 	"nvlan:nvlan," \
 	"vlan:vlan," \
 	DNS_CALLBACK \
-	"eth\\d?addr:ethaddr,"
+	"eth" ETHADDR_WILDCARD "addr:ethaddr,"
 #else
 #define NET_CALLBACKS
 #endif
diff --git a/lib/Kconfig b/lib/Kconfig
index 7ec8c98..c98d399 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -38,6 +38,7 @@ config SYS_VSNPRINTF
 
 config REGEX
 	bool "Enable regular expression support"
+	default y if NET
 	help
 	  If this variable is defined, U-Boot is linked against the
 	  SLRE (Super Light Regular Expression) library, which adds
diff --git a/net/Kconfig b/net/Kconfig
index 9a9846e..915371d 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -4,7 +4,6 @@
 
 menuconfig NET
 	bool "Networking support"
-	select REGEX
 
 if NET
 
-- 
1.7.11.5

[U-Boot] [PATCH 2/2] blackfin: Fix build regression due to image size

[Joe Hershberger]

bf533-stamp, bf538f-ezkit, and cm-bf548 are very space limited.

This was introduced by:
6e0d26c0502e (net: Handle ethaddr changes as an env callback)
by enabling CONFIG_REGEX, which is too big for these boards.

This patch disables CONFIG_REGEX at the expense of working with more
than the first ethaddr.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

---

 configs/bf533-stamp_defconfig  | 1 +
 configs/bf538f-ezkit_defconfig | 1 +
 configs/cm-bf548_defconfig     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/configs/bf533-stamp_defconfig b/configs/bf533-stamp_defconfig
index 154dc26..4956078 100644
--- a/configs/bf533-stamp_defconfig
+++ b/configs/bf533-stamp_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF533_STAMP=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
+# CONFIG_REGEX is not set
 CONFIG_LIB_RAND=y
diff --git a/configs/bf538f-ezkit_defconfig b/configs/bf538f-ezkit_defconfig
index 6cb6c6b..668f9cb 100644
--- a/configs/bf538f-ezkit_defconfig
+++ b/configs/bf538f-ezkit_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF538F_EZKIT=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
+# CONFIG_REGEX is not set
 CONFIG_LIB_RAND=y
diff --git a/configs/cm-bf548_defconfig b/configs/cm-bf548_defconfig
index 949612d..49d59dd 100644
--- a/configs/cm-bf548_defconfig
+++ b/configs/cm-bf548_defconfig
@@ -2,4 +2,5 @@ CONFIG_BLACKFIN=y
 CONFIG_TARGET_CM_BF548=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
+# CONFIG_REGEX is not set
 CONFIG_LIB_RAND=y
-- 
1.7.11.5

[U-Boot] [PATCH 1/2] Allow CONFIG_REGEX to be disabled when CONFIG_NET

[Joe Hershberger]

Hi Tom,

On Mon, Jun 22, 2015 at 5:57 PM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> 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>
> ---

This is a build fix, so it should probably be part of v2015.07.

Cheers,
-Joe

[U-Boot] [PATCH 2/2] blackfin: Fix build regression due to image size

[Joe Hershberger]

Hi Tom,

On Mon, Jun 22, 2015 at 5:57 PM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> bf533-stamp, bf538f-ezkit, and cm-bf548 are very space limited.
>
> This was introduced by:
> 6e0d26c0502e (net: Handle ethaddr changes as an env callback)
> by enabling CONFIG_REGEX, which is too big for these boards.
>
> This patch disables CONFIG_REGEX at the expense of working with more
> than the first ethaddr.
>
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
>
> ---

This is a build fix, so it should probably be part of v2015.07.

Cheers,
-Joe

[U-Boot] [U-Boot, 1/2] Allow CONFIG_REGEX to be disabled when CONFIG_NET

[Tom Rini]

On Mon, Jun 22, 2015 at 05:57:36PM -0500, Joe Hershberger wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150710/a3ff8512/attachment.sig>

[U-Boot] [U-Boot, 2/2] blackfin: Fix build regression due to image size

[Tom Rini]

On Mon, Jun 22, 2015 at 05:57:37PM -0500, Joe Hershberger wrote:

> bf533-stamp, bf538f-ezkit, and cm-bf548 are very space limited.
> 
> This was introduced by:
> 6e0d26c0502e (net: Handle ethaddr changes as an env callback)
> by enabling CONFIG_REGEX, which is too big for these boards.
> 
> This patch disables CONFIG_REGEX at the expense of working with more
> than the first ethaddr.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150710/5eb3fea8/attachment.sig>