diff options
author | Tom Rix <Tom.Rix@windriver.com> | 2010-01-18 08:08:32 -0600 |
---|---|---|
committer | Tom Rix <Tom.Rix@windriver.com> | 2010-01-18 08:08:32 -0600 |
commit | a7709d926dbc7cb1541034fcf2b21ce3e838cb12 (patch) | |
tree | 72c58261577bc00d98dbd208e4fa95dfbb2487a5 /include/common.h | |
parent | 1c2a8e359ebbec0dbef62f5b54c72f9cd72ccd59 (diff) | |
parent | 88ffb2665cd066b6b20cfaade13929d4e8428dde (diff) |
Merge branch 't-ml-master' into t-master
Diffstat (limited to 'include/common.h')
-rw-r--r-- | include/common.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h index 07897f682eb..391790a411b 100644 --- a/include/common.h +++ b/include/common.h @@ -336,7 +336,9 @@ extern void pic_write (uchar reg, uchar val); #if defined(CONFIG_SPI) || !defined(CONFIG_SYS_I2C_EEPROM_ADDR) # define CONFIG_SYS_DEF_EEPROM_ADDR 0 #else +#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR +#endif #endif /* CONFIG_SPI || !defined(CONFIG_SYS_I2C_EEPROM_ADDR) */ #if defined(CONFIG_SPI) @@ -617,6 +619,13 @@ int gunzip(void *, int, unsigned char *, unsigned long *); int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, int stoponerr, int offset); +/* lib_generic/net_utils.c */ +#include <net.h> +static inline IPaddr_t getenv_IPaddr (char *var) +{ + return (string_to_ip(getenv(var))); +} + /* lib_generic/time.c */ void udelay (unsigned long); |