net: Fix NET_RANDOM_ETHADDR dependencies

NET_RANDOM_ETHADDR depends on lib/rand.c. This patch adds dependency to
Kconfig to ensure that library is also compiled.

Remove the definitions from Blackfin boards' include/configs.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index d23d2c4..f8cea62 100644 (file)
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -60,7 +60,6 @@
 #define CONFIG_BOOTP_SERVERIP
 #define CONFIG_NET_RETRY_COUNT 3
 #define CONFIG_CMD_LINK_LOCAL
 #define CONFIG_BOOTP_SERVERIP
 #define CONFIG_NET_RETRY_COUNT 3
 #define CONFIG_CMD_LINK_LOCAL

-#define CONFIG_LIB_RAND

 #define CONFIG_NETCONSOLE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_CMD_PING
 #define CONFIG_NETCONSOLE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_CMD_PING

diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index 0d9fe57..36637ae 100644 (file)
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -73,7 +73,6 @@
 #define CONFIG_GATEWAYIP       192.168.233.1
 #define CONFIG_SERVERIP                192.168.233.53
 #define CONFIG_ROOTPATH                "/romfs/brettl2"
 #define CONFIG_GATEWAYIP       192.168.233.1
 #define CONFIG_SERVERIP                192.168.233.53
 #define CONFIG_ROOTPATH                "/romfs/brettl2"

-#define CONFIG_LIB_RAND

 #endif
 
 
 #endif
 
 

diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index dcd19e4..0df463f 100644 (file)
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -87,7 +87,6 @@
 #endif
 #define CONFIG_HOSTNAME                bf518f-ezbrd
 #define CONFIG_PHY_ADDR                3
 #endif
 #define CONFIG_HOSTNAME                bf518f-ezbrd
 #define CONFIG_PHY_ADDR                3

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index ad5fa53..83f57cd 100644 (file)
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -85,7 +85,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                bf526-ezbrd
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                bf526-ezbrd

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index b23a250..32ac961 100644 (file)
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -83,7 +83,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                bf527-ezkit
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                bf527-ezkit

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 9c7c969..53b7ab5 100644 (file)
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -87,7 +87,6 @@
 #define CONFIG_SYS_AUTOLOAD    "no"
 #define CONFIG_ROOTPATH                "/romfs"
 
 #define CONFIG_SYS_AUTOLOAD    "no"
 #define CONFIG_ROOTPATH                "/romfs"
 

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index be11a85..850c516 100644 (file)
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -65,7 +65,6 @@
 #define CONFIG_RMII
 #endif
 #define CONFIG_HOSTNAME                bf537-pnav
 #define CONFIG_RMII
 #endif
 #define CONFIG_HOSTNAME                bf537-pnav

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 8c9e54d..2da5d29 100644 (file)
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -86,7 +86,6 @@
 
 #define CONFIG_SYS_AUTOLOAD    "no"
 #define CONFIG_ROOTPATH                "/romfs"
 
 #define CONFIG_SYS_AUTOLOAD    "no"
 #define CONFIG_ROOTPATH                "/romfs"

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 41f1b1f..84ef4ed 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -65,7 +65,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                bf537-stamp
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                bf537-stamp

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index b475b16..1c9d584 100644 (file)
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -17,7 +17,6 @@
 #  define CONFIG_BOOTP_DNS
 #  define CONFIG_BOOTP_NTPSERVER
 #  define CONFIG_BOOTP_RANDOM_DELAY
 #  define CONFIG_BOOTP_DNS
 #  define CONFIG_BOOTP_NTPSERVER
 #  define CONFIG_BOOTP_RANDOM_DELAY

-#  define CONFIG_LIB_RAND

 #  define CONFIG_KEEP_SERVERADDR
 #  define CONFIG_CMD_DNS
 #  define CONFIG_CMD_PING
 #  define CONFIG_KEEP_SERVERADDR
 #  define CONFIG_CMD_DNS
 #  define CONFIG_CMD_PING

diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index 387f1cb..e9e4e14 100644 (file)
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -83,7 +83,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf527
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf527

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 95afd51..0eebe56 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -71,7 +71,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf537e
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf537e

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 4df4a05..3a2d726 100644 (file)
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -69,7 +69,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf537u
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf537u

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h
index 69a2686..3cbd67f 100644 (file)
--- a/include/configs/dnp5370.h
+++ b/include/configs/dnp5370.h
@@ -56,7 +56,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
 

-#define CONFIG_LIB_RAND

 #endif
 
 /*
 #endif
 
 /*

diff --git a/include/configs/ip04.h b/include/configs/ip04.h
index 2bd81fc..73bbcb6 100644 (file)
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -77,7 +77,6 @@
 #define DM9000_IO              CONFIG_DM9000_BASE
 #define DM9000_DATA            (CONFIG_DM9000_BASE + 2)
 
 #define DM9000_IO              CONFIG_DM9000_BASE
 #define DM9000_DATA            (CONFIG_DM9000_BASE + 2)
 

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 490f84e..7d22173 100644 (file)
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -37,7 +37,6 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_SHOW_BOOT_PROGRESS
 
 #define CONFIG_MISC_INIT_R
 #define CONFIG_SHOW_BOOT_PROGRESS
 

-#define CONFIG_LIB_RAND

 #define CONFIG_KIRKWOOD_GPIO
 #define CONFIG_OF_LIBFDT
 
 #define CONFIG_KIRKWOOD_GPIO
 #define CONFIG_OF_LIBFDT
 

diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h
index e726b29..1e74535 100644 (file)
--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@@ -66,7 +66,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                tcm-bf518
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                tcm-bf518

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 3326580..a8947c5 100644 (file)
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -71,7 +71,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                tcm-bf537
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                tcm-bf537

-#define CONFIG_LIB_RAND

 
 /*
  * Flash Settings
 
 /*
  * Flash Settings

diff --git a/lib/Kconfig b/lib/Kconfig
index 5b6cf3d..3c8de86 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -44,6 +44,9 @@ config REGEX
          regex support to some commands, for example "env grep" and
          "setexpr".
 
          regex support to some commands, for example "env grep" and
          "setexpr".
 

+config LIB_RAND
+       bool
+

 source lib/rsa/Kconfig
 
 menu "Hashing Support"
 source lib/rsa/Kconfig
 
 menu "Hashing Support"

diff --git a/net/Kconfig b/net/Kconfig
index 524b7e4..9a9846e 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -10,6 +10,7 @@ if NET
 
 config NET_RANDOM_ETHADDR
        bool "Random ethaddr if unset"
 
 config NET_RANDOM_ETHADDR
        bool "Random ethaddr if unset"

+       select LIB_RAND

        help
          Selecting this will allow the Ethernet interface to function
          even when the ethaddr variable for that interface is unset.
        help
          Selecting this will allow the Ethernet interface to function
          even when the ethaddr variable for that interface is unset.