[U-Boot] [PATCH 13/41] common: Move env_get_ip() to net.h

Simon Glass sjg at chromium.org
Mon Sep 30 14:40:44 UTC 2019


This function relates to networking, so move it out of the common.h
header file.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 include/common.h |  4 ----
 include/net.h    | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/include/common.h b/include/common.h
index f993e4bef33..4fda40cc1d6 100644
--- a/include/common.h
+++ b/include/common.h
@@ -319,10 +319,6 @@ int	serial_printf (const char *fmt, ...)
 
 /* lib/net_utils.c */
 #include <net.h>
-static inline struct in_addr env_get_ip(char *var)
-{
-	return string_to_ip(env_get(var));
-}
 
 #include <bootstage.h>
 
diff --git a/include/net.h b/include/net.h
index d8d187d8af9..11eca1bc6c3 100644
--- a/include/net.h
+++ b/include/net.h
@@ -829,7 +829,13 @@ static inline void net_random_ethaddr(uchar *addr)
 /* Convert an IP address to a string */
 void ip_to_string(struct in_addr x, char *s);
 
-/* Convert a string to ip address */
+/**
+ * string_to_ip() - Convert a string to ip address
+ *
+ * @s: String to conver, in the format format a.b.c.d, where each value is a
+ *	decimal number from 0 to 255
+ * @return IP address, or 0 if invalid
+ */
 struct in_addr string_to_ip(const char *s);
 
 /* Convert a VLAN id to a string */
@@ -887,4 +893,17 @@ int update_tftp(ulong addr, char *interface, char *devstring);
  */
 void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr);
 
+/**
+ * env_get_ip() - Convert an environment value to to an ip address
+ *
+ * @var: Environment variable to convert. The value of this variable must be
+ *	in the format format a.b.c.d, where each value is a decimal number from
+ *	0 to 255
+ * @return IP address, or 0 if invalid
+ */
+static inline struct in_addr env_get_ip(char *var)
+{
+	return string_to_ip(env_get(var));
+}
+
 #endif /* __NET_H__ */
-- 
2.23.0.444.g18eeb5a265-goog



More information about the U-Boot mailing list